From ec2d3a033616386dbf8f8b2e7010a4d0a5ec3132 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 22 Jul 2011 10:33:13 -0700 Subject: gr: added API macros for noaa and pager, also renamed the ones for digital and vocoder to be consistent --- gr-vocoder/include/CMakeLists.txt | 2 +- gr-vocoder/include/Makefile.am | 2 +- gr-vocoder/include/gr_vocoder_api.h | 33 --------------------------- gr-vocoder/include/vocoder_alaw_decode_bs.h | 8 +++---- gr-vocoder/include/vocoder_alaw_encode_sb.h | 8 +++---- gr-vocoder/include/vocoder_api.h | 33 +++++++++++++++++++++++++++ gr-vocoder/include/vocoder_codec2_decode_ps.h | 8 +++---- gr-vocoder/include/vocoder_codec2_encode_sp.h | 8 +++---- gr-vocoder/include/vocoder_cvsd_decode_bs.h | 8 +++---- gr-vocoder/include/vocoder_cvsd_encode_sb.h | 8 +++---- gr-vocoder/include/vocoder_gsm_fr_decode_ps.h | 8 +++---- gr-vocoder/include/vocoder_gsm_fr_encode_sp.h | 8 +++---- gr-vocoder/include/vocoder_ulaw_decode_bs.h | 8 +++---- gr-vocoder/include/vocoder_ulaw_encode_sb.h | 8 +++---- 14 files changed, 75 insertions(+), 75 deletions(-) delete mode 100644 gr-vocoder/include/gr_vocoder_api.h create mode 100644 gr-vocoder/include/vocoder_api.h (limited to 'gr-vocoder/include') diff --git a/gr-vocoder/include/CMakeLists.txt b/gr-vocoder/include/CMakeLists.txt index 5cbe938b0..437074494 100644 --- a/gr-vocoder/include/CMakeLists.txt +++ b/gr-vocoder/include/CMakeLists.txt @@ -21,7 +21,7 @@ # Install header files ######################################################################## INSTALL(FILES - gr_vocoder_api.h + vocoder_api.h vocoder_alaw_decode_bs.h vocoder_alaw_encode_sb.h vocoder_codec2_decode_ps.h diff --git a/gr-vocoder/include/Makefile.am b/gr-vocoder/include/Makefile.am index 83960ef24..e25340b32 100644 --- a/gr-vocoder/include/Makefile.am +++ b/gr-vocoder/include/Makefile.am @@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.common # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ - gr_vocoder_api.h \ + vocoder_api.h \ vocoder_alaw_decode_bs.h \ vocoder_alaw_encode_sb.h \ vocoder_codec2_decode_ps.h \ diff --git a/gr-vocoder/include/gr_vocoder_api.h b/gr-vocoder/include/gr_vocoder_api.h deleted file mode 100644 index d32db3c6c..000000000 --- a/gr-vocoder/include/gr_vocoder_api.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * 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_GR_VOCODER_API_H -#define INCLUDED_GR_VOCODER_API_H - -#include - -#ifdef gnuradio_vocoder_EXPORTS -# define GR_VOCODER_API __GR_ATTR_EXPORT -#else -# define GR_VOCODER_API __GR_ATTR_IMPORT -#endif - -#endif /* INCLUDED_GR_VOCODER_API_H */ diff --git a/gr-vocoder/include/vocoder_alaw_decode_bs.h b/gr-vocoder/include/vocoder_alaw_decode_bs.h index 250b4eb4f..f20dfefdb 100644 --- a/gr-vocoder/include/vocoder_alaw_decode_bs.h +++ b/gr-vocoder/include/vocoder_alaw_decode_bs.h @@ -23,14 +23,14 @@ #ifndef INCLUDED_VOCODER_ALAW_DECODE_BS_H #define INCLUDED_VOCODER_ALAW_DECODE_BS_H -#include +#include #include class vocoder_alaw_decode_bs; typedef boost::shared_ptr vocoder_alaw_decode_bs_sptr; -GR_VOCODER_API 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. @@ -38,10 +38,10 @@ GR_VOCODER_API vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs(); * \ingroup vocoder_blk */ -class GR_VOCODER_API vocoder_alaw_decode_bs : public gr_sync_block +class VOCODER_API vocoder_alaw_decode_bs : public gr_sync_block { private: - friend GR_VOCODER_API 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 9c20b639c..c00080fb7 100644 --- a/gr-vocoder/include/vocoder_alaw_encode_sb.h +++ b/gr-vocoder/include/vocoder_alaw_encode_sb.h @@ -23,24 +23,24 @@ #ifndef INCLUDED_VOCODER_ALAW_ENCODER_SB_H #define INCLUDED_VOCODER_ALAW_ENCODER_SB_H -#include +#include #include class vocoder_alaw_encode_sb; typedef boost::shared_ptr vocoder_alaw_encode_sb_sptr; -GR_VOCODER_API 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 GR_VOCODER_API vocoder_alaw_encode_sb : public gr_sync_block +class VOCODER_API vocoder_alaw_encode_sb : public gr_sync_block { private: - friend GR_VOCODER_API 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 + +#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 26115bd13..7e7ea2d5c 100644 --- a/gr-vocoder/include/vocoder_codec2_decode_ps.h +++ b/gr-vocoder/include/vocoder_codec2_decode_ps.h @@ -22,22 +22,22 @@ #ifndef INCLUDED_VOCODER_CODEC2_DECODE_PS_H #define INCLUDED_VOCODER_CODEC2_DECODE_PS_H -#include +#include #include class vocoder_codec2_decode_ps; typedef boost::shared_ptr vocoder_codec2_decode_ps_sptr; -GR_VOCODER_API 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 GR_VOCODER_API vocoder_codec2_decode_ps : public gr_sync_interpolator { +class VOCODER_API vocoder_codec2_decode_ps : public gr_sync_interpolator { void *d_codec2; - friend GR_VOCODER_API 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 486e5b636..8d8588daf 100644 --- a/gr-vocoder/include/vocoder_codec2_encode_sp.h +++ b/gr-vocoder/include/vocoder_codec2_encode_sp.h @@ -22,22 +22,22 @@ #ifndef INCLUDED_VOCODER_CODEC2_ENCODE_SP_H #define INCLUDED_VOCODER_CODEC2_ENCODE_SP_H -#include +#include #include class vocoder_codec2_encode_sp; typedef boost::shared_ptr vocoder_codec2_encode_sp_sptr; -GR_VOCODER_API 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 GR_VOCODER_API vocoder_codec2_encode_sp : public gr_sync_decimator { +class VOCODER_API vocoder_codec2_encode_sp : public gr_sync_decimator { void *d_codec2; - friend GR_VOCODER_API 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 48b92d8cf..1204e298b 100644 --- a/gr-vocoder/include/vocoder_cvsd_decode_bs.h +++ b/gr-vocoder/include/vocoder_cvsd_decode_bs.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VOCODER_CVSD_DECODE_BS_H #define INCLUDED_VOCODER_CVSD_DECODE_BS_H -#include +#include #include class vocoder_cvsd_decode_bs; @@ -45,7 +45,7 @@ typedef boost::shared_ptr 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) * */ -GR_VOCODER_API 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, @@ -106,10 +106,10 @@ GR_VOCODER_API vocoder_cvsd_decode_bs_sptr vocoder_make_cvsd_decode_bs (short mi * */ -class GR_VOCODER_API vocoder_cvsd_decode_bs : public gr_sync_interpolator +class VOCODER_API vocoder_cvsd_decode_bs : public gr_sync_interpolator { private: - friend GR_VOCODER_API 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 15ab0823e..4a2d31147 100644 --- a/gr-vocoder/include/vocoder_cvsd_encode_sb.h +++ b/gr-vocoder/include/vocoder_cvsd_encode_sb.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_VOCODER_CVSD_ENCODER_SB_H #define INCLUDED_VOCODER_CVSD_ENCODER_SB_H -#include +#include #include class vocoder_cvsd_encode_sb; @@ -45,7 +45,7 @@ typedef boost::shared_ptr vocoder_cvsd_encode_sb_sptr; * */ -GR_VOCODER_API 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, @@ -108,10 +108,10 @@ GR_VOCODER_API vocoder_cvsd_encode_sb_sptr vocoder_make_cvsd_encode_sb(short min * */ -class GR_VOCODER_API vocoder_cvsd_encode_sb : public gr_sync_decimator +class VOCODER_API vocoder_cvsd_encode_sb : public gr_sync_decimator { private: - friend GR_VOCODER_API 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_gsm_fr_decode_ps.h b/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h index 448d046db..748ff5f0f 100644 --- a/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h +++ b/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h @@ -23,22 +23,22 @@ #ifndef INCLUDED_VOCODER_GSM_FR_DECODE_PS_H #define INCLUDED_VOCODER_GSM_FR_DECODE_PS_H -#include +#include #include class vocoder_gsm_fr_decode_ps; typedef boost::shared_ptr vocoder_gsm_fr_decode_ps_sptr; -GR_VOCODER_API 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 GR_VOCODER_API 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 GR_VOCODER_API 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 dd190719e..18f78f525 100644 --- a/gr-vocoder/include/vocoder_gsm_fr_encode_sp.h +++ b/gr-vocoder/include/vocoder_gsm_fr_encode_sp.h @@ -23,13 +23,13 @@ #ifndef INCLUDED_VOCODER_GSM_FR_ENCODE_SP_H #define INCLUDED_VOCODER_GSM_FR_ENCODE_SP_H -#include +#include #include class vocoder_gsm_fr_encode_sp; typedef boost::shared_ptr vocoder_gsm_fr_encode_sp_sptr; -GR_VOCODER_API 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 @@ -37,10 +37,10 @@ GR_VOCODER_API vocoder_gsm_fr_encode_sp_sptr vocoder_make_gsm_fr_encode_sp (); * * shorts in; 33 byte packets out */ -class GR_VOCODER_API 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 GR_VOCODER_API 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 14998a64f..f69358168 100644 --- a/gr-vocoder/include/vocoder_ulaw_decode_bs.h +++ b/gr-vocoder/include/vocoder_ulaw_decode_bs.h @@ -23,14 +23,14 @@ #ifndef INCLUDED_VOCODER_ULAW_DECODE_BS_H #define INCLUDED_VOCODER_ULAW_DECODE_BS_H -#include +#include #include class vocoder_ulaw_decode_bs; typedef boost::shared_ptr vocoder_ulaw_decode_bs_sptr; -GR_VOCODER_API 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. @@ -38,10 +38,10 @@ GR_VOCODER_API vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs(); * \ingroup vocoder_blk */ -class GR_VOCODER_API vocoder_ulaw_decode_bs : public gr_sync_block +class VOCODER_API vocoder_ulaw_decode_bs : public gr_sync_block { private: - friend GR_VOCODER_API 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 a0be3430c..a1c2af05b 100644 --- a/gr-vocoder/include/vocoder_ulaw_encode_sb.h +++ b/gr-vocoder/include/vocoder_ulaw_encode_sb.h @@ -23,24 +23,24 @@ #ifndef INCLUDED_VOCODER_ULAW_ENCODER_SB_H #define INCLUDED_VOCODER_ULAW_ENCODER_SB_H -#include +#include #include class vocoder_ulaw_encode_sb; typedef boost::shared_ptr vocoder_ulaw_encode_sb_sptr; -GR_VOCODER_API 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 GR_VOCODER_API vocoder_ulaw_encode_sb : public gr_sync_block +class VOCODER_API vocoder_ulaw_encode_sb : public gr_sync_block { private: - friend GR_VOCODER_API 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(); -- cgit