diff options
Diffstat (limited to 'gr-audio-jack')
| -rw-r--r-- | gr-audio-jack/gnuradio-audio-jack.pc.in | 2 | ||||
| -rw-r--r-- | gr-audio-jack/src/Makefile.am | 3 | ||||
| -rw-r--r-- | gr-audio-jack/src/audio_jack_sink.cc | 4 | ||||
| -rw-r--r-- | gr-audio-jack/src/audio_jack_source.cc | 4 | ||||
| -rwxr-xr-x | gr-audio-jack/src/qa_jack.py | 6 |
5 files changed, 9 insertions, 10 deletions
diff --git a/gr-audio-jack/gnuradio-audio-jack.pc.in b/gr-audio-jack/gnuradio-audio-jack.pc.in index eaceaea2f..8fb4a2e0d 100644 --- a/gr-audio-jack/gnuradio-audio-jack.pc.in +++ b/gr-audio-jack/gnuradio-audio-jack.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: gnuradio-audio-jack Description: GNU Radio blocks for the JACK sound system Requires: gnuradio-core jack -Version: @VERSION@ +Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-audio-jack Cflags: -I${includedir} diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am index b766ec201..8e0dfe1e3 100644 --- a/gr-audio-jack/src/Makefile.am +++ b/gr-audio-jack/src/Makefile.am @@ -42,8 +42,7 @@ libgnuradio_audio_jack_la_LIBADD = \ $(GNURADIO_CORE_LA) \ $(JACK_LIBS) -libgnuradio_audio_jack_la_LDFLAGS = \ - $(NO_UNDEFINED) +libgnuradio_audio_jack_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) noinst_PYTHON = \ qa_jack.py diff --git a/gr-audio-jack/src/audio_jack_sink.cc b/gr-audio-jack/src/audio_jack_sink.cc index 9dfc46751..6e39135c9 100644 --- a/gr-audio-jack/src/audio_jack_sink.cc +++ b/gr-audio-jack/src/audio_jack_sink.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2005,2006 Free Software Foundation, Inc. + * Copyright 2005,2006,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -87,7 +87,7 @@ jack_sink_process (jack_nframes_t nframes, void *arg) audio_jack_sink_sptr audio_jack_make_sink(int sampling_rate, const std::string dev, bool ok_to_block) { - return audio_jack_sink_sptr (new audio_jack_sink (sampling_rate, dev, + return gnuradio::get_initial_sptr(new audio_jack_sink (sampling_rate, dev, ok_to_block)); } diff --git a/gr-audio-jack/src/audio_jack_source.cc b/gr-audio-jack/src/audio_jack_source.cc index 392d246b4..ca3df51d7 100644 --- a/gr-audio-jack/src/audio_jack_source.cc +++ b/gr-audio-jack/src/audio_jack_source.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2005,2006 Free Software Foundation, Inc. + * Copyright 2005,2006,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -88,7 +88,7 @@ jack_source_process (jack_nframes_t nframes, void *arg) audio_jack_source_sptr audio_jack_make_source (int sampling_rate, const std::string dev, bool ok_to_block) { - return audio_jack_source_sptr (new audio_jack_source (sampling_rate, dev, ok_to_block)); + return gnuradio::get_initial_sptr(new audio_jack_source (sampling_rate, dev, ok_to_block)); } audio_jack_source::audio_jack_source (int sampling_rate, diff --git a/gr-audio-jack/src/qa_jack.py b/gr-audio-jack/src/qa_jack.py index d8a3aba88..ad6bee27b 100755 --- a/gr-audio-jack/src/qa_jack.py +++ b/gr-audio-jack/src/qa_jack.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2005 Free Software Foundation, Inc. +# Copyright 2005,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -23,7 +23,7 @@ from gnuradio import gr, gr_unittest import audio_jack -class qa_jack (gr_unittest.TestCase): +class test_audio_jack (gr_unittest.TestCase): def setUp (self): self.tb = gr.top_block () @@ -37,4 +37,4 @@ class qa_jack (gr_unittest.TestCase): pass if __name__ == '__main__': - gr_unittest.main () + gr_unittest.run(test_audio_jack, "test_audio_jack.xml") |