Merged in next_docs branch.

author: Ben Reynwar <ben@reynwar.net> 2013-05-19 02:55:33 -0700
committer: Ben Reynwar <ben@reynwar.net> 2013-05-19 02:55:33 -0700
commit: bb01988e75d50d82cbb44c1a49c86c1d08f05665 (patch)
tree: 0528dac14476d37f2cde7374a8fcb3428f879c69 /gr-fft
parent: e4f0319eced22c112f7e6a4cc45bc2036d285332 (diff)
parent: 0fa219774dcf9141ae91204f948c029b05673f3f (diff)
19 files changed, 46 insertions, 47 deletions
diff --git a/gr-fft/CMakeLists.txt b/gr-fft/CMakeLists.txt
index c9eb9ddbdc..586abe56af 100644
--- a/gr-fft/CMakeLists.txt
+++ b/gr-fft/CMakeLists.txt
@@ -84,7 +84,7 @@ CPACK_COMPONENT("fft_swig"
 ########################################################################
 # Add subdirectories
 ########################################################################
-add_subdirectory(include/fft)
+add_subdirectory(include/gnuradio/fft)
 add_subdirectory(lib)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
diff --git a/gr-fft/include/fft/CMakeLists.txt b/gr-fft/include/gnuradio/fft/CMakeLists.txt
index bce3da674d..bce3da674d 100644
--- a/gr-fft/include/fft/CMakeLists.txt
+++ b/gr-fft/include/gnuradio/fft/CMakeLists.txt
diff --git a/gr-fft/include/fft/api.h b/gr-fft/include/gnuradio/fft/api.h
index a569ceb265..ce2a49f4be 100644
--- a/gr-fft/include/fft/api.h
+++ b/gr-fft/include/gnuradio/fft/api.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_FFT_API_H
 #define INCLUDED_FFT_API_H
 
-#include <attributes.h>
+#include <gnuradio/attributes.h>
 
 #ifdef gnuradio_fft_EXPORTS
 #  define FFT_API __GR_ATTR_EXPORT
diff --git a/gr-fft/include/fft/fft.h b/gr-fft/include/gnuradio/fft/fft.h
index 305b1cb711..04673c16e1 100644
--- a/gr-fft/include/fft/fft.h
+++ b/gr-fft/include/gnuradio/fft/fft.h
@@ -27,8 +27,8 @@
  * Wrappers for FFTW single precision 1d dft
  */
 
-#include <fft/api.h>
-#include <gr_complex.h>
+#include <gnuradio/fft/api.h>
+#include <gnuradio/gr_complex.h>
 #include <boost/thread.hpp>
 
 namespace gr {
diff --git a/gr-fft/include/fft/fft_vcc.h b/gr-fft/include/gnuradio/fft/fft_vcc.h
index 2f5b5a23f0..a2682de196 100644
--- a/gr-fft/include/fft/fft_vcc.h
+++ b/gr-fft/include/gnuradio/fft/fft_vcc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FFT_FFT_VCC_H
 #define INCLUDED_FFT_FFT_VCC_H
 
-#include <fft/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/fft/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace fft {
@@ -33,7 +33,7 @@ namespace gr {
      * \brief Compute forward or reverse FFT. complex vector in / complex vector out.
      * \ingroup fourier_analysis_blk
      */
-    class FFT_API fft_vcc : virtual public gr_sync_block
+    class FFT_API fft_vcc : virtual public sync_block
     {
     public:
 
diff --git a/gr-fft/include/fft/fft_vfc.h b/gr-fft/include/gnuradio/fft/fft_vfc.h
index 89491113b6..9937d92a34 100644
--- a/gr-fft/include/fft/fft_vfc.h
+++ b/gr-fft/include/gnuradio/fft/fft_vfc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FFT_FFT_VFC_H
 #define INCLUDED_FFT_FFT_VFC_H
 
-#include <fft/api.h>
-#include <gr_sync_block.h>
+#include <gnuradio/fft/api.h>
+#include <gnuradio/sync_block.h>
 
 namespace gr {
   namespace fft {
@@ -33,7 +33,7 @@ namespace gr {
      * \brief Compute forward or reverse FFT. float vector in / complex vector out.
      * \ingroup fourier_analysis_blk
      */
-    class FFT_API fft_vfc : virtual public gr_sync_block
+    class FFT_API fft_vfc : virtual public sync_block
     {
     public:
 
diff --git a/gr-fft/include/fft/goertzel.h b/gr-fft/include/gnuradio/fft/goertzel.h
index ff37355e64..47ff1dd18c 100644
--- a/gr-fft/include/fft/goertzel.h
+++ b/gr-fft/include/gnuradio/fft/goertzel.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FFT_IMPL_GOERTZEL_H
 #define INCLUDED_FFT_IMPL_GOERTZEL_H
 
-#include <fft/api.h>
-#include <gr_types.h>
+#include <gnuradio/fft/api.h>
+#include <gnuradio/types.h>
 
 namespace gr {
   namespace fft {
diff --git a/gr-fft/include/fft/goertzel_fc.h b/gr-fft/include/gnuradio/fft/goertzel_fc.h
index 26b0d0d11c..3815ac0fd4 100644
--- a/gr-fft/include/fft/goertzel_fc.h
+++ b/gr-fft/include/gnuradio/fft/goertzel_fc.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FFT_GOERTZEL_FC_H
 #define INCLUDED_FFT_GOERTZEL_FC_H
 
-#include <fft/api.h>
-#include <gr_sync_decimator.h>
+#include <gnuradio/fft/api.h>
+#include <gnuradio/sync_decimator.h>
 
 namespace gr {
   namespace fft {
@@ -33,7 +33,7 @@ namespace gr {
      * \brief Goertzel single-bin DFT calculation.
      * \ingroup fourier_analysis_blk
      */
-    class FFT_API goertzel_fc : virtual public gr_sync_decimator
+    class FFT_API goertzel_fc : virtual public sync_decimator
     {
     public:
 
diff --git a/gr-fft/lib/fft.cc b/gr-fft/lib/fft.cc
index 60838ee302..abcda7d30e 100644
--- a/gr-fft/lib/fft.cc
+++ b/gr-fft/lib/fft.cc
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <fft/fft.h>
-#include <gr_sys_paths.h>
+#include <gnuradio/fft/fft.h>
+#include <gnuradio/sys_paths.h>
 #include <fftw3.h>
 
 #ifdef _MSC_VER //http://www.fftw.org/install/windows.html#DLLwisdom
@@ -36,7 +36,7 @@ static int my_fftw_read_char(void *f) { return fgetc((FILE *) f); }
 #define fftwl_import_wisdom_from_file(f) fftwl_import_wisdom(my_fftw_read_char, (void*) (f))
 #endif //_MSC_VER
 
-#include <gr_complex.h>
+#include <gnuradio/gr_complex.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -86,7 +86,7 @@ namespace gr {
     wisdom_filename()
     {
       static fs::path path;
-      path = fs::path(gr_appdata_path()) / ".gr_fftw_wisdom";
+      path = fs::path(gr::appdata_path()) / ".gr_fftw_wisdom";
       return path.string().c_str();
     }
 
diff --git a/gr-fft/lib/fft_vcc_fftw.cc b/gr-fft/lib/fft_vcc_fftw.cc
index ebcd5ec53f..96f3e5b51c 100644
--- a/gr-fft/lib/fft_vcc_fftw.cc
+++ b/gr-fft/lib/fft_vcc_fftw.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include "fft_vcc_fftw.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
 #include <math.h>
 #include <string.h>
 
@@ -44,9 +44,9 @@ namespace gr {
     fft_vcc_fftw::fft_vcc_fftw(int fft_size, bool forward,
 			       const std::vector<float> &window,
 			       bool shift, int nthreads)
-      : gr_sync_block("fft_vcc_fftw",
-		      gr_make_io_signature(1, 1, fft_size * sizeof(gr_complex)),
-		      gr_make_io_signature(1, 1, fft_size * sizeof(gr_complex))),
+      : sync_block("fft_vcc_fftw",
+		      io_signature::make(1, 1, fft_size * sizeof(gr_complex)),
+		      io_signature::make(1, 1, fft_size * sizeof(gr_complex))),
 	d_fft_size(fft_size), d_forward(forward), d_shift(shift)
     {
       d_fft = new fft_complex(d_fft_size, forward, nthreads);
diff --git a/gr-fft/lib/fft_vcc_fftw.h b/gr-fft/lib/fft_vcc_fftw.h
index ea15dd07bb..2aa2056f5b 100644
--- a/gr-fft/lib/fft_vcc_fftw.h
+++ b/gr-fft/lib/fft_vcc_fftw.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FFT_FFT_VCC_FFTW_IMPL_H
 #define INCLUDED_FFT_FFT_VCC_FFTW_IMPL_H
 
-#include <fft/fft_vcc.h>
-#include <fft/fft.h>
+#include <gnuradio/fft/fft_vcc.h>
+#include <gnuradio/fft/fft.h>
 
 namespace gr {
   namespace fft {
diff --git a/gr-fft/lib/fft_vfc_fftw.cc b/gr-fft/lib/fft_vfc_fftw.cc
index 890dac7be7..dec2157b06 100644
--- a/gr-fft/lib/fft_vfc_fftw.cc
+++ b/gr-fft/lib/fft_vfc_fftw.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include "fft_vfc_fftw.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
 #include <math.h>
 #include <string.h>
 
@@ -44,9 +44,9 @@ namespace gr {
     fft_vfc_fftw::fft_vfc_fftw(int fft_size, bool forward,
 			       const std::vector<float> &window,
 			       int nthreads)
-      : gr_sync_block("fft_vfc_fftw",
-		      gr_make_io_signature(1, 1, fft_size * sizeof(float)),
-		      gr_make_io_signature(1, 1, fft_size * sizeof(gr_complex))),
+      : sync_block("fft_vfc_fftw",
+		      io_signature::make(1, 1, fft_size * sizeof(float)),
+		      io_signature::make(1, 1, fft_size * sizeof(gr_complex))),
 	d_fft_size(fft_size), d_forward(forward)
     {
       d_fft = new fft_complex(d_fft_size, forward, nthreads);
diff --git a/gr-fft/lib/fft_vfc_fftw.h b/gr-fft/lib/fft_vfc_fftw.h
index 1b6f78ba63..2fe292f8ca 100644
--- a/gr-fft/lib/fft_vfc_fftw.h
+++ b/gr-fft/lib/fft_vfc_fftw.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FFT_FFT_VFC_FFTW_IMPL_H
 #define INCLUDED_FFT_FFT_VFC_FFTW_IMPL_H
 
-#include <fft/fft_vfc.h>
-#include <fft/fft.h>
+#include <gnuradio/fft/fft_vfc.h>
+#include <gnuradio/fft/fft.h>
 
 namespace gr {
   namespace fft {
diff --git a/gr-fft/lib/goertzel.cc b/gr-fft/lib/goertzel.cc
index 4bcd5ee190..ddb086c531 100644
--- a/gr-fft/lib/goertzel.cc
+++ b/gr-fft/lib/goertzel.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include <cmath>
-#include <fft/goertzel.h>
+#include <gnuradio/fft/goertzel.h>
 
 namespace gr {
   namespace fft {
diff --git a/gr-fft/lib/goertzel_fc_impl.cc b/gr-fft/lib/goertzel_fc_impl.cc
index ee214f24da..fd3755eeaa 100644
--- a/gr-fft/lib/goertzel_fc_impl.cc
+++ b/gr-fft/lib/goertzel_fc_impl.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include "goertzel_fc_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
 
 namespace gr {
   namespace fft {
@@ -36,9 +36,9 @@ namespace gr {
     }
     
     goertzel_fc_impl::goertzel_fc_impl(int rate, int len, float freq)
-      : gr_sync_decimator("goertzel_fc",
-			  gr_make_io_signature (1, 1, sizeof(float)),
-			  gr_make_io_signature (1, 1, sizeof(gr_complex)),
+      : sync_decimator("goertzel_fc",
+			  io_signature::make (1, 1, sizeof(float)),
+			  io_signature::make (1, 1, sizeof(gr_complex)),
 			  len),
 	d_goertzel(rate, len, freq)
     {
diff --git a/gr-fft/lib/goertzel_fc_impl.h b/gr-fft/lib/goertzel_fc_impl.h
index 426bc71f6b..79b24f15c4 100644
--- a/gr-fft/lib/goertzel_fc_impl.h
+++ b/gr-fft/lib/goertzel_fc_impl.h
@@ -23,8 +23,8 @@
 #ifndef INCLUDED_FFT_GOERTZEL_FC_IMPL_H
 #define INCLUDED_FFT_GOERTZEL_FC_IMPL_H
 
-#include <fft/goertzel_fc.h>
-#include <fft/goertzel.h>
+#include <gnuradio/fft/goertzel_fc.h>
+#include <gnuradio/fft/goertzel.h>
 
 namespace gr {
   namespace fft {
diff --git a/gr-fft/python/fft/__init__.py b/gr-fft/python/fft/__init__.py
index acb70a2947..e0803cbf38 100644
--- a/gr-fft/python/fft/__init__.py
+++ b/gr-fft/python/fft/__init__.py
@@ -20,8 +20,7 @@
 #
 
 '''
-This is the gr-fft package. This package provides GNU Radio
-processing blocks for FFT and related functions.
+Fourier-transform blocks and related functions.
 '''
 import os
 
diff --git a/gr-fft/swig/CMakeLists.txt b/gr-fft/swig/CMakeLists.txt
index 7c11b85bb4..476e343da7 100644
--- a/gr-fft/swig/CMakeLists.txt
+++ b/gr-fft/swig/CMakeLists.txt
@@ -36,7 +36,7 @@ if(ENABLE_GR_CTRLPORT)
 endif(ENABLE_GR_CTRLPORT)
 
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/fft_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/fft)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/fft)
 set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
 set(GR_SWIG_LIBRARIES gnuradio-fft)
 
diff --git a/gr-fft/swig/fft_swig.i b/gr-fft/swig/fft_swig.i
index 51e44cfe49..005f5ed23a 100644
--- a/gr-fft/swig/fft_swig.i
+++ b/gr-fft/swig/fft_swig.i
@@ -28,14 +28,14 @@
 %include "fft_swig_doc.i"
 
 %{
-#include "fft/fft_vcc.h"
-#include "fft/fft_vfc.h"
-#include "fft/goertzel_fc.h"
+#include "gnuradio/fft/fft_vcc.h"
+#include "gnuradio/fft/fft_vfc.h"
+#include "gnuradio/fft/goertzel_fc.h"
 %}
 
-%include "fft/fft_vcc.h"
-%include "fft/fft_vfc.h"
-%include "fft/goertzel_fc.h"
+%include "gnuradio/fft/fft_vcc.h"
+%include "gnuradio/fft/fft_vfc.h"
+%include "gnuradio/fft/goertzel_fc.h"
 
 GR_SWIG_BLOCK_MAGIC2(fft, fft_vcc);
 GR_SWIG_BLOCK_MAGIC2(fft, fft_vfc);
author	Ben Reynwar <ben@reynwar.net>	2013-05-19 02:55:33 -0700
committer	Ben Reynwar <ben@reynwar.net>	2013-05-19 02:55:33 -0700
commit	bb01988e75d50d82cbb44c1a49c86c1d08f05665 (patch)
tree	0528dac14476d37f2cde7374a8fcb3428f879c69 /gr-fft
parent	e4f0319eced22c112f7e6a4cc45bc2036d285332 (diff)
parent	0fa219774dcf9141ae91204f948c029b05673f3f (diff)