vocoder: moved include dir to gnuradio/vocoder

author: Johnathan Corgan <johnathan@corganlabs.com> 2013-04-30 13:22:52 -0700
committer: Johnathan Corgan <johnathan@corganlabs.com> 2013-04-30 13:22:52 -0700
commit: c6acabb7df67983a3a4ebd4a34a7655a431bdeb7 (patch)
tree: 9dc519b484c0a4740850102656d9b0579f458ccf /gr-vocoder
parent: 02fbc046244f158adc1c5d8eb2dd28f34b729b01 (diff)
37 files changed, 66 insertions, 66 deletions
diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt
index 47c64369a..bfaea7f12 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 ea0562f36..ea0562f36 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 f1860c6f7..431859762 100644
--- a/gr-vocoder/include/vocoder/alaw_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_VOCODER_ALAW_DECODE_BS_H
 #define INCLUDED_VOCODER_ALAW_DECODE_BS_H
 
-#include <vocoder/api.h>
+#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {
diff --git a/gr-vocoder/include/vocoder/alaw_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h
index dc09c072a..c81018ee5 100644
--- a/gr-vocoder/include/vocoder/alaw_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_VOCODER_ALAW_ENCODER_SB_H
 #define INCLUDED_VOCODER_ALAW_ENCODER_SB_H
 
-#include <vocoder/api.h>
+#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {
diff --git a/gr-vocoder/include/vocoder/api.h b/gr-vocoder/include/gnuradio/vocoder/api.h
index 425e397b9..425e397b9 100644
--- a/gr-vocoder/include/vocoder/api.h
+++ b/gr-vocoder/include/gnuradio/vocoder/api.h
diff --git a/gr-vocoder/include/vocoder/codec2_decode_ps.h b/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h
index 471e7add8..e90e7b956 100644
--- a/gr-vocoder/include/vocoder/codec2_decode_ps.h
+++ b/gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_VOCODER_CODEC2_DECODE_PS_H
 #define INCLUDED_VOCODER_CODEC2_DECODE_PS_H
 
-#include <vocoder/api.h>
+#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_interpolator.h>
 
 namespace gr {
diff --git a/gr-vocoder/include/vocoder/codec2_encode_sp.h b/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h
index 525fee5da..9fe1c2dd4 100644
--- a/gr-vocoder/include/vocoder/codec2_encode_sp.h
+++ b/gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_VOCODER_CODEC2_ENCODE_SP_H
 #define INCLUDED_VOCODER_CODEC2_ENCODE_SP_H
 
-#include <vocoder/api.h>
+#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_decimator.h>
 
 namespace gr {
diff --git a/gr-vocoder/include/vocoder/cvsd_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h
index 882e5e7dd..324dcea1a 100644
--- a/gr-vocoder/include/vocoder/cvsd_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_VOCODER_CVSD_DECODE_BS_H
 #define INCLUDED_VOCODER_CVSD_DECODE_BS_H
 
-#include <vocoder/api.h>
+#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_interpolator.h>
 
 namespace gr {
diff --git a/gr-vocoder/include/vocoder/cvsd_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h
index 40f2eb2a6..7b7cea712 100644
--- a/gr-vocoder/include/vocoder/cvsd_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_VOCODER_CVSD_ENCODER_SB_H
 #define INCLUDED_VOCODER_CVSD_ENCODER_SB_H
 
-#include <vocoder/api.h>
+#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_decimator.h>
 
 namespace gr {
diff --git a/gr-vocoder/include/vocoder/g721_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h
index ab72240df..46444d569 100644
--- a/gr-vocoder/include/vocoder/g721_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_VOCODER_G721_DECODE_BS_H
 #define INCLUDED_VOCODER_G721_DECODE_BS_H
 
-#include <vocoder/api.h>
+#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {
diff --git a/gr-vocoder/include/vocoder/g721_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h
index 1445a36c6..2ae717d4b 100644
--- a/gr-vocoder/include/vocoder/g721_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_VOCODER_G721_ENCODE_SB_H
 #define INCLUDED_VOCODER_G721_ENCODE_SB_H
 
-#include <vocoder/api.h>
+#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {
diff --git a/gr-vocoder/include/vocoder/g723_24_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h
index 0d6494605..74acd57a4 100644
--- a/gr-vocoder/include/vocoder/g723_24_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_VOCODER_G723_24_DECODE_BS_H
 #define INCLUDED_VOCODER_G723_24_DECODE_BS_H
 
-#include <vocoder/api.h>
+#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {
diff --git a/gr-vocoder/include/vocoder/g723_24_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h
index 4528a4a6e..9a08eafed 100644
--- a/gr-vocoder/include/vocoder/g723_24_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_VOCODER_G723_24_ENCODE_SB_H
 #define INCLUDED_VOCODER_G723_24_ENCODE_SB_H
 
-#include <vocoder/api.h>
+#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {
diff --git a/gr-vocoder/include/vocoder/g723_40_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h
index 39d58413e..b1d9f6fe3 100644
--- a/gr-vocoder/include/vocoder/g723_40_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_VOCODER_G723_40_DECODE_BS_H
 #define INCLUDED_VOCODER_G723_40_DECODE_BS_H
 
-#include <vocoder/api.h>
+#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {
diff --git a/gr-vocoder/include/vocoder/g723_40_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h
index c3aa78345..05ddfed55 100644
--- a/gr-vocoder/include/vocoder/g723_40_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_VOCODER_G723_40_ENCODE_SB_H
 #define INCLUDED_VOCODER_G723_40_ENCODE_SB_H
 
-#include <vocoder/api.h>
+#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {
diff --git a/gr-vocoder/include/vocoder/gsm_fr_decode_ps.h b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h
index 2068a0264..9979763e6 100644
--- a/gr-vocoder/include/vocoder/gsm_fr_decode_ps.h
+++ b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_VOCODER_GSM_FR_DECODE_PS_H
 #define INCLUDED_VOCODER_GSM_FR_DECODE_PS_H
 
-#include <vocoder/api.h>
+#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_interpolator.h>
 
 namespace gr {
diff --git a/gr-vocoder/include/vocoder/gsm_fr_encode_sp.h b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h
index 2c9c73d61..98d88bba1 100644
--- a/gr-vocoder/include/vocoder/gsm_fr_encode_sp.h
+++ b/gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_VOCODER_GSM_FR_ENCODE_SP_H
 #define INCLUDED_VOCODER_GSM_FR_ENCODE_SP_H
 
-#include <vocoder/api.h>
+#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_decimator.h>
 
 namespace gr {
diff --git a/gr-vocoder/include/vocoder/ulaw_decode_bs.h b/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h
index d9fa10670..83c328c32 100644
--- a/gr-vocoder/include/vocoder/ulaw_decode_bs.h
+++ b/gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_VOCODER_ULAW_DECODE_BS_H
 #define INCLUDED_VOCODER_ULAW_DECODE_BS_H
 
-#include <vocoder/api.h>
+#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {
diff --git a/gr-vocoder/include/vocoder/ulaw_encode_sb.h b/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h
index f9ce9c8a8..fe1dba79b 100644
--- a/gr-vocoder/include/vocoder/ulaw_encode_sb.h
+++ b/gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_VOCODER_ULAW_ENCODER_SB_H
 #define INCLUDED_VOCODER_ULAW_ENCODER_SB_H
 
-#include <vocoder/api.h>
+#include <gnuradio/vocoder/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {
diff --git a/gr-vocoder/lib/alaw_decode_bs_impl.h b/gr-vocoder/lib/alaw_decode_bs_impl.h
index 06b23f3cf..37fb6b28c 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.h b/gr-vocoder/lib/alaw_encode_sb_impl.h
index 72112e35a..0de1e2e6f 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.h b/gr-vocoder/lib/codec2_decode_ps_impl.h
index 26e39da1d..54b3744ad 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.h b/gr-vocoder/lib/codec2_encode_sp_impl.h
index 1a5c34c9d..354bcc471 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.h b/gr-vocoder/lib/cvsd_decode_bs_impl.h
index 007c00c2b..a9a7cede4 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.h b/gr-vocoder/lib/cvsd_encode_sb_impl.h
index 1189920fa..78bbd3eeb 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.h b/gr-vocoder/lib/g721_decode_bs_impl.h
index b861591e4..f5354e136 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.h b/gr-vocoder/lib/g721_encode_sb_impl.h
index f22949aa4..5fc3388ef 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.h b/gr-vocoder/lib/g723_24_decode_bs_impl.h
index 3ecea1b1e..454bed76c 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.h b/gr-vocoder/lib/g723_24_encode_sb_impl.h
index d7a44bc57..9bad56009 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.h b/gr-vocoder/lib/g723_40_decode_bs_impl.h
index 3d5b4d6b7..4efd8c590 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.h b/gr-vocoder/lib/g723_40_encode_sb_impl.h
index a4093e1fc..f2160b709 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.h b/gr-vocoder/lib/gsm_fr_decode_ps_impl.h
index 3c1bb351d..878d40c92 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.h b/gr-vocoder/lib/gsm_fr_encode_sp_impl.h
index a5501deaa..c4629dd98 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.h b/gr-vocoder/lib/ulaw_decode_bs_impl.h
index db7a0dcab..9e5d238b4 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.h b/gr-vocoder/lib/ulaw_encode_sb_impl.h
index 2ce207fbf..48227a86d 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 14d894ced..2c2a7a679 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 b3dd43686..d7cb99c23 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);
author	Johnathan Corgan <johnathan@corganlabs.com>	2013-04-30 13:22:52 -0700
committer	Johnathan Corgan <johnathan@corganlabs.com>	2013-04-30 13:22:52 -0700
commit	c6acabb7df67983a3a4ebd4a34a7655a431bdeb7 (patch)
tree	9dc519b484c0a4740850102656d9b0579f458ccf /gr-vocoder
parent	02fbc046244f158adc1c5d8eb2dd28f34b729b01 (diff)