summaryrefslogtreecommitdiff
path: root/gr-vocoder
diff options
context:
space:
mode:
Diffstat (limited to 'gr-vocoder')
-rw-r--r--gr-vocoder/CMakeLists.txt2
-rwxr-xr-xgr-vocoder/examples/cvsd_audio_loopback.py18
-rw-r--r--gr-vocoder/gnuradio-vocoder.pc.in2
-rw-r--r--gr-vocoder/include/vocoder/api.h2
-rw-r--r--gr-vocoder/lib/CMakeLists.txt10
-rwxr-xr-xgr-vocoder/python/vocoder/qa_alaw_vocoder.py6
-rwxr-xr-xgr-vocoder/python/vocoder/qa_codec2_vocoder.py6
-rwxr-xr-xgr-vocoder/python/vocoder/qa_cvsd_vocoder.py10
-rwxr-xr-xgr-vocoder/python/vocoder/qa_g721_vocoder.py6
-rwxr-xr-xgr-vocoder/python/vocoder/qa_g723_24_vocoder.py6
-rwxr-xr-xgr-vocoder/python/vocoder/qa_g723_40_vocoder.py6
-rwxr-xr-xgr-vocoder/python/vocoder/qa_gsm_full_rate.py6
-rwxr-xr-xgr-vocoder/python/vocoder/qa_ulaw_vocoder.py6
-rw-r--r--gr-vocoder/swig/CMakeLists.txt6
-rw-r--r--gr-vocoder/swig/vocoder_swig.i2
15 files changed, 48 insertions, 46 deletions
diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt
index a2fb108c35..59f0631869 100644
--- a/gr-vocoder/CMakeLists.txt
+++ b/gr-vocoder/CMakeLists.txt
@@ -28,7 +28,7 @@ include(GrBoost)
include(GrComponent)
GR_REGISTER_COMPONENT("gr-vocoder" ENABLE_GR_VOCODER
Boost_FOUND
- ENABLE_GR_CORE
+ ENABLE_GNURADIO_RUNTIME
ENABLE_GR_FFT
ENABLE_GR_BLOCKS
ENABLE_GR_FILTER
diff --git a/gr-vocoder/examples/cvsd_audio_loopback.py b/gr-vocoder/examples/cvsd_audio_loopback.py
index ef4c6ded21..b9385b7dc6 100755
--- a/gr-vocoder/examples/cvsd_audio_loopback.py
+++ b/gr-vocoder/examples/cvsd_audio_loopback.py
@@ -50,15 +50,15 @@ def build_graph():
tb.connect(enc, dec, s2f, decim, sink_scale, sink)
if 0: # debug
- tb.conect(src, gr.file_sink(gr.sizeof_float, "source.dat"))
- tb.conect(src_scale, gr.file_sink(gr.sizeof_float, "src_scale.dat"))
- tb.conect(interp, gr.file_sink(gr.sizeof_float, "interp.dat"))
- tb.conect(f2s, gr.file_sink(gr.sizeof_short, "f2s.dat"))
- tb.conect(enc, gr.file_sink(gr.sizeof_char, "enc.dat"))
- tb.conect(dec, gr.file_sink(gr.sizeof_short, "dec.dat"))
- tb.conect(s2f, gr.file_sink(gr.sizeof_float, "s2f.dat"))
- tb.conect(decim, gr.file_sink(gr.sizeof_float, "decim.dat"))
- tb.conect(sink_scale, gr.file_sink(gr.sizeof_float, "sink_scale.dat"))
+ tb.conect(src, blocks.file_sink(gr.sizeof_float, "source.dat"))
+ tb.conect(src_scale, blocks.file_sink(gr.sizeof_float, "src_scale.dat"))
+ tb.conect(interp, blocks.file_sink(gr.sizeof_float, "interp.dat"))
+ tb.conect(f2s, blocks.file_sink(gr.sizeof_short, "f2s.dat"))
+ tb.conect(enc, blocks.file_sink(gr.sizeof_char, "enc.dat"))
+ tb.conect(dec, blocks.file_sink(gr.sizeof_short, "dec.dat"))
+ tb.conect(s2f, blocks.file_sink(gr.sizeof_float, "s2f.dat"))
+ tb.conect(decim, blocks.file_sink(gr.sizeof_float, "decim.dat"))
+ tb.conect(sink_scale, blocks.file_sink(gr.sizeof_float, "sink_scale.dat"))
return tb
diff --git a/gr-vocoder/gnuradio-vocoder.pc.in b/gr-vocoder/gnuradio-vocoder.pc.in
index 7ff4420b6f..c5c860dc62 100644
--- a/gr-vocoder/gnuradio-vocoder.pc.in
+++ b/gr-vocoder/gnuradio-vocoder.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
Name: gnuradio-vocoder
Description: GNU Radio blocks implementing voice codecs
-Requires: gnuradio-core
+Requires: gnuradio-runtime
Version: @LIBVER@
Libs: -L${libdir} -lgnuradio-vocoder
Cflags: -I${includedir}
diff --git a/gr-vocoder/include/vocoder/api.h b/gr-vocoder/include/vocoder/api.h
index 331cf5d0bc..613a19f4bc 100644
--- a/gr-vocoder/include/vocoder/api.h
+++ b/gr-vocoder/include/vocoder/api.h
@@ -22,7 +22,7 @@
#ifndef INCLUDED_VOCODER_API_H
#define INCLUDED_VOCODER_API_H
-#include <gruel/attributes.h>
+#include <attributes.h>
#ifdef gnuradio_vocoder_EXPORTS
# define VOCODER_API __GR_ATTR_EXPORT
diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt
index 3b4fb859b5..08ff4108d3 100644
--- a/gr-vocoder/lib/CMakeLists.txt
+++ b/gr-vocoder/lib/CMakeLists.txt
@@ -22,8 +22,7 @@
########################################################################
include_directories(
${GR_VOCODER_INCLUDE_DIRS}
- ${GNURADIO_CORE_INCLUDE_DIRS}
- ${GRUEL_INCLUDE_DIRS}
+ ${GNURADIO_RUNTIME_INCLUDE_DIRS}
${LOG4CXX_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
)
@@ -36,6 +35,9 @@ if(ENABLE_GR_CTRLPORT)
include_directories(${ICE_INCLUDE_DIR})
endif(ENABLE_GR_CTRLPORT)
+include_directories(${LOG4CPP_INCLUDE_DIRS})
+link_directories(${LOG4CPP_LIBRARY_DIRS})
+
########################################################################
# Setup library
########################################################################
@@ -80,9 +82,9 @@ GR_INCLUDE_SUBDIRECTORY(g7xx)
GR_INCLUDE_SUBDIRECTORY(gsm)
list(APPEND vocoder_libs
- gnuradio-core
+ gnuradio-runtime
${Boost_LIBRARIES}
- ${LOG4CXX_LIBRARIES}
+ ${LOG4CPP_LIBRARIES}
)
add_library(gnuradio-vocoder SHARED ${gr_vocoder_sources})
diff --git a/gr-vocoder/python/vocoder/qa_alaw_vocoder.py b/gr-vocoder/python/vocoder/qa_alaw_vocoder.py
index 33fe7d9af0..3a49908e5a 100755
--- a/gr-vocoder/python/vocoder/qa_alaw_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_alaw_vocoder.py
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest, vocoder
+from gnuradio import gr, gr_unittest, vocoder, blocks
class test_alaw_vocoder (gr_unittest.TestCase):
@@ -33,10 +33,10 @@ class test_alaw_vocoder (gr_unittest.TestCase):
def test001_module_load (self):
data = (8,24,40,56,72,88,104,120,136,152,168,184,
200,216,232,248,264,280,296,312,328,344)
- src = gr.vector_source_s(data)
+ src = blocks.vector_source_s(data)
enc = vocoder.alaw_encode_sb()
dec = vocoder.alaw_decode_bs()
- snk = gr.vector_sink_s()
+ snk = blocks.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
actual_result = snk.data()
diff --git a/gr-vocoder/python/vocoder/qa_codec2_vocoder.py b/gr-vocoder/python/vocoder/qa_codec2_vocoder.py
index 191ede57d8..b2ed734888 100755
--- a/gr-vocoder/python/vocoder/qa_codec2_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_codec2_vocoder.py
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest, vocoder
+from gnuradio import gr, gr_unittest, vocoder, blocks
class test_codec2_vocoder (gr_unittest.TestCase):
@@ -44,10 +44,10 @@ class test_codec2_vocoder (gr_unittest.TestCase):
31,-82,-98,-51,6,93,104,44,-5,-84,-107,-44,45,102,104,
15,-47,-107,-126,-87,-11,89,93,13,-95,-136,-187,-70,
-167,216,-70,-103,175,-284,-486)
- src = gr.vector_source_s(data)
+ src = blocks.vector_source_s(data)
enc = vocoder.codec2_encode_sp()
dec = vocoder.codec2_decode_ps()
- snk = gr.vector_sink_s()
+ snk = blocks.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
actual_result = snk.data()
diff --git a/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py b/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py
index df0a6a5af5..408c6b74c9 100755
--- a/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2007,2010,2011 Free Software Foundation, Inc.
+# Copyright 2007,2010,2011,2013 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -97,20 +97,20 @@ class test_cvsd_vocoder (gr_unittest.TestCase):
# WARNING: not importing analog in this QA code.
# If we enable this, we can probably just create a sin with numpy.
src = analog.sig_source_f(sample_rate, analog.GR_SIN_WAVE, 200, 1, 0)
- head = gr.head(gr.sizeof_float, 100)
+ head = blocks.head(gr.sizeof_float, 100)
src_scale = blocks.multiply_const_ff(scale_factor)
interp = filter.rational_resampler_fff(8, 1)
f2s = blocks.float_to_short()
- enc = cvsd_vocoder.encode_sb()
- dec = cvsd_vocoder.decode_bs()
+ enc = vocoder.cvsd_vocoder.encode_sb()
+ dec = vocoder.cvsd_vocoder.decode_bs()
s2f = blocks.short_to_float()
decim = filter.rational_resampler_fff(1, 8)
sink_scale = blocks.multiply_const_ff(1.0/scale_factor)
- sink = gr.vector_sink_f()
+ sink = blocks.vector_sink_f()
self.tb.connect(src, src_scale, interp, f2s, enc)
self.tb.connect(enc, dec, s2f, decim, sink_scale, head, sink)
diff --git a/gr-vocoder/python/vocoder/qa_g721_vocoder.py b/gr-vocoder/python/vocoder/qa_g721_vocoder.py
index ba69bfeaf8..8808b8fede 100755
--- a/gr-vocoder/python/vocoder/qa_g721_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_g721_vocoder.py
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest, vocoder
+from gnuradio import gr, gr_unittest, vocoder, blocks
class test_g721_vocoder (gr_unittest.TestCase):
@@ -33,10 +33,10 @@ class test_g721_vocoder (gr_unittest.TestCase):
def test001_module_load (self):
data = (8,24,36,52,56,64,76,88,104,124,132,148,172,
196,220,244,280,320,372,416,468,524,580,648)
- src = gr.vector_source_s(data)
+ src = blocks.vector_source_s(data)
enc = vocoder.g721_encode_sb()
dec = vocoder.g721_decode_bs()
- snk = gr.vector_sink_s()
+ snk = blocks.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
actual_result = snk.data()
diff --git a/gr-vocoder/python/vocoder/qa_g723_24_vocoder.py b/gr-vocoder/python/vocoder/qa_g723_24_vocoder.py
index 053b6deab3..c587623e1d 100755
--- a/gr-vocoder/python/vocoder/qa_g723_24_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_g723_24_vocoder.py
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest, vocoder
+from gnuradio import gr, gr_unittest, vocoder, blocks
class test_g723_24_vocoder (gr_unittest.TestCase):
@@ -32,10 +32,10 @@ class test_g723_24_vocoder (gr_unittest.TestCase):
def test001_module_load (self):
data = (0,16,36,40,68,104,148,220,320,512)
- src = gr.vector_source_s(data)
+ src = blocks.vector_source_s(data)
enc = vocoder.g723_24_encode_sb()
dec = vocoder.g723_24_decode_bs()
- snk = gr.vector_sink_s()
+ snk = blocks.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
actual_result = snk.data()
diff --git a/gr-vocoder/python/vocoder/qa_g723_40_vocoder.py b/gr-vocoder/python/vocoder/qa_g723_40_vocoder.py
index d6c453f3fe..689102237f 100755
--- a/gr-vocoder/python/vocoder/qa_g723_40_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_g723_40_vocoder.py
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest, vocoder
+from gnuradio import gr, gr_unittest, vocoder, blocks
class test_g723_40_vocoder (gr_unittest.TestCase):
@@ -32,10 +32,10 @@ class test_g723_40_vocoder (gr_unittest.TestCase):
def test001_module_load (self):
data = (0,8,36,72,100,152,228,316,404,528)
- src = gr.vector_source_s(data)
+ src = blocks.vector_source_s(data)
enc = vocoder.g723_40_encode_sb()
dec = vocoder.g723_40_decode_bs()
- snk = gr.vector_sink_s()
+ snk = blocks.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
actual_result = snk.data()
diff --git a/gr-vocoder/python/vocoder/qa_gsm_full_rate.py b/gr-vocoder/python/vocoder/qa_gsm_full_rate.py
index 8ae8ce06fa..69ea94bbf9 100755
--- a/gr-vocoder/python/vocoder/qa_gsm_full_rate.py
+++ b/gr-vocoder/python/vocoder/qa_gsm_full_rate.py
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest, vocoder
+from gnuradio import gr, gr_unittest, vocoder, blocks
class test_gsm_vocoder (gr_unittest.TestCase):
@@ -46,10 +46,10 @@ class test_gsm_vocoder (gr_unittest.TestCase):
680,600,240,168,112,408,488,472,608,480,240,232,
208,288,480,600,616,520,176,88,184,296,392,584,
656,552,248,160,144,336,432,512,608,664)
- src = gr.vector_source_s(data)
+ src = blocks.vector_source_s(data)
enc = vocoder.gsm_fr_encode_sp()
dec = vocoder.gsm_fr_decode_ps()
- snk = gr.vector_sink_s()
+ snk = blocks.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
actual_result = snk.data()
diff --git a/gr-vocoder/python/vocoder/qa_ulaw_vocoder.py b/gr-vocoder/python/vocoder/qa_ulaw_vocoder.py
index d07978cfa1..46c8d490a8 100755
--- a/gr-vocoder/python/vocoder/qa_ulaw_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_ulaw_vocoder.py
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest, vocoder
+from gnuradio import gr, gr_unittest, vocoder, blocks
class test_ulaw_vocoder (gr_unittest.TestCase):
@@ -33,10 +33,10 @@ class test_ulaw_vocoder (gr_unittest.TestCase):
def test001_module_load (self):
data = (8,24,40,56,72,88,104,120,132,148,164,180,
196,212,228,244,260,276,292,308,324,340)
- src = gr.vector_source_s(data)
+ src = blocks.vector_source_s(data)
enc = vocoder.ulaw_encode_sb()
dec = vocoder.ulaw_decode_bs()
- snk = gr.vector_sink_s()
+ snk = blocks.vector_sink_s()
self.tb.connect(src, enc, dec, snk)
self.tb.run()
actual_result = snk.data()
diff --git a/gr-vocoder/swig/CMakeLists.txt b/gr-vocoder/swig/CMakeLists.txt
index 3a60cdf7bb..b3c096597d 100644
--- a/gr-vocoder/swig/CMakeLists.txt
+++ b/gr-vocoder/swig/CMakeLists.txt
@@ -25,13 +25,13 @@ include(GrSwig)
set(GR_SWIG_INCLUDE_DIRS
${GR_VOCODER_INCLUDE_DIRS}
- ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
- ${GRUEL_INCLUDE_DIRS}
+ ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
)
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/vocoder_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/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 6c3f3fe422..b3dd436868 100644
--- a/gr-vocoder/swig/vocoder_swig.i
+++ b/gr-vocoder/swig/vocoder_swig.i
@@ -22,7 +22,7 @@
#define VOCODER_API
-%include "gnuradio.i"
+%include "runtime_swig.i"
//load generated python docstrings
%include "vocoder_swig_doc.i"
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-22 04:50:24 +0000