summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gr-vocoder/CMakeLists.txt2
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt (renamed from gr-vocoder/include/vocoder/CMakeLists.txt)0
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/alaw_decode_bs.h (renamed from gr-vocoder/include/vocoder/alaw_decode_bs.h)2
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/alaw_encode_sb.h (renamed from gr-vocoder/include/vocoder/alaw_encode_sb.h)2
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/api.h (renamed from gr-vocoder/include/vocoder/api.h)0
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/codec2_decode_ps.h (renamed from gr-vocoder/include/vocoder/codec2_decode_ps.h)2
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h (renamed from gr-vocoder/include/vocoder/codec2_encode_sp.h)2
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/cvsd_decode_bs.h (renamed from gr-vocoder/include/vocoder/cvsd_decode_bs.h)2
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/cvsd_encode_sb.h (renamed from gr-vocoder/include/vocoder/cvsd_encode_sb.h)2
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/g721_decode_bs.h (renamed from gr-vocoder/include/vocoder/g721_decode_bs.h)2
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/g721_encode_sb.h (renamed from gr-vocoder/include/vocoder/g721_encode_sb.h)2
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/g723_24_decode_bs.h (renamed from gr-vocoder/include/vocoder/g723_24_decode_bs.h)2
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/g723_24_encode_sb.h (renamed from gr-vocoder/include/vocoder/g723_24_encode_sb.h)2
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/g723_40_decode_bs.h (renamed from gr-vocoder/include/vocoder/g723_40_decode_bs.h)2
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/g723_40_encode_sb.h (renamed from gr-vocoder/include/vocoder/g723_40_encode_sb.h)2
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/gsm_fr_decode_ps.h (renamed from gr-vocoder/include/vocoder/gsm_fr_decode_ps.h)2
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/gsm_fr_encode_sp.h (renamed from gr-vocoder/include/vocoder/gsm_fr_encode_sp.h)2
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/ulaw_decode_bs.h (renamed from gr-vocoder/include/vocoder/ulaw_decode_bs.h)2
-rw-r--r--gr-vocoder/include/gnuradio/vocoder/ulaw_encode_sb.h (renamed from gr-vocoder/include/vocoder/ulaw_encode_sb.h)2
-rw-r--r--gr-vocoder/lib/alaw_decode_bs_impl.h2
-rw-r--r--gr-vocoder/lib/alaw_encode_sb_impl.h2
-rw-r--r--gr-vocoder/lib/codec2_decode_ps_impl.h2
-rw-r--r--gr-vocoder/lib/codec2_encode_sp_impl.h2
-rw-r--r--gr-vocoder/lib/cvsd_decode_bs_impl.h2
-rw-r--r--gr-vocoder/lib/cvsd_encode_sb_impl.h2
-rw-r--r--gr-vocoder/lib/g721_decode_bs_impl.h2
-rw-r--r--gr-vocoder/lib/g721_encode_sb_impl.h2
-rw-r--r--gr-vocoder/lib/g723_24_decode_bs_impl.h2
-rw-r--r--gr-vocoder/lib/g723_24_encode_sb_impl.h2
-rw-r--r--gr-vocoder/lib/g723_40_decode_bs_impl.h2
-rw-r--r--gr-vocoder/lib/g723_40_encode_sb_impl.h2
-rw-r--r--gr-vocoder/lib/gsm_fr_decode_ps_impl.h2
-rw-r--r--gr-vocoder/lib/gsm_fr_encode_sp_impl.h2
-rw-r--r--gr-vocoder/lib/ulaw_decode_bs_impl.h2
-rw-r--r--gr-vocoder/lib/ulaw_encode_sb_impl.h2
-rw-r--r--gr-vocoder/swig/CMakeLists.txt2
-rw-r--r--gr-vocoder/swig/vocoder_swig.i64
37 files changed, 66 insertions, 66 deletions
diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt
index 47c64369a2..bfaea7f12f 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 ea0562f36f..ea0562f36f 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 f1860c6f77..431859762c 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 dc09c072af..c81018ee5f 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 425e397b9d..425e397b9d 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 471e7add81..e90e7b9560 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 525fee5daf..9fe1c2dd43 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 882e5e7ddc..324dcea1a1 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 40f2eb2a6c..7b7cea712e 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 ab72240df1..46444d569a 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 1445a36c60..2ae717d4b7 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 0d64946058..74acd57a40 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 4528a4a6ea..9a08eafed3 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 39d58413e7..b1d9f6fe3c 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 c3aa78345c..05ddfed552 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 2068a02645..9979763e60 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 2c9c73d611..98d88bba1f 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 d9fa106705..83c328c326 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 f9ce9c8a8a..fe1dba79b3 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 06b23f3cfa..37fb6b28c3 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 72112e35a9..0de1e2e6fd 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 26e39da1de..54b3744adf 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 1a5c34c9d8..354bcc4718 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 007c00c2bd..a9a7cede44 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 1189920fa0..78bbd3eeb3 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 b861591e49..f5354e1364 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 f22949aa45..5fc3388ef9 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 3ecea1b1ef..454bed76c6 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 d7a44bc57b..9bad56009e 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 3d5b4d6b7f..4efd8c5905 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 a4093e1fc7..f2160b7097 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 3c1bb351d6..878d40c92a 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 a5501deaae..c4629dd984 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 db7a0dcab9..9e5d238b49 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 2ce207fbf8..48227a86da 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 14d894ced9..2c2a7a6791 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 b3dd436868..d7cb99c239 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);