summaryrefslogtreecommitdiff
path: root/gr-vocoder/lib
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-04-17 13:43:52 -0400
committerTom Rondeau <trondeau@vt.edu>2013-04-29 14:52:56 -0400
commitf3e2e07201c50033bf6c9d0c6a6f068557b4f17f (patch)
tree140b3c2d20a951ffd4abd564c3378ee2e2f9fc7c /gr-vocoder/lib
parent35303ae975a5b1bdecc2492bc96e2b8e89b62a3d (diff)
runtime: converting runtime core to gr namespace, gnuradio include dir.
Diffstat (limited to 'gr-vocoder/lib')
-rw-r--r--gr-vocoder/lib/alaw_decode_bs_impl.cc8
-rw-r--r--gr-vocoder/lib/alaw_encode_sb_impl.cc8
-rw-r--r--gr-vocoder/lib/codec2_decode_ps_impl.cc8
-rw-r--r--gr-vocoder/lib/codec2_encode_sp_impl.cc8
-rw-r--r--gr-vocoder/lib/cvsd_decode_bs_impl.cc8
-rw-r--r--gr-vocoder/lib/cvsd_encode_sb_impl.cc8
-rw-r--r--gr-vocoder/lib/g721_decode_bs_impl.cc8
-rw-r--r--gr-vocoder/lib/g721_encode_sb_impl.cc8
-rw-r--r--gr-vocoder/lib/g723_24_decode_bs_impl.cc8
-rw-r--r--gr-vocoder/lib/g723_24_encode_sb_impl.cc8
-rw-r--r--gr-vocoder/lib/g723_40_decode_bs_impl.cc8
-rw-r--r--gr-vocoder/lib/g723_40_encode_sb_impl.cc8
-rw-r--r--gr-vocoder/lib/gsm_fr_decode_ps_impl.cc8
-rw-r--r--gr-vocoder/lib/gsm_fr_encode_sp_impl.cc8
-rw-r--r--gr-vocoder/lib/ulaw_decode_bs_impl.cc8
-rw-r--r--gr-vocoder/lib/ulaw_encode_sb_impl.cc8
16 files changed, 64 insertions, 64 deletions
diff --git a/gr-vocoder/lib/alaw_decode_bs_impl.cc b/gr-vocoder/lib/alaw_decode_bs_impl.cc
index abea694da9..2f43304578 100644
--- a/gr-vocoder/lib/alaw_decode_bs_impl.cc
+++ b/gr-vocoder/lib/alaw_decode_bs_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "alaw_decode_bs_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -43,9 +43,9 @@ extern "C" {
}
alaw_decode_bs_impl::alaw_decode_bs_impl()
- : gr_sync_block("vocoder_alaw_decode_bs",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(short)))
+ : sync_block("vocoder_alaw_decode_bs",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(short)))
{
}
diff --git a/gr-vocoder/lib/alaw_encode_sb_impl.cc b/gr-vocoder/lib/alaw_encode_sb_impl.cc
index 4b316f2e14..9c941e790d 100644
--- a/gr-vocoder/lib/alaw_encode_sb_impl.cc
+++ b/gr-vocoder/lib/alaw_encode_sb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "alaw_encode_sb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -43,9 +43,9 @@ extern "C" {
}
alaw_encode_sb_impl::alaw_encode_sb_impl()
- : gr_sync_block("avocoder_law_encode_sb",
- gr_make_io_signature(1, 1, sizeof(short)),
- gr_make_io_signature(1, 1, sizeof(unsigned char)))
+ : sync_block("avocoder_law_encode_sb",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(1, 1, sizeof(unsigned char)))
{
}
diff --git a/gr-vocoder/lib/codec2_decode_ps_impl.cc b/gr-vocoder/lib/codec2_decode_ps_impl.cc
index cd47c9e702..57ab62422e 100644
--- a/gr-vocoder/lib/codec2_decode_ps_impl.cc
+++ b/gr-vocoder/lib/codec2_decode_ps_impl.cc
@@ -30,7 +30,7 @@ extern "C" {
#include "codec2/codec2.h"
}
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
#include <assert.h>
@@ -46,9 +46,9 @@ namespace gr {
codec2_decode_ps_impl::codec2_decode_ps_impl ()
- : gr_sync_interpolator("vocoder_codec2_decode_ps",
- gr_make_io_signature(1, 1, CODEC2_BITS_PER_FRAME * sizeof(char)),
- gr_make_io_signature (1, 1, sizeof(short)),
+ : sync_interpolator("vocoder_codec2_decode_ps",
+ io_signature::make(1, 1, CODEC2_BITS_PER_FRAME * sizeof(char)),
+ io_signature::make (1, 1, sizeof(short)),
CODEC2_SAMPLES_PER_FRAME)
{
if((d_codec2 = codec2_create()) == 0)
diff --git a/gr-vocoder/lib/codec2_encode_sp_impl.cc b/gr-vocoder/lib/codec2_encode_sp_impl.cc
index 0217fbd424..3f79e06409 100644
--- a/gr-vocoder/lib/codec2_encode_sp_impl.cc
+++ b/gr-vocoder/lib/codec2_encode_sp_impl.cc
@@ -30,7 +30,7 @@ extern "C" {
#include "codec2/codec2.h"
}
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
namespace gr {
@@ -44,9 +44,9 @@ namespace gr {
}
codec2_encode_sp_impl::codec2_encode_sp_impl()
- : gr_sync_decimator("vocoder_codec2_encode_sp",
- gr_make_io_signature(1, 1, sizeof(short)),
- gr_make_io_signature(1, 1, CODEC2_BITS_PER_FRAME * sizeof(char)),
+ : sync_decimator("vocoder_codec2_encode_sp",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(1, 1, CODEC2_BITS_PER_FRAME * sizeof(char)),
CODEC2_SAMPLES_PER_FRAME)
{
if((d_codec2 = codec2_create()) == 0)
diff --git a/gr-vocoder/lib/cvsd_decode_bs_impl.cc b/gr-vocoder/lib/cvsd_decode_bs_impl.cc
index e7f284adda..57379b2162 100644
--- a/gr-vocoder/lib/cvsd_decode_bs_impl.cc
+++ b/gr-vocoder/lib/cvsd_decode_bs_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "cvsd_decode_bs_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -45,9 +45,9 @@ namespace gr {
cvsd_decode_bs_impl::cvsd_decode_bs_impl(short min_step, short max_step, double step_decay,
double accum_decay, int K, int J,
short pos_accum_max, short neg_accum_max)
- : gr_sync_interpolator("vocoder_cvsd_decode_bs",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(short)),
+ : sync_interpolator("vocoder_cvsd_decode_bs",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(short)),
8),
d_min_step(min_step), d_max_step(max_step), d_step_decay(step_decay),
d_accum_decay(accum_decay), d_K(K), d_J(J),
diff --git a/gr-vocoder/lib/cvsd_encode_sb_impl.cc b/gr-vocoder/lib/cvsd_encode_sb_impl.cc
index 74ecdb25e1..b567f7868c 100644
--- a/gr-vocoder/lib/cvsd_encode_sb_impl.cc
+++ b/gr-vocoder/lib/cvsd_encode_sb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "cvsd_encode_sb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -45,9 +45,9 @@ namespace gr {
cvsd_encode_sb_impl::cvsd_encode_sb_impl(short min_step, short max_step, double step_decay,
double accum_decay, int K, int J,
short pos_accum_max, short neg_accum_max)
- : gr_sync_decimator("vocoder_cvsd_encode_sb",
- gr_make_io_signature(1, 1, sizeof(short)),
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
+ : sync_decimator("vocoder_cvsd_encode_sb",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(1, 1, sizeof(unsigned char)),
8),
d_min_step (min_step), d_max_step(max_step), d_step_decay(step_decay),
d_accum_decay(accum_decay), d_K(K), d_J(J),
diff --git a/gr-vocoder/lib/g721_decode_bs_impl.cc b/gr-vocoder/lib/g721_decode_bs_impl.cc
index 143bbc514d..db23ffa677 100644
--- a/gr-vocoder/lib/g721_decode_bs_impl.cc
+++ b/gr-vocoder/lib/g721_decode_bs_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "g721_decode_bs_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
g721_decode_bs_impl::g721_decode_bs_impl()
- : gr_sync_block("vocoder_g721_decode_bs",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(short)))
+ : sync_block("vocoder_g721_decode_bs",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(short)))
{
g72x_init_state(&d_state);
}
diff --git a/gr-vocoder/lib/g721_encode_sb_impl.cc b/gr-vocoder/lib/g721_encode_sb_impl.cc
index a961b0efeb..9293c46a83 100644
--- a/gr-vocoder/lib/g721_encode_sb_impl.cc
+++ b/gr-vocoder/lib/g721_encode_sb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "g721_encode_sb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
g721_encode_sb_impl::g721_encode_sb_impl()
- : gr_sync_block("vocoder_g721_encode_sb",
- gr_make_io_signature(1, 1, sizeof(short)),
- gr_make_io_signature(1, 1, sizeof(unsigned char)))
+ : sync_block("vocoder_g721_encode_sb",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(1, 1, sizeof(unsigned char)))
{
g72x_init_state(&d_state);
}
diff --git a/gr-vocoder/lib/g723_24_decode_bs_impl.cc b/gr-vocoder/lib/g723_24_decode_bs_impl.cc
index f7a8b59a08..c78229c4f3 100644
--- a/gr-vocoder/lib/g723_24_decode_bs_impl.cc
+++ b/gr-vocoder/lib/g723_24_decode_bs_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "g723_24_decode_bs_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
g723_24_decode_bs_impl::g723_24_decode_bs_impl()
- : gr_sync_block("vocoder_g723_24_decode_bs",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(short)))
+ : sync_block("vocoder_g723_24_decode_bs",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(short)))
{
g72x_init_state(&d_state);
}
diff --git a/gr-vocoder/lib/g723_24_encode_sb_impl.cc b/gr-vocoder/lib/g723_24_encode_sb_impl.cc
index 8b168197b5..cf721e3580 100644
--- a/gr-vocoder/lib/g723_24_encode_sb_impl.cc
+++ b/gr-vocoder/lib/g723_24_encode_sb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "g723_24_encode_sb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
g723_24_encode_sb_impl::g723_24_encode_sb_impl()
- : gr_sync_block("vocoder_g723_24_encode_sb",
- gr_make_io_signature(1, 1, sizeof(short)),
- gr_make_io_signature(1, 1, sizeof(unsigned char)))
+ : sync_block("vocoder_g723_24_encode_sb",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(1, 1, sizeof(unsigned char)))
{
g72x_init_state(&d_state);
}
diff --git a/gr-vocoder/lib/g723_40_decode_bs_impl.cc b/gr-vocoder/lib/g723_40_decode_bs_impl.cc
index 0790c9481c..4302583200 100644
--- a/gr-vocoder/lib/g723_40_decode_bs_impl.cc
+++ b/gr-vocoder/lib/g723_40_decode_bs_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "g723_40_decode_bs_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
g723_40_decode_bs_impl::g723_40_decode_bs_impl()
- : gr_sync_block("vocoder_g723_40_decode_bs",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(short)))
+ : sync_block("vocoder_g723_40_decode_bs",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(short)))
{
g72x_init_state(&d_state);
}
diff --git a/gr-vocoder/lib/g723_40_encode_sb_impl.cc b/gr-vocoder/lib/g723_40_encode_sb_impl.cc
index 54dd052637..ff1910c55f 100644
--- a/gr-vocoder/lib/g723_40_encode_sb_impl.cc
+++ b/gr-vocoder/lib/g723_40_encode_sb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "g723_40_encode_sb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
g723_40_encode_sb_impl::g723_40_encode_sb_impl()
- : gr_sync_block("vocoder_g723_40_encode_sb",
- gr_make_io_signature(1, 1, sizeof(short)),
- gr_make_io_signature(1, 1, sizeof(unsigned char)))
+ : sync_block("vocoder_g723_40_encode_sb",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(1, 1, sizeof(unsigned char)))
{
g72x_init_state(&d_state);
}
diff --git a/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc b/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc
index 2b3d11135c..e318a60668 100644
--- a/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc
+++ b/gr-vocoder/lib/gsm_fr_decode_ps_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "gsm_fr_decode_ps_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
#include <assert.h>
@@ -40,9 +40,9 @@ namespace gr {
}
gsm_fr_decode_ps_impl::gsm_fr_decode_ps_impl()
- : gr_sync_interpolator("vocoder_gsm_fr_decode_ps",
- gr_make_io_signature(1, 1, sizeof(gsm_frame)),
- gr_make_io_signature(1, 1, sizeof(short)),
+ : sync_interpolator("vocoder_gsm_fr_decode_ps",
+ io_signature::make(1, 1, sizeof(gsm_frame)),
+ io_signature::make(1, 1, sizeof(short)),
GSM_SAMPLES_PER_FRAME)
{
if((d_gsm = gsm_create()) == 0)
diff --git a/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc b/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc
index c7b10089fb..143a73bce7 100644
--- a/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc
+++ b/gr-vocoder/lib/gsm_fr_encode_sp_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "gsm_fr_encode_sp_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <stdexcept>
namespace gr {
@@ -39,9 +39,9 @@ namespace gr {
}
gsm_fr_encode_sp_impl::gsm_fr_encode_sp_impl()
- : gr_sync_decimator("vocoder_gsm_fr_encode_sp",
- gr_make_io_signature(1, 1, sizeof(short)),
- gr_make_io_signature(1, 1, sizeof(gsm_frame)),
+ : sync_decimator("vocoder_gsm_fr_encode_sp",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(1, 1, sizeof(gsm_frame)),
GSM_SAMPLES_PER_FRAME)
{
if((d_gsm = gsm_create ()) == 0)
diff --git a/gr-vocoder/lib/ulaw_decode_bs_impl.cc b/gr-vocoder/lib/ulaw_decode_bs_impl.cc
index d0c99b70a0..bbf58a54da 100644
--- a/gr-vocoder/lib/ulaw_decode_bs_impl.cc
+++ b/gr-vocoder/lib/ulaw_decode_bs_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "ulaw_decode_bs_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -43,9 +43,9 @@ extern "C" {
}
ulaw_decode_bs_impl::ulaw_decode_bs_impl()
- : gr_sync_block("vocoder_ulaw_decode_bs",
- gr_make_io_signature(1, 1, sizeof(unsigned char)),
- gr_make_io_signature(1, 1, sizeof(short)))
+ : sync_block("vocoder_ulaw_decode_bs",
+ io_signature::make(1, 1, sizeof(unsigned char)),
+ io_signature::make(1, 1, sizeof(short)))
{
}
diff --git a/gr-vocoder/lib/ulaw_encode_sb_impl.cc b/gr-vocoder/lib/ulaw_encode_sb_impl.cc
index a49df12b59..83d3864965 100644
--- a/gr-vocoder/lib/ulaw_encode_sb_impl.cc
+++ b/gr-vocoder/lib/ulaw_encode_sb_impl.cc
@@ -25,7 +25,7 @@
#endif
#include "ulaw_encode_sb_impl.h"
-#include <gr_io_signature.h>
+#include <gnuradio/io_signature.h>
#include <limits.h>
namespace gr {
@@ -43,9 +43,9 @@ extern "C" {
}
ulaw_encode_sb_impl::ulaw_encode_sb_impl()
- : gr_sync_block("vocoder_ulaw_encode_sb",
- gr_make_io_signature(1, 1, sizeof(short)),
- gr_make_io_signature(1, 1, sizeof(unsigned char)))
+ : sync_block("vocoder_ulaw_encode_sb",
+ io_signature::make(1, 1, sizeof(short)),
+ io_signature::make(1, 1, sizeof(unsigned char)))
{
}