diff options
Diffstat (limited to 'gr-cvsd-vocoder')
| -rw-r--r-- | gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in | 2 | ||||
| -rw-r--r-- | gr-cvsd-vocoder/src/lib/Makefile.am | 3 | ||||
| -rw-r--r-- | gr-cvsd-vocoder/src/lib/cvsd_decode_bs.cc | 4 | ||||
| -rw-r--r-- | gr-cvsd-vocoder/src/lib/cvsd_encode_sb.cc | 4 | ||||
| -rwxr-xr-x | gr-cvsd-vocoder/src/python/qa_cvsd_vocoder.py | 6 |
5 files changed, 9 insertions, 10 deletions
diff --git a/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in b/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in index 056230864..f5f0c2e64 100644 --- a/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in +++ b/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: gnuradio-cvsd-vocoder Description: GNU Radio blocks implementing a CVSD vocoder Requires: gnuradio-core -Version: @VERSION@ +Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-cvsd-vocoder Cflags: -I${includedir} diff --git a/gr-cvsd-vocoder/src/lib/Makefile.am b/gr-cvsd-vocoder/src/lib/Makefile.am index 500d0e858..c5957f4ac 100644 --- a/gr-cvsd-vocoder/src/lib/Makefile.am +++ b/gr-cvsd-vocoder/src/lib/Makefile.am @@ -37,8 +37,7 @@ libgnuradio_cvsd_vocoder_la_SOURCES = \ libgnuradio_cvsd_vocoder_la_LIBADD = \ $(GNURADIO_CORE_LA) -libgnuradio_cvsd_vocoder_la_LDFLAGS = \ - $(NO_UNDEFINED) +libgnuradio_cvsd_vocoder_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) if PYTHON ################################### diff --git a/gr-cvsd-vocoder/src/lib/cvsd_decode_bs.cc b/gr-cvsd-vocoder/src/lib/cvsd_decode_bs.cc index 1dad15d43..26dcb29da 100644 --- a/gr-cvsd-vocoder/src/lib/cvsd_decode_bs.cc +++ b/gr-cvsd-vocoder/src/lib/cvsd_decode_bs.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -42,7 +42,7 @@ cvsd_make_decode_bs (short min_step, short max_step, double step_decay, double accum_decay, int K, int J, short pos_accum_max, short neg_accum_max) { - return cvsd_decode_bs_sptr (new cvsd_decode_bs (min_step, max_step, + return gnuradio::get_initial_sptr(new cvsd_decode_bs (min_step, max_step, step_decay, accum_decay, K, J, pos_accum_max, neg_accum_max)); } diff --git a/gr-cvsd-vocoder/src/lib/cvsd_encode_sb.cc b/gr-cvsd-vocoder/src/lib/cvsd_encode_sb.cc index 561b91c68..df867f3ba 100644 --- a/gr-cvsd-vocoder/src/lib/cvsd_encode_sb.cc +++ b/gr-cvsd-vocoder/src/lib/cvsd_encode_sb.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007 Free Software Foundation, Inc. + * Copyright 2007,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -42,7 +42,7 @@ cvsd_make_encode_sb (short min_step, short max_step, double step_decay, double accum_decay, int K, int J, short pos_accum_max, short neg_accum_max) { - return cvsd_encode_sb_sptr (new cvsd_encode_sb (min_step, max_step, + return gnuradio::get_initial_sptr(new cvsd_encode_sb (min_step, max_step, step_decay, accum_decay, K, J, pos_accum_max, neg_accum_max)); } diff --git a/gr-cvsd-vocoder/src/python/qa_cvsd_vocoder.py b/gr-cvsd-vocoder/src/python/qa_cvsd_vocoder.py index 1a39f636e..99a38d946 100755 --- a/gr-cvsd-vocoder/src/python/qa_cvsd_vocoder.py +++ b/gr-cvsd-vocoder/src/python/qa_cvsd_vocoder.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2007 Free Software Foundation, Inc. +# Copyright 2007,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -23,7 +23,7 @@ from gnuradio import gr, gr_unittest, blks2 import cvsd_vocoder -class qa_cvsd_test (gr_unittest.TestCase): +class test_cvsd_vocoder (gr_unittest.TestCase): def setUp (self): self.tb = gr.top_block() @@ -112,4 +112,4 @@ class qa_cvsd_test (gr_unittest.TestCase): """ if __name__ == '__main__': - gr_unittest.main () + gr_unittest.run(test_cvsd_vocoder, "test_cvsd_vocoder.xml") |