diff options
Diffstat (limited to 'gr-vocoder/include')
19 files changed, 135 insertions, 42 deletions
diff --git a/gr-vocoder/include/CMakeLists.txt b/gr-vocoder/include/CMakeLists.txt new file mode 100644 index 000000000..390a0afb5 --- /dev/null +++ b/gr-vocoder/include/CMakeLists.txt @@ -0,0 +1,43 @@ +# Copyright 2011 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. + +######################################################################## +# Install header files +######################################################################## +INSTALL(FILES + vocoder_api.h + vocoder_alaw_decode_bs.h + vocoder_alaw_encode_sb.h + vocoder_codec2_decode_ps.h + vocoder_codec2_encode_sp.h + vocoder_cvsd_decode_bs.h + vocoder_cvsd_encode_sb.h + vocoder_g721_decode_bs.h + vocoder_g721_encode_sb.h + vocoder_g723_24_decode_bs.h + vocoder_g723_24_encode_sb.h + vocoder_g723_40_decode_bs.h + vocoder_g723_40_encode_sb.h + vocoder_gsm_fr_decode_ps.h + vocoder_gsm_fr_encode_sp.h + vocoder_ulaw_decode_bs.h + vocoder_ulaw_encode_sb.h + DESTINATION ${GR_INCLUDE_DIR}/gnuradio + COMPONENT "vocoder_devel" +) diff --git a/gr-vocoder/include/Makefile.am b/gr-vocoder/include/Makefile.am index aab77e3f9..b579333a3 100644 --- a/gr-vocoder/include/Makefile.am +++ b/gr-vocoder/include/Makefile.am @@ -23,6 +23,7 @@ include $(top_srcdir)/Makefile.common # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ + vocoder_api.h \ vocoder_alaw_decode_bs.h \ vocoder_alaw_encode_sb.h \ vocoder_codec2_decode_ps.h \ diff --git a/gr-vocoder/include/vocoder_alaw_decode_bs.h b/gr-vocoder/include/vocoder_alaw_decode_bs.h index b71569439..f20dfefdb 100644 --- a/gr-vocoder/include/vocoder_alaw_decode_bs.h +++ b/gr-vocoder/include/vocoder_alaw_decode_bs.h @@ -23,13 +23,14 @@ #ifndef INCLUDED_VOCODER_ALAW_DECODE_BS_H #define INCLUDED_VOCODER_ALAW_DECODE_BS_H +#include <vocoder_api.h> #include <gr_sync_block.h> class vocoder_alaw_decode_bs; typedef boost::shared_ptr<vocoder_alaw_decode_bs> vocoder_alaw_decode_bs_sptr; -vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs(); +VOCODER_API vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs(); /*! * \brief This block performs alaw audio decoding. @@ -37,10 +38,10 @@ vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs(); * \ingroup vocoder_blk */ -class vocoder_alaw_decode_bs : public gr_sync_block +class VOCODER_API vocoder_alaw_decode_bs : public gr_sync_block { private: - friend vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs(); + friend VOCODER_API vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs(); vocoder_alaw_decode_bs(); diff --git a/gr-vocoder/include/vocoder_alaw_encode_sb.h b/gr-vocoder/include/vocoder_alaw_encode_sb.h index d1858d048..c00080fb7 100644 --- a/gr-vocoder/include/vocoder_alaw_encode_sb.h +++ b/gr-vocoder/include/vocoder_alaw_encode_sb.h @@ -23,23 +23,24 @@ #ifndef INCLUDED_VOCODER_ALAW_ENCODER_SB_H #define INCLUDED_VOCODER_ALAW_ENCODER_SB_H +#include <vocoder_api.h> #include <gr_sync_block.h> class vocoder_alaw_encode_sb; typedef boost::shared_ptr<vocoder_alaw_encode_sb> vocoder_alaw_encode_sb_sptr; -vocoder_alaw_encode_sb_sptr vocoder_make_alaw_encode_sb(); +VOCODER_API vocoder_alaw_encode_sb_sptr vocoder_make_alaw_encode_sb(); /*! * \brief This block performs g.711 alaw audio encoding. * * \ingroup vocoder_blk */ -class vocoder_alaw_encode_sb : public gr_sync_block +class VOCODER_API vocoder_alaw_encode_sb : public gr_sync_block { private: - friend vocoder_alaw_encode_sb_sptr vocoder_make_alaw_encode_sb(); + friend VOCODER_API vocoder_alaw_encode_sb_sptr vocoder_make_alaw_encode_sb(); vocoder_alaw_encode_sb(); diff --git a/gr-vocoder/include/vocoder_api.h b/gr-vocoder/include/vocoder_api.h new file mode 100644 index 000000000..331cf5d0b --- /dev/null +++ b/gr-vocoder/include/vocoder_api.h @@ -0,0 +1,33 @@ +/* + * Copyright 2011 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +#ifndef INCLUDED_VOCODER_API_H +#define INCLUDED_VOCODER_API_H + +#include <gruel/attributes.h> + +#ifdef gnuradio_vocoder_EXPORTS +# define VOCODER_API __GR_ATTR_EXPORT +#else +# define VOCODER_API __GR_ATTR_IMPORT +#endif + +#endif /* INCLUDED_VOCODER_API_H */ diff --git a/gr-vocoder/include/vocoder_codec2_decode_ps.h b/gr-vocoder/include/vocoder_codec2_decode_ps.h index 02b80a454..7e7ea2d5c 100644 --- a/gr-vocoder/include/vocoder_codec2_decode_ps.h +++ b/gr-vocoder/include/vocoder_codec2_decode_ps.h @@ -22,21 +22,22 @@ #ifndef INCLUDED_VOCODER_CODEC2_DECODE_PS_H #define INCLUDED_VOCODER_CODEC2_DECODE_PS_H +#include <vocoder_api.h> #include <gr_sync_interpolator.h> class vocoder_codec2_decode_ps; typedef boost::shared_ptr<vocoder_codec2_decode_ps> vocoder_codec2_decode_ps_sptr; -vocoder_codec2_decode_ps_sptr vocoder_make_codec2_decode_ps (); +VOCODER_API vocoder_codec2_decode_ps_sptr vocoder_make_codec2_decode_ps (); /*! * \brief CODEC2 Vocoder Decoder * \ingroup vocoder_blk */ -class vocoder_codec2_decode_ps : public gr_sync_interpolator { +class VOCODER_API vocoder_codec2_decode_ps : public gr_sync_interpolator { void *d_codec2; - friend vocoder_codec2_decode_ps_sptr vocoder_make_codec2_decode_ps (); + friend VOCODER_API vocoder_codec2_decode_ps_sptr vocoder_make_codec2_decode_ps (); vocoder_codec2_decode_ps (); public: diff --git a/gr-vocoder/include/vocoder_codec2_encode_sp.h b/gr-vocoder/include/vocoder_codec2_encode_sp.h index de4784f8d..8d8588daf 100644 --- a/gr-vocoder/include/vocoder_codec2_encode_sp.h +++ b/gr-vocoder/include/vocoder_codec2_encode_sp.h @@ -22,21 +22,22 @@ #ifndef INCLUDED_VOCODER_CODEC2_ENCODE_SP_H #define INCLUDED_VOCODER_CODEC2_ENCODE_SP_H +#include <vocoder_api.h> #include <gr_sync_decimator.h> class vocoder_codec2_encode_sp; typedef boost::shared_ptr<vocoder_codec2_encode_sp> vocoder_codec2_encode_sp_sptr; -vocoder_codec2_encode_sp_sptr vocoder_make_codec2_encode_sp (); +VOCODER_API vocoder_codec2_encode_sp_sptr vocoder_make_codec2_encode_sp (); /*! * \brief CODEC2 Vocoder Encoder * \ingroup vocoder_blk */ -class vocoder_codec2_encode_sp : public gr_sync_decimator { +class VOCODER_API vocoder_codec2_encode_sp : public gr_sync_decimator { void *d_codec2; - friend vocoder_codec2_encode_sp_sptr vocoder_make_codec2_encode_sp (); + friend VOCODER_API vocoder_codec2_encode_sp_sptr vocoder_make_codec2_encode_sp (); vocoder_codec2_encode_sp (); public: diff --git a/gr-vocoder/include/vocoder_cvsd_decode_bs.h b/gr-vocoder/include/vocoder_cvsd_decode_bs.h index dd588c661..1204e298b 100644 --- a/gr-vocoder/include/vocoder_cvsd_decode_bs.h +++ b/gr-vocoder/include/vocoder_cvsd_decode_bs.h @@ -23,6 +23,7 @@ #ifndef INCLUDED_VOCODER_CVSD_DECODE_BS_H #define INCLUDED_VOCODER_CVSD_DECODE_BS_H +#include <vocoder_api.h> #include <gr_sync_interpolator.h> class vocoder_cvsd_decode_bs; @@ -44,7 +45,7 @@ typedef boost::shared_ptr<vocoder_cvsd_decode_bs> vocoder_cvsd_decode_bs_sptr; * \param neg_accum_max Minimum integer value allowed for the internal reference. Default: "-32767" (-2^15 + 1 or MINSHORT+1) * */ -vocoder_cvsd_decode_bs_sptr vocoder_make_cvsd_decode_bs (short min_step=10, +VOCODER_API vocoder_cvsd_decode_bs_sptr vocoder_make_cvsd_decode_bs (short min_step=10, short max_step=1280, double step_decay=0.9990234375, double accum_decay= 0.96875, @@ -105,10 +106,10 @@ vocoder_cvsd_decode_bs_sptr vocoder_make_cvsd_decode_bs (short min_step=10, * */ -class vocoder_cvsd_decode_bs : public gr_sync_interpolator +class VOCODER_API vocoder_cvsd_decode_bs : public gr_sync_interpolator { private: - friend vocoder_cvsd_decode_bs_sptr vocoder_make_cvsd_decode_bs (short min_step, + friend VOCODER_API vocoder_cvsd_decode_bs_sptr vocoder_make_cvsd_decode_bs (short min_step, short max_step, double step_decay, double accum_decay, diff --git a/gr-vocoder/include/vocoder_cvsd_encode_sb.h b/gr-vocoder/include/vocoder_cvsd_encode_sb.h index da09b3927..4a2d31147 100644 --- a/gr-vocoder/include/vocoder_cvsd_encode_sb.h +++ b/gr-vocoder/include/vocoder_cvsd_encode_sb.h @@ -22,6 +22,7 @@ #ifndef INCLUDED_VOCODER_CVSD_ENCODER_SB_H #define INCLUDED_VOCODER_CVSD_ENCODER_SB_H +#include <vocoder_api.h> #include <gr_sync_decimator.h> class vocoder_cvsd_encode_sb; @@ -44,7 +45,7 @@ typedef boost::shared_ptr<vocoder_cvsd_encode_sb> vocoder_cvsd_encode_sb_sptr; * */ -vocoder_cvsd_encode_sb_sptr vocoder_make_cvsd_encode_sb(short min_step=10, +VOCODER_API vocoder_cvsd_encode_sb_sptr vocoder_make_cvsd_encode_sb(short min_step=10, short max_step=1280, double step_decay=0.9990234375, double accum_decay= 0.96875, @@ -107,10 +108,10 @@ vocoder_cvsd_encode_sb_sptr vocoder_make_cvsd_encode_sb(short min_step=10, * */ -class vocoder_cvsd_encode_sb : public gr_sync_decimator +class VOCODER_API vocoder_cvsd_encode_sb : public gr_sync_decimator { private: - friend vocoder_cvsd_encode_sb_sptr vocoder_make_cvsd_encode_sb(short min_step, + friend VOCODER_API vocoder_cvsd_encode_sb_sptr vocoder_make_cvsd_encode_sb(short min_step, short max_step, double step_decay, double accum_decay, diff --git a/gr-vocoder/include/vocoder_g721_decode_bs.h b/gr-vocoder/include/vocoder_g721_decode_bs.h index 8ce3b12e5..1ac7b993a 100644 --- a/gr-vocoder/include/vocoder_g721_decode_bs.h +++ b/gr-vocoder/include/vocoder_g721_decode_bs.h @@ -23,13 +23,14 @@ #ifndef INCLUDED_VOCODER_G721_DECODE_BS_H #define INCLUDED_VOCODER_G721_DECODE_BS_H +#include <vocoder_api.h> #include <gr_sync_block.h> class vocoder_g721_decode_bs; typedef boost::shared_ptr<vocoder_g721_decode_bs> vocoder_g721_decode_bs_sptr; -vocoder_g721_decode_bs_sptr vocoder_make_g721_decode_bs(); +VOCODER_API vocoder_g721_decode_bs_sptr vocoder_make_g721_decode_bs(); /*! * \brief This block performs g721 audio decoding. @@ -37,7 +38,7 @@ vocoder_g721_decode_bs_sptr vocoder_make_g721_decode_bs(); * \ingroup vocoder_blk */ -class vocoder_g721_decode_bs : virtual public gr_sync_block +class VOCODER_API vocoder_g721_decode_bs : virtual public gr_sync_block { }; diff --git a/gr-vocoder/include/vocoder_g721_encode_sb.h b/gr-vocoder/include/vocoder_g721_encode_sb.h index 5af980640..a154537d0 100644 --- a/gr-vocoder/include/vocoder_g721_encode_sb.h +++ b/gr-vocoder/include/vocoder_g721_encode_sb.h @@ -23,13 +23,14 @@ #ifndef INCLUDED_VOCODER_G721_ENCODE_SB_H #define INCLUDED_VOCODER_G721_ENCODE_SB_H +#include <vocoder_api.h> #include <gr_sync_block.h> class vocoder_g721_encode_sb; typedef boost::shared_ptr<vocoder_g721_encode_sb> vocoder_g721_encode_sb_sptr; -vocoder_g721_encode_sb_sptr vocoder_make_g721_encode_sb(); +VOCODER_API vocoder_g721_encode_sb_sptr vocoder_make_g721_encode_sb(); /*! * \brief This block performs g721 audio encoding. @@ -37,7 +38,7 @@ vocoder_g721_encode_sb_sptr vocoder_make_g721_encode_sb(); * \ingroup vocoder_blk */ -class vocoder_g721_encode_sb : virtual public gr_sync_block +class VOCODER_API vocoder_g721_encode_sb : virtual public gr_sync_block { }; diff --git a/gr-vocoder/include/vocoder_g723_24_decode_bs.h b/gr-vocoder/include/vocoder_g723_24_decode_bs.h index 8ca94f253..80cdbddd4 100644 --- a/gr-vocoder/include/vocoder_g723_24_decode_bs.h +++ b/gr-vocoder/include/vocoder_g723_24_decode_bs.h @@ -23,13 +23,14 @@ #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> class vocoder_g723_24_decode_bs; typedef boost::shared_ptr<vocoder_g723_24_decode_bs> vocoder_g723_24_decode_bs_sptr; -vocoder_g723_24_decode_bs_sptr vocoder_make_g723_24_decode_bs(); +VOCODER_API vocoder_g723_24_decode_bs_sptr vocoder_make_g723_24_decode_bs(); /*! * \brief This block performs g723_24 audio decoding. @@ -37,7 +38,7 @@ vocoder_g723_24_decode_bs_sptr vocoder_make_g723_24_decode_bs(); * \ingroup vocoder_blk */ -class vocoder_g723_24_decode_bs : virtual public gr_sync_block +class VOCODER_API vocoder_g723_24_decode_bs : virtual public gr_sync_block { }; diff --git a/gr-vocoder/include/vocoder_g723_24_encode_sb.h b/gr-vocoder/include/vocoder_g723_24_encode_sb.h index b55229980..d290e0971 100644 --- a/gr-vocoder/include/vocoder_g723_24_encode_sb.h +++ b/gr-vocoder/include/vocoder_g723_24_encode_sb.h @@ -23,13 +23,14 @@ #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> class vocoder_g723_24_encode_sb; typedef boost::shared_ptr<vocoder_g723_24_encode_sb> vocoder_g723_24_encode_sb_sptr; -vocoder_g723_24_encode_sb_sptr vocoder_make_g723_24_encode_sb(); +VOCODER_API vocoder_g723_24_encode_sb_sptr vocoder_make_g723_24_encode_sb(); /*! * \brief This block performs g723_24 audio encoding. @@ -37,7 +38,7 @@ vocoder_g723_24_encode_sb_sptr vocoder_make_g723_24_encode_sb(); * \ingroup vocoder_blk */ -class vocoder_g723_24_encode_sb : virtual public gr_sync_block +class VOCODER_API vocoder_g723_24_encode_sb : virtual public gr_sync_block { }; diff --git a/gr-vocoder/include/vocoder_g723_40_decode_bs.h b/gr-vocoder/include/vocoder_g723_40_decode_bs.h index 2299b8806..87a2f6892 100644 --- a/gr-vocoder/include/vocoder_g723_40_decode_bs.h +++ b/gr-vocoder/include/vocoder_g723_40_decode_bs.h @@ -23,13 +23,14 @@ #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> class vocoder_g723_40_decode_bs; typedef boost::shared_ptr<vocoder_g723_40_decode_bs> vocoder_g723_40_decode_bs_sptr; -vocoder_g723_40_decode_bs_sptr vocoder_make_g723_40_decode_bs(); +VOCODER_API vocoder_g723_40_decode_bs_sptr vocoder_make_g723_40_decode_bs(); /*! * \brief This block performs g723_40 audio decoding. @@ -37,7 +38,7 @@ vocoder_g723_40_decode_bs_sptr vocoder_make_g723_40_decode_bs(); * \ingroup vocoder_blk */ -class vocoder_g723_40_decode_bs : virtual public gr_sync_block +class VOCODER_API vocoder_g723_40_decode_bs : virtual public gr_sync_block { }; diff --git a/gr-vocoder/include/vocoder_g723_40_encode_sb.h b/gr-vocoder/include/vocoder_g723_40_encode_sb.h index f349cf425..6ac0f6d05 100644 --- a/gr-vocoder/include/vocoder_g723_40_encode_sb.h +++ b/gr-vocoder/include/vocoder_g723_40_encode_sb.h @@ -23,13 +23,14 @@ #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> class vocoder_g723_40_encode_sb; typedef boost::shared_ptr<vocoder_g723_40_encode_sb> vocoder_g723_40_encode_sb_sptr; -vocoder_g723_40_encode_sb_sptr vocoder_make_g723_40_encode_sb(); +VOCODER_API vocoder_g723_40_encode_sb_sptr vocoder_make_g723_40_encode_sb(); /*! * \brief This block performs g723_40 audio encoding. @@ -37,7 +38,7 @@ vocoder_g723_40_encode_sb_sptr vocoder_make_g723_40_encode_sb(); * \ingroup vocoder_blk */ -class vocoder_g723_40_encode_sb : virtual public gr_sync_block +class VOCODER_API vocoder_g723_40_encode_sb : virtual public gr_sync_block { }; diff --git a/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h b/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h index 4c6248d39..748ff5f0f 100644 --- a/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h +++ b/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h @@ -23,21 +23,22 @@ #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> class vocoder_gsm_fr_decode_ps; typedef boost::shared_ptr<vocoder_gsm_fr_decode_ps> vocoder_gsm_fr_decode_ps_sptr; -vocoder_gsm_fr_decode_ps_sptr vocoder_make_gsm_fr_decode_ps (); +VOCODER_API vocoder_gsm_fr_decode_ps_sptr vocoder_make_gsm_fr_decode_ps (); /*! * \brief GSM 06.10 Full Rate Vocoder Decoder * \ingroup vocoder_blk */ -class vocoder_gsm_fr_decode_ps : public gr_sync_interpolator { +class VOCODER_API vocoder_gsm_fr_decode_ps : public gr_sync_interpolator { struct gsm_state *d_gsm; - friend vocoder_gsm_fr_decode_ps_sptr vocoder_make_gsm_fr_decode_ps (); + friend VOCODER_API vocoder_gsm_fr_decode_ps_sptr vocoder_make_gsm_fr_decode_ps (); vocoder_gsm_fr_decode_ps (); public: diff --git a/gr-vocoder/include/vocoder_gsm_fr_encode_sp.h b/gr-vocoder/include/vocoder_gsm_fr_encode_sp.h index d1803c82e..18f78f525 100644 --- a/gr-vocoder/include/vocoder_gsm_fr_encode_sp.h +++ b/gr-vocoder/include/vocoder_gsm_fr_encode_sp.h @@ -23,12 +23,13 @@ #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> class vocoder_gsm_fr_encode_sp; typedef boost::shared_ptr<vocoder_gsm_fr_encode_sp> vocoder_gsm_fr_encode_sp_sptr; -vocoder_gsm_fr_encode_sp_sptr vocoder_make_gsm_fr_encode_sp (); +VOCODER_API vocoder_gsm_fr_encode_sp_sptr vocoder_make_gsm_fr_encode_sp (); /*! * \brief GSM 06.10 Full Rate Vocoder Encoder @@ -36,10 +37,10 @@ vocoder_gsm_fr_encode_sp_sptr vocoder_make_gsm_fr_encode_sp (); * * shorts in; 33 byte packets out */ -class vocoder_gsm_fr_encode_sp : public gr_sync_decimator { +class VOCODER_API vocoder_gsm_fr_encode_sp : public gr_sync_decimator { struct gsm_state *d_gsm; - friend vocoder_gsm_fr_encode_sp_sptr vocoder_make_gsm_fr_encode_sp (); + friend VOCODER_API vocoder_gsm_fr_encode_sp_sptr vocoder_make_gsm_fr_encode_sp (); vocoder_gsm_fr_encode_sp (); public: diff --git a/gr-vocoder/include/vocoder_ulaw_decode_bs.h b/gr-vocoder/include/vocoder_ulaw_decode_bs.h index 1126c6cb3..f69358168 100644 --- a/gr-vocoder/include/vocoder_ulaw_decode_bs.h +++ b/gr-vocoder/include/vocoder_ulaw_decode_bs.h @@ -23,13 +23,14 @@ #ifndef INCLUDED_VOCODER_ULAW_DECODE_BS_H #define INCLUDED_VOCODER_ULAW_DECODE_BS_H +#include <vocoder_api.h> #include <gr_sync_block.h> class vocoder_ulaw_decode_bs; typedef boost::shared_ptr<vocoder_ulaw_decode_bs> vocoder_ulaw_decode_bs_sptr; -vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs(); +VOCODER_API vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs(); /*! * \brief This block performs ulaw audio decoding. @@ -37,10 +38,10 @@ vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs(); * \ingroup vocoder_blk */ -class vocoder_ulaw_decode_bs : public gr_sync_block +class VOCODER_API vocoder_ulaw_decode_bs : public gr_sync_block { private: - friend vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs(); + friend VOCODER_API vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs(); vocoder_ulaw_decode_bs(); diff --git a/gr-vocoder/include/vocoder_ulaw_encode_sb.h b/gr-vocoder/include/vocoder_ulaw_encode_sb.h index eddc4f4e5..a1c2af05b 100644 --- a/gr-vocoder/include/vocoder_ulaw_encode_sb.h +++ b/gr-vocoder/include/vocoder_ulaw_encode_sb.h @@ -23,23 +23,24 @@ #ifndef INCLUDED_VOCODER_ULAW_ENCODER_SB_H #define INCLUDED_VOCODER_ULAW_ENCODER_SB_H +#include <vocoder_api.h> #include <gr_sync_block.h> class vocoder_ulaw_encode_sb; typedef boost::shared_ptr<vocoder_ulaw_encode_sb> vocoder_ulaw_encode_sb_sptr; -vocoder_ulaw_encode_sb_sptr vocoder_make_ulaw_encode_sb(); +VOCODER_API vocoder_ulaw_encode_sb_sptr vocoder_make_ulaw_encode_sb(); /*! * \brief This block performs g.711 ulaw audio encoding. * * \ingroup vocoder_blk */ -class vocoder_ulaw_encode_sb : public gr_sync_block +class VOCODER_API vocoder_ulaw_encode_sb : public gr_sync_block { private: - friend vocoder_ulaw_encode_sb_sptr vocoder_make_ulaw_encode_sb(); + friend VOCODER_API vocoder_ulaw_encode_sb_sptr vocoder_make_ulaw_encode_sb(); vocoder_ulaw_encode_sb(); |