gr: added API macros for noaa and pager, also renamed the ones for digital and vocoder to be consistent

10 files changed, 52 insertions, 61 deletions

diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt
index 4582e23a1..86e082b31 100644
--- a/gr-digital/lib/CMakeLists.txt
+++ b/gr-digital/lib/CMakeLists.txt
@@ -61,7 +61,7 @@ INSTALL(TARGETS gnuradio-digital
 # Install header files
 ########################################################################
 INSTALL(FILES
-    gr_digital_api.h
+    digital_api.h
     digital_constellation.h
     digital_constellation_receiver_cb.h
     digital_constellation_decoder_cb.h
diff --git a/gr-digital/lib/Makefile.am b/gr-digital/lib/Makefile.am
index 8710f946a..1cdb27a38 100644
--- a/gr-digital/lib/Makefile.am
+++ b/gr-digital/lib/Makefile.am
@@ -25,7 +25,7 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS = 				\
-	gr_digital_api.h			\
+	digital_api.h			\
 	digital_constellation.h			\
 	digital_constellation_receiver_cb.h 	\
 	digital_constellation_decoder_cb.h 	\
diff --git a/gr-digital/lib/gr_digital_api.h b/gr-digital/lib/digital_api.h
index 224eba1e3..d45ace13f 100644
--- a/gr-digital/lib/gr_digital_api.h
+++ b/gr-digital/lib/digital_api.h
@@ -19,24 +19,15 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GR_DIGITAL_API_H
-#define INCLUDED_GR_DIGITAL_API_H
+#ifndef INCLUDED_DIGITAL_API_H
+#define INCLUDED_DIGITAL_API_H
 
 #include <gruel/attributes.h>
 
-//FIXME
-//I cannot figure out for the life of me
-//why the HAVE_CONFIG_H is not defined for MSVC.
-//But the only things it needs from config.h is M_PI,
-//so just define it here and give up for now...
-#ifdef _MSC_VER
-#define M_PI 3.141592653589793238462643
-#endif
-
 #ifdef gnuradio_digital_EXPORTS
-#  define GR_DIGITAL_API __GR_ATTR_EXPORT
+#  define DIGITAL_API __GR_ATTR_EXPORT
 #else
-#  define GR_DIGITAL_API __GR_ATTR_IMPORT
+#  define DIGITAL_API __GR_ATTR_IMPORT
 #endif
 
-#endif /* INCLUDED_GR_DIGITAL_API_H */
+#endif /* INCLUDED_DIGITAL_API_H */
diff --git a/gr-digital/lib/digital_cma_equalizer_cc.h b/gr-digital/lib/digital_cma_equalizer_cc.h
index 83736b7f9..69e2f657a 100644
--- a/gr-digital/lib/digital_cma_equalizer_cc.h
+++ b/gr-digital/lib/digital_cma_equalizer_cc.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_DIGITAL_CMA_EQUALIZER_CC_H
 #define	INCLUDED_DIGITAL_CMA_EQUALIZER_CC_H
 
-#include <gr_digital_api.h>
+#include <digital_api.h>
 #include <gr_adaptive_fir_ccc.h>
 #include <gr_math.h>
 #include <iostream>
@@ -31,7 +31,7 @@
 class digital_cma_equalizer_cc;
 typedef boost::shared_ptr<digital_cma_equalizer_cc> digital_cma_equalizer_cc_sptr;
 
-GR_DIGITAL_API digital_cma_equalizer_cc_sptr 
+DIGITAL_API digital_cma_equalizer_cc_sptr 
 digital_make_cma_equalizer_cc(int num_taps, float modulus, float mu, int sps);
 
 /*!
@@ -44,13 +44,13 @@ digital_make_cma_equalizer_cc(int num_taps, float modulus, float mu, int sps);
  * Two-Dimensional Data Communication Systems," IEEE Transactions on
  * Communications, Vol. 28, No. 11, pp. 1867 - 1875, 1980,
  */
-class GR_DIGITAL_API digital_cma_equalizer_cc : public gr_adaptive_fir_ccc
+class DIGITAL_API digital_cma_equalizer_cc : public gr_adaptive_fir_ccc
 {
 private:
   float d_modulus;
   float d_mu;
   
-  friend GR_DIGITAL_API digital_cma_equalizer_cc_sptr digital_make_cma_equalizer_cc(int num_taps,
+  friend DIGITAL_API digital_cma_equalizer_cc_sptr digital_make_cma_equalizer_cc(int num_taps,
 								     float modulus,
 								     float mu,
 								     int sps);
diff --git a/gr-digital/lib/digital_constellation.h b/gr-digital/lib/digital_constellation.h
index 8cf4087ca..df00f3898 100644
--- a/gr-digital/lib/digital_constellation.h
+++ b/gr-digital/lib/digital_constellation.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_DIGITAL_CONSTELLATION_H
 #define	INCLUDED_DIGITAL_CONSTELLATION_H
 
-#include <gr_digital_api.h>
+#include <digital_api.h>
 #include <vector>
 #include <math.h>
 #include <gr_complex.h>
@@ -39,7 +39,7 @@
 class digital_constellation;
 typedef boost::shared_ptr<digital_constellation> digital_constellation_sptr;
 
-class GR_DIGITAL_API digital_constellation : public boost::enable_shared_from_this<digital_constellation>
+class DIGITAL_API digital_constellation : public boost::enable_shared_from_this<digital_constellation>
 {
 public:
   digital_constellation (std::vector<gr_complex> constellation, std::vector<unsigned int> pre_diff_code,
@@ -119,12 +119,12 @@ class digital_constellation_calcdist;
 typedef boost::shared_ptr<digital_constellation_calcdist> digital_constellation_calcdist_sptr;
 
 // public constructor
-GR_DIGITAL_API digital_constellation_calcdist_sptr
+DIGITAL_API digital_constellation_calcdist_sptr
 digital_make_constellation_calcdist (std::vector<gr_complex> constellation, std::vector<unsigned int> pre_diff_code,
 				     unsigned int rotational_symmetry, unsigned int dimensionality);
 
 
-class GR_DIGITAL_API digital_constellation_calcdist : public digital_constellation
+class DIGITAL_API digital_constellation_calcdist : public digital_constellation
 {
  public:
   digital_constellation_calcdist (std::vector<gr_complex> constellation,
@@ -137,7 +137,7 @@ class GR_DIGITAL_API digital_constellation_calcdist : public digital_constellati
   // void calc_hard_symbol_metric(gr_complex *sample, float *metric);
   
  private:
-  friend GR_DIGITAL_API digital_constellation_calcdist_sptr
+  friend DIGITAL_API digital_constellation_calcdist_sptr
   digital_make_constellation_calcdist (std::vector<gr_complex> constellation);
 };
 
@@ -150,7 +150,7 @@ class GR_DIGITAL_API digital_constellation_calcdist : public digital_constellati
 /* point.                                                   */
 /************************************************************/
 
-class GR_DIGITAL_API digital_constellation_sector : public digital_constellation
+class DIGITAL_API digital_constellation_sector : public digital_constellation
 {
  public:
 
@@ -193,13 +193,13 @@ class digital_constellation_rect;
 typedef boost::shared_ptr<digital_constellation_rect> digital_constellation_rect_sptr;
 
 // public constructor
-GR_DIGITAL_API digital_constellation_rect_sptr 
+DIGITAL_API digital_constellation_rect_sptr 
 digital_make_constellation_rect (std::vector<gr_complex> constellation, std::vector<unsigned int> pre_diff_code,
 			    unsigned int rotational_symmetry,
 			    unsigned int real_sectors, unsigned int imag_sectors,
 			    float width_real_sectors, float width_imag_sectors);
 
-class GR_DIGITAL_API digital_constellation_rect : public digital_constellation_sector
+class DIGITAL_API digital_constellation_rect : public digital_constellation_sector
 {
  public:
 
@@ -221,7 +221,7 @@ class GR_DIGITAL_API digital_constellation_rect : public digital_constellation_s
   float d_width_real_sectors;
   float d_width_imag_sectors;
 
-  friend GR_DIGITAL_API digital_constellation_rect_sptr
+  friend DIGITAL_API digital_constellation_rect_sptr
   digital_make_constellation_rect (std::vector<gr_complex> constellation, std::vector<unsigned int> pre_diff_code,
 			      unsigned int rotational_symmetry,
 			      unsigned int real_sectors, unsigned int imag_sectors,
@@ -243,12 +243,12 @@ class digital_constellation_psk;
 typedef boost::shared_ptr<digital_constellation_psk> digital_constellation_psk_sptr;
 
 // public constructor
-GR_DIGITAL_API digital_constellation_psk_sptr 
+DIGITAL_API digital_constellation_psk_sptr 
 digital_make_constellation_psk (std::vector<gr_complex> constellation,
 				std::vector<unsigned int> pre_diff_code,
 				unsigned int n_sectors);
 
-class GR_DIGITAL_API digital_constellation_psk : public digital_constellation_sector
+class DIGITAL_API digital_constellation_psk : public digital_constellation_sector
 {
  public:
 
@@ -264,7 +264,7 @@ class GR_DIGITAL_API digital_constellation_psk : public digital_constellation_se
 
  private:
 
-  friend GR_DIGITAL_API digital_constellation_psk_sptr
+  friend DIGITAL_API digital_constellation_psk_sptr
   digital_make_constellation_psk (std::vector<gr_complex> constellation,
 				  std::vector<unsigned int> pre_diff_code,
 				  unsigned int n_sectors);
@@ -282,17 +282,17 @@ class digital_constellation_bpsk;
 typedef boost::shared_ptr<digital_constellation_bpsk> digital_constellation_bpsk_sptr;
 
 // public constructor
-GR_DIGITAL_API digital_constellation_bpsk_sptr 
+DIGITAL_API digital_constellation_bpsk_sptr 
 digital_make_constellation_bpsk ();
 
-class GR_DIGITAL_API digital_constellation_bpsk : public digital_constellation
+class DIGITAL_API digital_constellation_bpsk : public digital_constellation
 {
  public:
 
   digital_constellation_bpsk ();
   unsigned int decision_maker (const gr_complex *sample);
 
-  friend GR_DIGITAL_API digital_constellation_bpsk_sptr
+  friend DIGITAL_API digital_constellation_bpsk_sptr
   digital_make_constellation_bpsk ();
   
 };
@@ -308,17 +308,17 @@ class digital_constellation_qpsk;
 typedef boost::shared_ptr<digital_constellation_qpsk> digital_constellation_qpsk_sptr;
 
 // public constructor
-GR_DIGITAL_API digital_constellation_qpsk_sptr 
+DIGITAL_API digital_constellation_qpsk_sptr 
 digital_make_constellation_qpsk ();
 
-class GR_DIGITAL_API digital_constellation_qpsk : public digital_constellation
+class DIGITAL_API digital_constellation_qpsk : public digital_constellation
 {
  public:
 
   digital_constellation_qpsk ();
   unsigned int decision_maker (const gr_complex *sample);
 
-  friend GR_DIGITAL_API digital_constellation_qpsk_sptr
+  friend DIGITAL_API digital_constellation_qpsk_sptr
   digital_make_constellation_qpsk ();
   
 };
@@ -335,17 +335,17 @@ class digital_constellation_8psk;
 typedef boost::shared_ptr<digital_constellation_8psk> digital_constellation_8psk_sptr;
 
 // public constructor
-GR_DIGITAL_API digital_constellation_8psk_sptr 
+DIGITAL_API digital_constellation_8psk_sptr 
 digital_make_constellation_8psk ();
 
-class GR_DIGITAL_API digital_constellation_8psk : public digital_constellation
+class DIGITAL_API digital_constellation_8psk : public digital_constellation
 {
  public:
 
   digital_constellation_8psk ();
   unsigned int decision_maker (const gr_complex *sample);
 
-  friend GR_DIGITAL_API digital_constellation_8psk_sptr
+  friend DIGITAL_API digital_constellation_8psk_sptr
   digital_make_constellation_8psk ();
   
 };
diff --git a/gr-digital/lib/digital_constellation_decoder_cb.h b/gr-digital/lib/digital_constellation_decoder_cb.h
index 2b3a0e79c..1ce01fe12 100644
--- a/gr-digital/lib/digital_constellation_decoder_cb.h
+++ b/gr-digital/lib/digital_constellation_decoder_cb.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_DIGITAL_CONSTELLATION_DECODER_CB_H
 #define INCLUDED_DIGITAL_CONSTELLATION_DECODER_CB_H
 
-#include <gr_digital_api.h>
+#include <digital_api.h>
 #include <gr_block.h>
 #include <digital_constellation.h>
 #include <vector>
@@ -31,7 +31,7 @@
 class digital_constellation_decoder_cb;
 typedef boost::shared_ptr<digital_constellation_decoder_cb>digital_constellation_decoder_cb_sptr;
 
-GR_DIGITAL_API digital_constellation_decoder_cb_sptr 
+DIGITAL_API digital_constellation_decoder_cb_sptr 
 digital_make_constellation_decoder_cb (digital_constellation_sptr constellation);
 
 /*!
@@ -39,14 +39,14 @@ digital_make_constellation_decoder_cb (digital_constellation_sptr constellation)
  * \ingroup coding_blk
  *
  */
-class GR_DIGITAL_API digital_constellation_decoder_cb : public gr_block
+class DIGITAL_API digital_constellation_decoder_cb : public gr_block
 {
 
  private:
   digital_constellation_sptr d_constellation;
   unsigned int d_dim;
 
-  friend GR_DIGITAL_API digital_constellation_decoder_cb_sptr 
+  friend DIGITAL_API digital_constellation_decoder_cb_sptr 
   digital_make_constellation_decoder_cb (digital_constellation_sptr constellation);
   
   digital_constellation_decoder_cb (digital_constellation_sptr constellation);
diff --git a/gr-digital/lib/digital_constellation_receiver_cb.h b/gr-digital/lib/digital_constellation_receiver_cb.h
index 74b1ed748..36169d76b 100644
--- a/gr-digital/lib/digital_constellation_receiver_cb.h
+++ b/gr-digital/lib/digital_constellation_receiver_cb.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_DIGITAL_CONSTELLATION_RECEIVER_CB_H
 #define	INCLUDED_DIGITAL_CONSTELLATION_RECEIVER_CB_H
 
-#include <gr_digital_api.h>
+#include <digital_api.h>
 #include <gruel/attributes.h>
 #include <gr_block.h>
 #include <digital_constellation.h>
@@ -35,7 +35,7 @@ class digital_constellation_receiver_cb;
 typedef boost::shared_ptr<digital_constellation_receiver_cb> digital_constellation_receiver_cb_sptr;
 
 // public constructor
-GR_DIGITAL_API digital_constellation_receiver_cb_sptr 
+DIGITAL_API digital_constellation_receiver_cb_sptr 
 digital_make_constellation_receiver_cb (digital_constellation_sptr constellation,
 					float alpha, float beta,
 					float fmin, float fmax);
@@ -66,7 +66,7 @@ digital_make_constellation_receiver_cb (digital_constellation_sptr constellation
  *
  */
 
-class GR_DIGITAL_API digital_constellation_receiver_cb : public gr_block
+class DIGITAL_API digital_constellation_receiver_cb : public gr_block
 {
  public:
   int general_work (int noutput_items,
@@ -142,7 +142,7 @@ protected:
   //! index to delay line
   unsigned int d_dl_idx;
 
-  friend GR_DIGITAL_API digital_constellation_receiver_cb_sptr
+  friend DIGITAL_API digital_constellation_receiver_cb_sptr
   digital_make_constellation_receiver_cb (digital_constellation_sptr constell,
 					  float alpha, float beta,
 					  float fmin, float fmax);
diff --git a/gr-digital/lib/digital_costas_loop_cc.h b/gr-digital/lib/digital_costas_loop_cc.h
index 61f1a3387..099fca3be 100644
--- a/gr-digital/lib/digital_costas_loop_cc.h
+++ b/gr-digital/lib/digital_costas_loop_cc.h
@@ -24,7 +24,7 @@
 #ifndef INCLUDED_DIGITAL_COSTAS_LOOP_CC_H
 #define INCLUDED_DIGITAL_COSTAS_LOOP_CC_H
 
-#include <gr_digital_api.h>
+#include <digital_api.h>
 #include <gr_sync_block.h>
 #include <stdexcept>
 #include <fstream>
@@ -58,7 +58,7 @@ class digital_costas_loop_cc;
 typedef boost::shared_ptr<digital_costas_loop_cc> digital_costas_loop_cc_sptr;
 
 
-GR_DIGITAL_API digital_costas_loop_cc_sptr 
+DIGITAL_API digital_costas_loop_cc_sptr 
 digital_make_costas_loop_cc (float damping, float nat_freq,
 			     int order
 			     ) throw (std::invalid_argument);
@@ -74,9 +74,9 @@ digital_make_costas_loop_cc (float damping, float nat_freq,
  *
  * \p order must be 2 or 4.
  */
-class GR_DIGITAL_API digital_costas_loop_cc : public gr_sync_block
+class DIGITAL_API digital_costas_loop_cc : public gr_sync_block
 {
-  friend GR_DIGITAL_API digital_costas_loop_cc_sptr
+  friend DIGITAL_API digital_costas_loop_cc_sptr
   digital_make_costas_loop_cc (float damping, float nat_freq,
 			       int order
 			       ) throw (std::invalid_argument);
diff --git a/gr-digital/lib/digital_kurtotic_equalizer_cc.h b/gr-digital/lib/digital_kurtotic_equalizer_cc.h
index 4363ce282..c07862e11 100644
--- a/gr-digital/lib/digital_kurtotic_equalizer_cc.h
+++ b/gr-digital/lib/digital_kurtotic_equalizer_cc.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_DIGITAL_KURTOTIC_EQUALIZER_CC_H
 #define	INCLUDED_DIGITAL_KURTOTIC_EQUALIZER_CC_H
 
-#include <gr_digital_api.h>
+#include <digital_api.h>
 #include <gr_adaptive_fir_ccc.h>
 #include <gr_math.h>
 #include <iostream>
@@ -31,7 +31,7 @@
 class digital_kurtotic_equalizer_cc;
 typedef boost::shared_ptr<digital_kurtotic_equalizer_cc> digital_kurtotic_equalizer_cc_sptr;
 
-GR_DIGITAL_API digital_kurtotic_equalizer_cc_sptr 
+DIGITAL_API digital_kurtotic_equalizer_cc_sptr 
 digital_make_kurtotic_equalizer_cc(int num_taps, float mu);
 
 /*!
@@ -42,7 +42,7 @@ digital_make_kurtotic_equalizer_cc(int num_taps, float mu);
  * equalization algorithm," IEEE Conf. on Control, Automation,
  * Robotics and Vision, Vol. 3, Dec. 2004, pp. 2052 - 2057.
  */
-class GR_DIGITAL_API digital_kurtotic_equalizer_cc : public gr_adaptive_fir_ccc
+class DIGITAL_API digital_kurtotic_equalizer_cc : public gr_adaptive_fir_ccc
 {
 private:
   float d_mu;
@@ -50,7 +50,7 @@ private:
   gr_complex d_q, d_u;
   float d_alpha_p, d_alpha_q, d_alpha_m;
   
-  friend GR_DIGITAL_API digital_kurtotic_equalizer_cc_sptr digital_make_kurtotic_equalizer_cc(int num_taps,
+  friend DIGITAL_API digital_kurtotic_equalizer_cc_sptr digital_make_kurtotic_equalizer_cc(int num_taps,
 									       float mu);
   digital_kurtotic_equalizer_cc(int num_taps, float mu);
 
diff --git a/gr-digital/lib/digital_lms_dd_equalizer_cc.h b/gr-digital/lib/digital_lms_dd_equalizer_cc.h
index d07f5d7d3..edfa18e23 100644
--- a/gr-digital/lib/digital_lms_dd_equalizer_cc.h
+++ b/gr-digital/lib/digital_lms_dd_equalizer_cc.h
@@ -23,14 +23,14 @@
 #ifndef INCLUDED_DIGITAL_LMS_DD_EQUALIZER_CC_H
 #define INCLUDED_DIGITAL_LMS_DD_EQUALIZER_CC_H
 
-#include <gr_digital_api.h>
+#include <digital_api.h>
 #include <gr_adaptive_fir_ccc.h>
 #include <digital_constellation.h>
 
 class digital_lms_dd_equalizer_cc;
 typedef boost::shared_ptr<digital_lms_dd_equalizer_cc> digital_lms_dd_equalizer_cc_sptr;
 
-GR_DIGITAL_API digital_lms_dd_equalizer_cc_sptr digital_make_lms_dd_equalizer_cc (int num_taps,
+DIGITAL_API digital_lms_dd_equalizer_cc_sptr digital_make_lms_dd_equalizer_cc (int num_taps,
 								   float mu, int sps,
 								   digital_constellation_sptr cnst);
 								   
@@ -66,10 +66,10 @@ GR_DIGITAL_API digital_lms_dd_equalizer_cc_sptr digital_make_lms_dd_equalizer_cc
  *    Prentice Hall, 1996.
  *
  */
-class GR_DIGITAL_API digital_lms_dd_equalizer_cc : public gr_adaptive_fir_ccc
+class DIGITAL_API digital_lms_dd_equalizer_cc : public gr_adaptive_fir_ccc
 {
 private:
-  friend GR_DIGITAL_API digital_lms_dd_equalizer_cc_sptr digital_make_lms_dd_equalizer_cc (int num_taps,
+  friend DIGITAL_API digital_lms_dd_equalizer_cc_sptr digital_make_lms_dd_equalizer_cc (int num_taps,
 									    float mu, int sps,
 									    digital_constellation_sptr cnst);