diff options
Diffstat (limited to 'gr-vocoder')
53 files changed, 163 insertions, 163 deletions
diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt index 6ccc18e8c4..37c0cf70e9 100644 --- a/gr-vocoder/CMakeLists.txt +++ b/gr-vocoder/CMakeLists.txt @@ -91,7 +91,7 @@ CPACK_COMPONENT("vocoder_swig" ######################################################################## # Add subdirectories ######################################################################## -add_subdirectory(include/vocoder) +add_subdirectory(include/gnuradio/vocoder) add_subdirectory(lib) add_subdirectory(doc) if(ENABLE_PYTHON) diff --git a/gr-vocoder/include/vocoder/CMakeLists.txt b/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt index ea0562f36f..ea0562f36f 100644 --- a/gr-vocoder/include/vocoder/CMakeLists.txt +++ b/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt diff --git a/gr-vocoder/include/vocoder/alaw_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h index 9966512c2a..431859762c 100644 --- a/gr-vocoder/include/vocoder/alaw_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_VOCODER_ALAW_DECODE_BS_H #define INCLUDED_VOCODER_ALAW_DECODE_BS_H -#include <vocoder/api.h> -#include <gr_sync_block.h> +#include <gnuradio/vocoder/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace vocoder { @@ -33,7 +33,7 @@ namespace gr { * \brief This block performs alaw audio decoding. * \ingroup audio_blk */ - class VOCODER_API alaw_decode_bs : virtual public gr_sync_block + class VOCODER_API alaw_decode_bs : virtual public sync_block { public: // gr::vocoder::alaw_decode_bs::sptr diff --git a/gr-vocoder/include/vocoder/alaw_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h index e944a93455..c81018ee5f 100644 --- a/gr-vocoder/include/vocoder/alaw_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_VOCODER_ALAW_ENCODER_SB_H #define INCLUDED_VOCODER_ALAW_ENCODER_SB_H -#include <vocoder/api.h> -#include <gr_sync_block.h> +#include <gnuradio/vocoder/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace vocoder { @@ -33,7 +33,7 @@ namespace gr { * \brief This block performs g.711 alaw audio encoding. * \ingroup audio_blk */ - class VOCODER_API alaw_encode_sb : virtual public gr_sync_block + class VOCODER_API alaw_encode_sb : virtual public sync_block { public: // gr::vocoder::alaw_encode_sb::sptr diff --git a/gr-vocoder/include/vocoder/api.h b/gr-vocoder/include/gnuradio/vocoder/api.h index 613a19f4bc..425e397b9d 100644 --- a/gr-vocoder/include/vocoder/api.h +++ b/gr-vocoder/include/gnuradio/vocoder/api.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_VOCODER_API_H #define INCLUDED_VOCODER_API_H -#include <attributes.h> +#include <gnuradio/attributes.h> #ifdef gnuradio_vocoder_EXPORTS # define VOCODER_API __GR_ATTR_EXPORT diff --git a/gr-vocoder/include/vocoder/codec2_decode_ps.h b/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h index 9c0d1526b8..e90e7b9560 100644 --- a/gr-vocoder/include/vocoder/codec2_decode_ps.h +++ b/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_VOCODER_CODEC2_DECODE_PS_H #define INCLUDED_VOCODER_CODEC2_DECODE_PS_H -#include <vocoder/api.h> -#include <gr_sync_interpolator.h> +#include <gnuradio/vocoder/api.h> +#include <gnuradio/sync_interpolator.h> namespace gr { namespace vocoder { @@ -33,7 +33,7 @@ namespace gr { * \brief CODEC2 Vocoder Decoder * \ingroup audio_blk */ - class VOCODER_API codec2_decode_ps : virtual public gr_sync_interpolator + class VOCODER_API codec2_decode_ps : virtual public sync_interpolator { public: // gr::vocoder::codec2_decode_ps::sptr diff --git a/gr-vocoder/include/vocoder/codec2_encode_sp.h b/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h index 2960bee04b..9fe1c2dd43 100644 --- a/gr-vocoder/include/vocoder/codec2_encode_sp.h +++ b/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_VOCODER_CODEC2_ENCODE_SP_H #define INCLUDED_VOCODER_CODEC2_ENCODE_SP_H -#include <vocoder/api.h> -#include <gr_sync_decimator.h> +#include <gnuradio/vocoder/api.h> +#include <gnuradio/sync_decimator.h> namespace gr { namespace vocoder { @@ -33,7 +33,7 @@ namespace gr { * \brief CODEC2 Vocoder Encoder * \ingroup audio_blk */ - class VOCODER_API codec2_encode_sp : virtual public gr_sync_decimator + class VOCODER_API codec2_encode_sp : virtual public sync_decimator { public: // gr::vocoder::codec2_encode_sp::sptr diff --git a/gr-vocoder/include/vocoder/cvsd_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h index 03dedffbbd..324dcea1a1 100644 --- a/gr-vocoder/include/vocoder/cvsd_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_VOCODER_CVSD_DECODE_BS_H #define INCLUDED_VOCODER_CVSD_DECODE_BS_H -#include <vocoder/api.h> -#include <gr_sync_interpolator.h> +#include <gnuradio/vocoder/api.h> +#include <gnuradio/sync_interpolator.h> namespace gr { namespace vocoder { @@ -83,7 +83,7 @@ namespace gr { * Bluetooth Voice Simulink� Model, Available: * http://www.mathworks.com/company/newsletters/digest/nov01/bluetooth.html */ - class VOCODER_API cvsd_decode_bs : virtual public gr_sync_interpolator + class VOCODER_API cvsd_decode_bs : virtual public sync_interpolator { public: // gr::vocoder::cvsd_decode_bs::sptr diff --git a/gr-vocoder/include/vocoder/cvsd_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h index c12269562e..7b7cea712e 100644 --- a/gr-vocoder/include/vocoder/cvsd_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h @@ -22,8 +22,8 @@ #ifndef INCLUDED_VOCODER_CVSD_ENCODER_SB_H #define INCLUDED_VOCODER_CVSD_ENCODER_SB_H -#include <vocoder/api.h> -#include <gr_sync_decimator.h> +#include <gnuradio/vocoder/api.h> +#include <gnuradio/sync_decimator.h> namespace gr { namespace vocoder { @@ -84,7 +84,7 @@ namespace gr { * Bluetooth Voice Simulink� Model, Available: * http://www.mathworks.com/company/newsletters/digest/nov01/bluetooth.html */ - class VOCODER_API cvsd_encode_sb : virtual public gr_sync_decimator + class VOCODER_API cvsd_encode_sb : virtual public sync_decimator { public: // gr::vocoder::cvsd_encode_sb::sptr diff --git a/gr-vocoder/include/vocoder/g721_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h index 05459ccb3d..46444d569a 100644 --- a/gr-vocoder/include/vocoder/g721_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_VOCODER_G721_DECODE_BS_H #define INCLUDED_VOCODER_G721_DECODE_BS_H -#include <vocoder/api.h> -#include <gr_sync_block.h> +#include <gnuradio/vocoder/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace vocoder { @@ -33,7 +33,7 @@ namespace gr { * \brief This block performs g721 audio decoding. * \ingroup audio_blk */ - class VOCODER_API g721_decode_bs : virtual public gr_sync_block + class VOCODER_API g721_decode_bs : virtual public sync_block { public: // gr::vocoder::g721_decode_bs::sptr diff --git a/gr-vocoder/include/vocoder/g721_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h index af03b855c3..2ae717d4b7 100644 --- a/gr-vocoder/include/vocoder/g721_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_VOCODER_G721_ENCODE_SB_H #define INCLUDED_VOCODER_G721_ENCODE_SB_H -#include <vocoder/api.h> -#include <gr_sync_block.h> +#include <gnuradio/vocoder/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace vocoder { @@ -33,7 +33,7 @@ namespace gr { * \brief This block performs g721 audio encoding. * \ingroup audio_blk */ - class VOCODER_API g721_encode_sb : virtual public gr_sync_block + class VOCODER_API g721_encode_sb : virtual public sync_block { public: // gr::vocoder::g721_encode_sb::sptr diff --git a/gr-vocoder/include/vocoder/g723_24_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h index e91354071d..74acd57a40 100644 --- a/gr-vocoder/include/vocoder/g723_24_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_VOCODER_G723_24_DECODE_BS_H #define INCLUDED_VOCODER_G723_24_DECODE_BS_H -#include <vocoder/api.h> -#include <gr_sync_block.h> +#include <gnuradio/vocoder/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace vocoder { @@ -33,7 +33,7 @@ namespace gr { * \brief This block performs g723_24 audio decoding. * \ingroup audio_blk */ - class VOCODER_API g723_24_decode_bs : virtual public gr_sync_block + class VOCODER_API g723_24_decode_bs : virtual public sync_block { public: // gr::vocoder::g723_24_decode_bs::sptr diff --git a/gr-vocoder/include/vocoder/g723_24_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h index c63a9ec84b..9a08eafed3 100644 --- a/gr-vocoder/include/vocoder/g723_24_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_VOCODER_G723_24_ENCODE_SB_H #define INCLUDED_VOCODER_G723_24_ENCODE_SB_H -#include <vocoder/api.h> -#include <gr_sync_block.h> +#include <gnuradio/vocoder/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace vocoder { @@ -33,7 +33,7 @@ namespace gr { * \brief This block performs g723_24 audio encoding. * \ingroup audio_blk */ - class VOCODER_API g723_24_encode_sb : virtual public gr_sync_block + class VOCODER_API g723_24_encode_sb : virtual public sync_block { public: // gr::vocoder::g723_24_encode_sb::sptr diff --git a/gr-vocoder/include/vocoder/g723_40_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h index 433e74149c..b1d9f6fe3c 100644 --- a/gr-vocoder/include/vocoder/g723_40_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_VOCODER_G723_40_DECODE_BS_H #define INCLUDED_VOCODER_G723_40_DECODE_BS_H -#include <vocoder/api.h> -#include <gr_sync_block.h> +#include <gnuradio/vocoder/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace vocoder { @@ -33,7 +33,7 @@ namespace gr { * \brief This block performs g723_40 audio decoding. * \ingroup audio_blk */ - class VOCODER_API g723_40_decode_bs : virtual public gr_sync_block + class VOCODER_API g723_40_decode_bs : virtual public sync_block { public: // gr::vocoder::g723_40_decode_bs::sptr diff --git a/gr-vocoder/include/vocoder/g723_40_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h index af28996412..05ddfed552 100644 --- a/gr-vocoder/include/vocoder/g723_40_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_VOCODER_G723_40_ENCODE_SB_H #define INCLUDED_VOCODER_G723_40_ENCODE_SB_H -#include <vocoder/api.h> -#include <gr_sync_block.h> +#include <gnuradio/vocoder/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace vocoder { @@ -33,7 +33,7 @@ namespace gr { * \brief This block performs g723_40 audio encoding. * \ingroup audio_blk */ - class VOCODER_API g723_40_encode_sb : virtual public gr_sync_block + class VOCODER_API g723_40_encode_sb : virtual public sync_block { public: // gr::vocoder::g723_40_encode_sb::sptr diff --git a/gr-vocoder/include/vocoder/gsm_fr_decode_ps.h b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h index cda62f19db..9979763e60 100644 --- a/gr-vocoder/include/vocoder/gsm_fr_decode_ps.h +++ b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_VOCODER_GSM_FR_DECODE_PS_H #define INCLUDED_VOCODER_GSM_FR_DECODE_PS_H -#include <vocoder/api.h> -#include <gr_sync_interpolator.h> +#include <gnuradio/vocoder/api.h> +#include <gnuradio/sync_interpolator.h> namespace gr { namespace vocoder { @@ -33,7 +33,7 @@ namespace gr { * \brief GSM 06.10 Full Rate Vocoder Decoder * \ingroup audio_blk */ - class VOCODER_API gsm_fr_decode_ps : virtual public gr_sync_interpolator + class VOCODER_API gsm_fr_decode_ps : virtual public sync_interpolator { public: // gr::vocoder::gsm_fr_decode_ps::sptr diff --git a/gr-vocoder/include/vocoder/gsm_fr_encode_sp.h b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h index 798e99a3b1..98d88bba1f 100644 --- a/gr-vocoder/include/vocoder/gsm_fr_encode_sp.h +++ b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_VOCODER_GSM_FR_ENCODE_SP_H #define INCLUDED_VOCODER_GSM_FR_ENCODE_SP_H -#include <vocoder/api.h> -#include <gr_sync_decimator.h> +#include <gnuradio/vocoder/api.h> +#include <gnuradio/sync_decimator.h> namespace gr { namespace vocoder { @@ -35,7 +35,7 @@ namespace gr { * * shorts in; 33 byte packets out */ - class VOCODER_API gsm_fr_encode_sp : virtual public gr_sync_decimator + class VOCODER_API gsm_fr_encode_sp : virtual public sync_decimator { public: // gr::vocoder::gsm_fr_encode_sp::sptr diff --git a/gr-vocoder/include/vocoder/ulaw_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h index 74c15531c0..83c328c326 100644 --- a/gr-vocoder/include/vocoder/ulaw_decode_bs.h +++ b/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_VOCODER_ULAW_DECODE_BS_H #define INCLUDED_VOCODER_ULAW_DECODE_BS_H -#include <vocoder/api.h> -#include <gr_sync_block.h> +#include <gnuradio/vocoder/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace vocoder { @@ -33,7 +33,7 @@ namespace gr { * \brief This block performs ulaw audio decoding. * \ingroup audio_blk */ - class VOCODER_API ulaw_decode_bs : virtual public gr_sync_block + class VOCODER_API ulaw_decode_bs : virtual public sync_block { public: // gr::vocoder::ulaw_decode_bs::sptr diff --git a/gr-vocoder/include/vocoder/ulaw_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h index 8d18d00138..fe1dba79b3 100644 --- a/gr-vocoder/include/vocoder/ulaw_encode_sb.h +++ b/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_VOCODER_ULAW_ENCODER_SB_H #define INCLUDED_VOCODER_ULAW_ENCODER_SB_H -#include <vocoder/api.h> -#include <gr_sync_block.h> +#include <gnuradio/vocoder/api.h> +#include <gnuradio/sync_block.h> namespace gr { namespace vocoder { @@ -33,7 +33,7 @@ namespace gr { * \brief This block performs g.711 ulaw audio encoding. * \ingroup audio_blk */ - class VOCODER_API ulaw_encode_sb : virtual public gr_sync_block + class VOCODER_API ulaw_encode_sb : virtual public sync_block { public: // gr::vocoder::ulaw_encode_sb::sptr diff --git a/gr-vocoder/lib/alaw_decode_bs_impl.cc b/gr-vocoder/lib/alaw_decode_bs_impl.cc index abea694da9..2f43304578 100644 --- a/gr-vocoder/lib/alaw_decode_bs_impl.cc +++ b/gr-vocoder/lib/alaw_decode_bs_impl.cc @@ -25,7 +25,7 @@ #endif #include "alaw_decode_bs_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <limits.h> namespace gr { @@ -43,9 +43,9 @@ extern "C" { } alaw_decode_bs_impl::alaw_decode_bs_impl() - : gr_sync_block("vocoder_alaw_decode_bs", - gr_make_io_signature(1, 1, sizeof(unsigned char)), - gr_make_io_signature(1, 1, sizeof(short))) + : sync_block("vocoder_alaw_decode_bs", + io_signature::make(1, 1, sizeof(unsigned char)), + io_signature::make(1, 1, sizeof(short))) { } diff --git a/gr-vocoder/lib/alaw_decode_bs_impl.h b/gr-vocoder/lib/alaw_decode_bs_impl.h index 06b23f3cfa..37fb6b28c3 100644 --- a/gr-vocoder/lib/alaw_decode_bs_impl.h +++ b/gr-vocoder/lib/alaw_decode_bs_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VOCODER_ALAW_DECODE_BS_IMPL_H #define INCLUDED_VOCODER_ALAW_DECODE_BS_IMPL_H -#include <vocoder/alaw_decode_bs.h> +#include <gnuradio/vocoder/alaw_decode_bs.h> namespace gr { namespace vocoder { diff --git a/gr-vocoder/lib/alaw_encode_sb_impl.cc b/gr-vocoder/lib/alaw_encode_sb_impl.cc index 4b316f2e14..9c941e790d 100644 --- a/gr-vocoder/lib/alaw_encode_sb_impl.cc +++ b/gr-vocoder/lib/alaw_encode_sb_impl.cc @@ -25,7 +25,7 @@ #endif #include "alaw_encode_sb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <limits.h> namespace gr { @@ -43,9 +43,9 @@ extern "C" { } alaw_encode_sb_impl::alaw_encode_sb_impl() - : gr_sync_block("avocoder_law_encode_sb", - gr_make_io_signature(1, 1, sizeof(short)), - gr_make_io_signature(1, 1, sizeof(unsigned char))) + : sync_block("avocoder_law_encode_sb", + io_signature::make(1, 1, sizeof(short)), + io_signature::make(1, 1, sizeof(unsigned char))) { } diff --git a/gr-vocoder/lib/alaw_encode_sb_impl.h b/gr-vocoder/lib/alaw_encode_sb_impl.h index 72112e35a9..0de1e2e6fd 100644 --- a/gr-vocoder/lib/alaw_encode_sb_impl.h +++ b/gr-vocoder/lib/alaw_encode_sb_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VOCODER_ALAW_ENCODER_SB_IMPL_H #define INCLUDED_VOCODER_ALAW_ENCODER_SB_IMPL_H -#include <vocoder/alaw_encode_sb.h> +#include <gnuradio/vocoder/alaw_encode_sb.h> namespace gr { namespace vocoder { diff --git a/gr-vocoder/lib/codec2_decode_ps_impl.cc b/gr-vocoder/lib/codec2_decode_ps_impl.cc index cd47c9e702..57ab62422e 100644 --- a/gr-vocoder/lib/codec2_decode_ps_impl.cc +++ b/gr-vocoder/lib/codec2_decode_ps_impl.cc @@ -30,7 +30,7 @@ extern "C" { #include "codec2/codec2.h" } -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> #include <assert.h> @@ -46,9 +46,9 @@ namespace gr { codec2_decode_ps_impl::codec2_decode_ps_impl () - : gr_sync_interpolator("vocoder_codec2_decode_ps", - gr_make_io_signature(1, 1, CODEC2_BITS_PER_FRAME * sizeof(char)), - gr_make_io_signature (1, 1, sizeof(short)), + : sync_interpolator("vocoder_codec2_decode_ps", + io_signature::make(1, 1, CODEC2_BITS_PER_FRAME * sizeof(char)), + io_signature::make (1, 1, sizeof(short)), CODEC2_SAMPLES_PER_FRAME) { if((d_codec2 = codec2_create()) == 0) diff --git a/gr-vocoder/lib/codec2_decode_ps_impl.h b/gr-vocoder/lib/codec2_decode_ps_impl.h index 26e39da1de..54b3744adf 100644 --- a/gr-vocoder/lib/codec2_decode_ps_impl.h +++ b/gr-vocoder/lib/codec2_decode_ps_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VOCODER_CODEC2_DECODE_PS_IMPL_H #define INCLUDED_VOCODER_CODEC2_DECODE_PS_IMPL_H -#include <vocoder/codec2_decode_ps.h> +#include <gnuradio/vocoder/codec2_decode_ps.h> namespace gr { namespace vocoder { diff --git a/gr-vocoder/lib/codec2_encode_sp_impl.cc b/gr-vocoder/lib/codec2_encode_sp_impl.cc index 0217fbd424..3f79e06409 100644 --- a/gr-vocoder/lib/codec2_encode_sp_impl.cc +++ b/gr-vocoder/lib/codec2_encode_sp_impl.cc @@ -30,7 +30,7 @@ extern "C" { #include "codec2/codec2.h" } -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> namespace gr { @@ -44,9 +44,9 @@ namespace gr { } codec2_encode_sp_impl::codec2_encode_sp_impl() - : gr_sync_decimator("vocoder_codec2_encode_sp", - gr_make_io_signature(1, 1, sizeof(short)), - gr_make_io_signature(1, 1, CODEC2_BITS_PER_FRAME * sizeof(char)), + : sync_decimator("vocoder_codec2_encode_sp", + io_signature::make(1, 1, sizeof(short)), + io_signature::make(1, 1, CODEC2_BITS_PER_FRAME * sizeof(char)), CODEC2_SAMPLES_PER_FRAME) { if((d_codec2 = codec2_create()) == 0) diff --git a/gr-vocoder/lib/codec2_encode_sp_impl.h b/gr-vocoder/lib/codec2_encode_sp_impl.h index 1a5c34c9d8..354bcc4718 100644 --- a/gr-vocoder/lib/codec2_encode_sp_impl.h +++ b/gr-vocoder/lib/codec2_encode_sp_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VOCODER_CODEC2_ENCODE_SP_IMPL_H #define INCLUDED_VOCODER_CODEC2_ENCODE_SP_IMPL_H -#include <vocoder/codec2_encode_sp.h> +#include <gnuradio/vocoder/codec2_encode_sp.h> namespace gr { namespace vocoder { diff --git a/gr-vocoder/lib/cvsd_decode_bs_impl.cc b/gr-vocoder/lib/cvsd_decode_bs_impl.cc index e7f284adda..57379b2162 100644 --- a/gr-vocoder/lib/cvsd_decode_bs_impl.cc +++ b/gr-vocoder/lib/cvsd_decode_bs_impl.cc @@ -25,7 +25,7 @@ #endif #include "cvsd_decode_bs_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <limits.h> namespace gr { @@ -45,9 +45,9 @@ namespace gr { cvsd_decode_bs_impl::cvsd_decode_bs_impl(short min_step, short max_step, double step_decay, double accum_decay, int K, int J, short pos_accum_max, short neg_accum_max) - : gr_sync_interpolator("vocoder_cvsd_decode_bs", - gr_make_io_signature(1, 1, sizeof(unsigned char)), - gr_make_io_signature(1, 1, sizeof(short)), + : sync_interpolator("vocoder_cvsd_decode_bs", + io_signature::make(1, 1, sizeof(unsigned char)), + io_signature::make(1, 1, sizeof(short)), 8), d_min_step(min_step), d_max_step(max_step), d_step_decay(step_decay), d_accum_decay(accum_decay), d_K(K), d_J(J), diff --git a/gr-vocoder/lib/cvsd_decode_bs_impl.h b/gr-vocoder/lib/cvsd_decode_bs_impl.h index 007c00c2bd..a9a7cede44 100644 --- a/gr-vocoder/lib/cvsd_decode_bs_impl.h +++ b/gr-vocoder/lib/cvsd_decode_bs_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VOCODER_CVSD_DECODE_BS_IMPL_H #define INCLUDED_VOCODER_CVSD_DECODE_BS_IMPL_H -#include <vocoder/cvsd_decode_bs.h> +#include <gnuradio/vocoder/cvsd_decode_bs.h> namespace gr { namespace vocoder { diff --git a/gr-vocoder/lib/cvsd_encode_sb_impl.cc b/gr-vocoder/lib/cvsd_encode_sb_impl.cc index 74ecdb25e1..b567f7868c 100644 --- a/gr-vocoder/lib/cvsd_encode_sb_impl.cc +++ b/gr-vocoder/lib/cvsd_encode_sb_impl.cc @@ -25,7 +25,7 @@ #endif #include "cvsd_encode_sb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <limits.h> namespace gr { @@ -45,9 +45,9 @@ namespace gr { cvsd_encode_sb_impl::cvsd_encode_sb_impl(short min_step, short max_step, double step_decay, double accum_decay, int K, int J, short pos_accum_max, short neg_accum_max) - : gr_sync_decimator("vocoder_cvsd_encode_sb", - gr_make_io_signature(1, 1, sizeof(short)), - gr_make_io_signature(1, 1, sizeof(unsigned char)), + : sync_decimator("vocoder_cvsd_encode_sb", + io_signature::make(1, 1, sizeof(short)), + io_signature::make(1, 1, sizeof(unsigned char)), 8), d_min_step (min_step), d_max_step(max_step), d_step_decay(step_decay), d_accum_decay(accum_decay), d_K(K), d_J(J), diff --git a/gr-vocoder/lib/cvsd_encode_sb_impl.h b/gr-vocoder/lib/cvsd_encode_sb_impl.h index 1189920fa0..78bbd3eeb3 100644 --- a/gr-vocoder/lib/cvsd_encode_sb_impl.h +++ b/gr-vocoder/lib/cvsd_encode_sb_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VOCODER_CVSD_ENCODER_SB_IMPL_H #define INCLUDED_VOCODER_CVSD_ENCODER_SB_IMPL_H -#include <vocoder/cvsd_encode_sb.h> +#include <gnuradio/vocoder/cvsd_encode_sb.h> namespace gr { namespace vocoder { diff --git a/gr-vocoder/lib/g721_decode_bs_impl.cc b/gr-vocoder/lib/g721_decode_bs_impl.cc index 143bbc514d..db23ffa677 100644 --- a/gr-vocoder/lib/g721_decode_bs_impl.cc +++ b/gr-vocoder/lib/g721_decode_bs_impl.cc @@ -25,7 +25,7 @@ #endif #include "g721_decode_bs_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <limits.h> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } g721_decode_bs_impl::g721_decode_bs_impl() - : gr_sync_block("vocoder_g721_decode_bs", - gr_make_io_signature(1, 1, sizeof(unsigned char)), - gr_make_io_signature(1, 1, sizeof(short))) + : sync_block("vocoder_g721_decode_bs", + io_signature::make(1, 1, sizeof(unsigned char)), + io_signature::make(1, 1, sizeof(short))) { g72x_init_state(&d_state); } diff --git a/gr-vocoder/lib/g721_decode_bs_impl.h b/gr-vocoder/lib/g721_decode_bs_impl.h index b861591e49..f5354e1364 100644 --- a/gr-vocoder/lib/g721_decode_bs_impl.h +++ b/gr-vocoder/lib/g721_decode_bs_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VOCODER_G721_DECODE_BS_IMPL_H #define INCLUDED_VOCODER_G721_DECODE_BS_IMPL_H -#include <vocoder/g721_decode_bs.h> +#include <gnuradio/vocoder/g721_decode_bs.h> extern "C" { #include "g7xx/g72x.h" diff --git a/gr-vocoder/lib/g721_encode_sb_impl.cc b/gr-vocoder/lib/g721_encode_sb_impl.cc index a961b0efeb..9293c46a83 100644 --- a/gr-vocoder/lib/g721_encode_sb_impl.cc +++ b/gr-vocoder/lib/g721_encode_sb_impl.cc @@ -25,7 +25,7 @@ #endif #include "g721_encode_sb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <limits.h> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } g721_encode_sb_impl::g721_encode_sb_impl() - : gr_sync_block("vocoder_g721_encode_sb", - gr_make_io_signature(1, 1, sizeof(short)), - gr_make_io_signature(1, 1, sizeof(unsigned char))) + : sync_block("vocoder_g721_encode_sb", + io_signature::make(1, 1, sizeof(short)), + io_signature::make(1, 1, sizeof(unsigned char))) { g72x_init_state(&d_state); } diff --git a/gr-vocoder/lib/g721_encode_sb_impl.h b/gr-vocoder/lib/g721_encode_sb_impl.h index f22949aa45..5fc3388ef9 100644 --- a/gr-vocoder/lib/g721_encode_sb_impl.h +++ b/gr-vocoder/lib/g721_encode_sb_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VOCODER_G721_ENCODE_SB_IMPL_H #define INCLUDED_VOCODER_G721_ENCODE_SB_IMPL_H -#include <vocoder/g721_encode_sb.h> +#include <gnuradio/vocoder/g721_encode_sb.h> extern "C" { #include "g7xx/g72x.h" diff --git a/gr-vocoder/lib/g723_24_decode_bs_impl.cc b/gr-vocoder/lib/g723_24_decode_bs_impl.cc index f7a8b59a08..c78229c4f3 100644 --- a/gr-vocoder/lib/g723_24_decode_bs_impl.cc +++ b/gr-vocoder/lib/g723_24_decode_bs_impl.cc @@ -25,7 +25,7 @@ #endif #include "g723_24_decode_bs_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <limits.h> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } g723_24_decode_bs_impl::g723_24_decode_bs_impl() - : gr_sync_block("vocoder_g723_24_decode_bs", - gr_make_io_signature(1, 1, sizeof(unsigned char)), - gr_make_io_signature(1, 1, sizeof(short))) + : sync_block("vocoder_g723_24_decode_bs", + io_signature::make(1, 1, sizeof(unsigned char)), + io_signature::make(1, 1, sizeof(short))) { g72x_init_state(&d_state); } diff --git a/gr-vocoder/lib/g723_24_decode_bs_impl.h b/gr-vocoder/lib/g723_24_decode_bs_impl.h index 3ecea1b1ef..454bed76c6 100644 --- a/gr-vocoder/lib/g723_24_decode_bs_impl.h +++ b/gr-vocoder/lib/g723_24_decode_bs_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VOCODER_G723_24_DECODE_BS_IMPL_H #define INCLUDED_VOCODER_G723_24_DECODE_BS_IMPL_H -#include <vocoder/g723_24_decode_bs.h> +#include <gnuradio/vocoder/g723_24_decode_bs.h> extern "C" { #include "g7xx/g72x.h" diff --git a/gr-vocoder/lib/g723_24_encode_sb_impl.cc b/gr-vocoder/lib/g723_24_encode_sb_impl.cc index 8b168197b5..cf721e3580 100644 --- a/gr-vocoder/lib/g723_24_encode_sb_impl.cc +++ b/gr-vocoder/lib/g723_24_encode_sb_impl.cc @@ -25,7 +25,7 @@ #endif #include "g723_24_encode_sb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <limits.h> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } g723_24_encode_sb_impl::g723_24_encode_sb_impl() - : gr_sync_block("vocoder_g723_24_encode_sb", - gr_make_io_signature(1, 1, sizeof(short)), - gr_make_io_signature(1, 1, sizeof(unsigned char))) + : sync_block("vocoder_g723_24_encode_sb", + io_signature::make(1, 1, sizeof(short)), + io_signature::make(1, 1, sizeof(unsigned char))) { g72x_init_state(&d_state); } diff --git a/gr-vocoder/lib/g723_24_encode_sb_impl.h b/gr-vocoder/lib/g723_24_encode_sb_impl.h index d7a44bc57b..9bad56009e 100644 --- a/gr-vocoder/lib/g723_24_encode_sb_impl.h +++ b/gr-vocoder/lib/g723_24_encode_sb_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VOCODER_G723_24_ENCODE_SB_IMPL_H #define INCLUDED_VOCODER_G723_24_ENCODE_SB_IMPL_H -#include <vocoder/g723_24_encode_sb.h> +#include <gnuradio/vocoder/g723_24_encode_sb.h> extern "C" { #include "g7xx/g72x.h" diff --git a/gr-vocoder/lib/g723_40_decode_bs_impl.cc b/gr-vocoder/lib/g723_40_decode_bs_impl.cc index 0790c9481c..4302583200 100644 --- a/gr-vocoder/lib/g723_40_decode_bs_impl.cc +++ b/gr-vocoder/lib/g723_40_decode_bs_impl.cc @@ -25,7 +25,7 @@ #endif #include "g723_40_decode_bs_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <limits.h> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } g723_40_decode_bs_impl::g723_40_decode_bs_impl() - : gr_sync_block("vocoder_g723_40_decode_bs", - gr_make_io_signature(1, 1, sizeof(unsigned char)), - gr_make_io_signature(1, 1, sizeof(short))) + : sync_block("vocoder_g723_40_decode_bs", + io_signature::make(1, 1, sizeof(unsigned char)), + io_signature::make(1, 1, sizeof(short))) { g72x_init_state(&d_state); } diff --git a/gr-vocoder/lib/g723_40_decode_bs_impl.h b/gr-vocoder/lib/g723_40_decode_bs_impl.h index 3d5b4d6b7f..4efd8c5905 100644 --- a/gr-vocoder/lib/g723_40_decode_bs_impl.h +++ b/gr-vocoder/lib/g723_40_decode_bs_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VOCODER_G723_40_DECODE_BS_IMPL_H #define INCLUDED_VOCODER_G723_40_DECODE_BS_IMPL_H -#include <vocoder/g723_40_decode_bs.h> +#include <gnuradio/vocoder/g723_40_decode_bs.h> extern "C" { #include "g7xx/g72x.h" diff --git a/gr-vocoder/lib/g723_40_encode_sb_impl.cc b/gr-vocoder/lib/g723_40_encode_sb_impl.cc index 54dd052637..ff1910c55f 100644 --- a/gr-vocoder/lib/g723_40_encode_sb_impl.cc +++ b/gr-vocoder/lib/g723_40_encode_sb_impl.cc @@ -25,7 +25,7 @@ #endif #include "g723_40_encode_sb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <limits.h> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } g723_40_encode_sb_impl::g723_40_encode_sb_impl() - : gr_sync_block("vocoder_g723_40_encode_sb", - gr_make_io_signature(1, 1, sizeof(short)), - gr_make_io_signature(1, 1, sizeof(unsigned char))) + : sync_block("vocoder_g723_40_encode_sb", + io_signature::make(1, 1, sizeof(short)), + io_signature::make(1, 1, sizeof(unsigned char))) { g72x_init_state(&d_state); } diff --git a/gr-vocoder/lib/g723_40_encode_sb_impl.h b/gr-vocoder/lib/g723_40_encode_sb_impl.h index a4093e1fc7..f2160b7097 100644 --- a/gr-vocoder/lib/g723_40_encode_sb_impl.h +++ b/gr-vocoder/lib/g723_40_encode_sb_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VOCODER_G723_40_ENCODE_SB_IMPL_H #define INCLUDED_VOCODER_G723_40_ENCODE_SB_IMPL_H -#include <vocoder/g723_40_encode_sb.h> +#include <gnuradio/vocoder/g723_40_encode_sb.h> extern "C" { #include "g7xx/g72x.h" diff --git a/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc b/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc index 2b3d11135c..e318a60668 100644 --- a/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc +++ b/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc @@ -25,7 +25,7 @@ #endif #include "gsm_fr_decode_ps_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> #include <assert.h> @@ -40,9 +40,9 @@ namespace gr { } gsm_fr_decode_ps_impl::gsm_fr_decode_ps_impl() - : gr_sync_interpolator("vocoder_gsm_fr_decode_ps", - gr_make_io_signature(1, 1, sizeof(gsm_frame)), - gr_make_io_signature(1, 1, sizeof(short)), + : sync_interpolator("vocoder_gsm_fr_decode_ps", + io_signature::make(1, 1, sizeof(gsm_frame)), + io_signature::make(1, 1, sizeof(short)), GSM_SAMPLES_PER_FRAME) { if((d_gsm = gsm_create()) == 0) diff --git a/gr-vocoder/lib/gsm_fr_decode_ps_impl.h b/gr-vocoder/lib/gsm_fr_decode_ps_impl.h index 3c1bb351d6..878d40c92a 100644 --- a/gr-vocoder/lib/gsm_fr_decode_ps_impl.h +++ b/gr-vocoder/lib/gsm_fr_decode_ps_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VOCODER_GSM_FR_DECODE_PS_IMPL_H #define INCLUDED_VOCODER_GSM_FR_DECODE_PS_IMPL_H -#include <vocoder/gsm_fr_decode_ps.h> +#include <gnuradio/vocoder/gsm_fr_decode_ps.h> extern "C"{ #include "gsm/gsm.h" diff --git a/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc b/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc index c7b10089fb..143a73bce7 100644 --- a/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc +++ b/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc @@ -25,7 +25,7 @@ #endif #include "gsm_fr_encode_sp_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <stdexcept> namespace gr { @@ -39,9 +39,9 @@ namespace gr { } gsm_fr_encode_sp_impl::gsm_fr_encode_sp_impl() - : gr_sync_decimator("vocoder_gsm_fr_encode_sp", - gr_make_io_signature(1, 1, sizeof(short)), - gr_make_io_signature(1, 1, sizeof(gsm_frame)), + : sync_decimator("vocoder_gsm_fr_encode_sp", + io_signature::make(1, 1, sizeof(short)), + io_signature::make(1, 1, sizeof(gsm_frame)), GSM_SAMPLES_PER_FRAME) { if((d_gsm = gsm_create ()) == 0) diff --git a/gr-vocoder/lib/gsm_fr_encode_sp_impl.h b/gr-vocoder/lib/gsm_fr_encode_sp_impl.h index a5501deaae..c4629dd984 100644 --- a/gr-vocoder/lib/gsm_fr_encode_sp_impl.h +++ b/gr-vocoder/lib/gsm_fr_encode_sp_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VOCODER_GSM_FR_ENCODE_SP_IMPL_H #define INCLUDED_VOCODER_GSM_FR_ENCODE_SP_IMPL_H -#include <vocoder/gsm_fr_encode_sp.h> +#include <gnuradio/vocoder/gsm_fr_encode_sp.h> extern "C"{ #include "gsm/gsm.h" diff --git a/gr-vocoder/lib/ulaw_decode_bs_impl.cc b/gr-vocoder/lib/ulaw_decode_bs_impl.cc index d0c99b70a0..bbf58a54da 100644 --- a/gr-vocoder/lib/ulaw_decode_bs_impl.cc +++ b/gr-vocoder/lib/ulaw_decode_bs_impl.cc @@ -25,7 +25,7 @@ #endif #include "ulaw_decode_bs_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <limits.h> namespace gr { @@ -43,9 +43,9 @@ extern "C" { } ulaw_decode_bs_impl::ulaw_decode_bs_impl() - : gr_sync_block("vocoder_ulaw_decode_bs", - gr_make_io_signature(1, 1, sizeof(unsigned char)), - gr_make_io_signature(1, 1, sizeof(short))) + : sync_block("vocoder_ulaw_decode_bs", + io_signature::make(1, 1, sizeof(unsigned char)), + io_signature::make(1, 1, sizeof(short))) { } diff --git a/gr-vocoder/lib/ulaw_decode_bs_impl.h b/gr-vocoder/lib/ulaw_decode_bs_impl.h index db7a0dcab9..9e5d238b49 100644 --- a/gr-vocoder/lib/ulaw_decode_bs_impl.h +++ b/gr-vocoder/lib/ulaw_decode_bs_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VOCODER_ULAW_DECODE_BS_IMPL_H #define INCLUDED_VOCODER_ULAW_DECODE_BS_IMPL_H -#include <vocoder/ulaw_decode_bs.h> +#include <gnuradio/vocoder/ulaw_decode_bs.h> namespace gr { namespace vocoder { diff --git a/gr-vocoder/lib/ulaw_encode_sb_impl.cc b/gr-vocoder/lib/ulaw_encode_sb_impl.cc index a49df12b59..83d3864965 100644 --- a/gr-vocoder/lib/ulaw_encode_sb_impl.cc +++ b/gr-vocoder/lib/ulaw_encode_sb_impl.cc @@ -25,7 +25,7 @@ #endif #include "ulaw_encode_sb_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <limits.h> namespace gr { @@ -43,9 +43,9 @@ extern "C" { } ulaw_encode_sb_impl::ulaw_encode_sb_impl() - : gr_sync_block("vocoder_ulaw_encode_sb", - gr_make_io_signature(1, 1, sizeof(short)), - gr_make_io_signature(1, 1, sizeof(unsigned char))) + : sync_block("vocoder_ulaw_encode_sb", + io_signature::make(1, 1, sizeof(short)), + io_signature::make(1, 1, sizeof(unsigned char))) { } diff --git a/gr-vocoder/lib/ulaw_encode_sb_impl.h b/gr-vocoder/lib/ulaw_encode_sb_impl.h index 2ce207fbf8..48227a86da 100644 --- a/gr-vocoder/lib/ulaw_encode_sb_impl.h +++ b/gr-vocoder/lib/ulaw_encode_sb_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VOCODER_ULAW_ENCODER_SB_IMPL_H #define INCLUDED_VOCODER_ULAW_ENCODER_SB_IMPL_H -#include <vocoder/ulaw_encode_sb.h> +#include <gnuradio/vocoder/ulaw_encode_sb.h> namespace gr { namespace vocoder { diff --git a/gr-vocoder/swig/CMakeLists.txt b/gr-vocoder/swig/CMakeLists.txt index 14d894ced9..2c2a7a6791 100644 --- a/gr-vocoder/swig/CMakeLists.txt +++ b/gr-vocoder/swig/CMakeLists.txt @@ -35,7 +35,7 @@ if(ENABLE_GR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/vocoder_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/vocoder) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/vocoder) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_LIBRARIES gnuradio-vocoder) diff --git a/gr-vocoder/swig/vocoder_swig.i b/gr-vocoder/swig/vocoder_swig.i index b3dd436868..d7cb99c239 100644 --- a/gr-vocoder/swig/vocoder_swig.i +++ b/gr-vocoder/swig/vocoder_swig.i @@ -28,40 +28,40 @@ %include "vocoder_swig_doc.i" %{ -#include "vocoder/alaw_decode_bs.h" -#include "vocoder/alaw_encode_sb.h" -#include "vocoder/codec2_decode_ps.h" -#include "vocoder/codec2_encode_sp.h" -#include "vocoder/cvsd_decode_bs.h" -#include "vocoder/cvsd_encode_sb.h" -#include "vocoder/g721_decode_bs.h" -#include "vocoder/g721_encode_sb.h" -#include "vocoder/g723_24_decode_bs.h" -#include "vocoder/g723_24_encode_sb.h" -#include "vocoder/g723_40_decode_bs.h" -#include "vocoder/g723_40_encode_sb.h" -#include "vocoder/gsm_fr_decode_ps.h" -#include "vocoder/gsm_fr_encode_sp.h" -#include "vocoder/ulaw_decode_bs.h" -#include "vocoder/ulaw_encode_sb.h" +#include "gnuradio/vocoder/alaw_decode_bs.h" +#include "gnuradio/vocoder/alaw_encode_sb.h" +#include "gnuradio/vocoder/codec2_decode_ps.h" +#include "gnuradio/vocoder/codec2_encode_sp.h" +#include "gnuradio/vocoder/cvsd_decode_bs.h" +#include "gnuradio/vocoder/cvsd_encode_sb.h" +#include "gnuradio/vocoder/g721_decode_bs.h" +#include "gnuradio/vocoder/g721_encode_sb.h" +#include "gnuradio/vocoder/g723_24_decode_bs.h" +#include "gnuradio/vocoder/g723_24_encode_sb.h" +#include "gnuradio/vocoder/g723_40_decode_bs.h" +#include "gnuradio/vocoder/g723_40_encode_sb.h" +#include "gnuradio/vocoder/gsm_fr_decode_ps.h" +#include "gnuradio/vocoder/gsm_fr_encode_sp.h" +#include "gnuradio/vocoder/ulaw_decode_bs.h" +#include "gnuradio/vocoder/ulaw_encode_sb.h" %} -%include "vocoder/alaw_decode_bs.h" -%include "vocoder/alaw_encode_sb.h" -%include "vocoder/codec2_decode_ps.h" -%include "vocoder/codec2_encode_sp.h" -%include "vocoder/cvsd_decode_bs.h" -%include "vocoder/cvsd_encode_sb.h" -%include "vocoder/g721_decode_bs.h" -%include "vocoder/g721_encode_sb.h" -%include "vocoder/g723_24_decode_bs.h" -%include "vocoder/g723_24_encode_sb.h" -%include "vocoder/g723_40_decode_bs.h" -%include "vocoder/g723_40_encode_sb.h" -%include "vocoder/gsm_fr_decode_ps.h" -%include "vocoder/gsm_fr_encode_sp.h" -%include "vocoder/ulaw_decode_bs.h" -%include "vocoder/ulaw_encode_sb.h" +%include "gnuradio/vocoder/alaw_decode_bs.h" +%include "gnuradio/vocoder/alaw_encode_sb.h" +%include "gnuradio/vocoder/codec2_decode_ps.h" +%include "gnuradio/vocoder/codec2_encode_sp.h" +%include "gnuradio/vocoder/cvsd_decode_bs.h" +%include "gnuradio/vocoder/cvsd_encode_sb.h" +%include "gnuradio/vocoder/g721_decode_bs.h" +%include "gnuradio/vocoder/g721_encode_sb.h" +%include "gnuradio/vocoder/g723_24_decode_bs.h" +%include "gnuradio/vocoder/g723_24_encode_sb.h" +%include "gnuradio/vocoder/g723_40_decode_bs.h" +%include "gnuradio/vocoder/g723_40_encode_sb.h" +%include "gnuradio/vocoder/gsm_fr_decode_ps.h" +%include "gnuradio/vocoder/gsm_fr_encode_sp.h" +%include "gnuradio/vocoder/ulaw_decode_bs.h" +%include "gnuradio/vocoder/ulaw_encode_sb.h" GR_SWIG_BLOCK_MAGIC2(vocoder, alaw_decode_bs); GR_SWIG_BLOCK_MAGIC2(vocoder, alaw_encode_sb); |