summaryrefslogtreecommitdiff
path: root/gr-audio-alsa
diff options
context:
space:
mode:
Diffstat (limited to 'gr-audio-alsa')
-rw-r--r--gr-audio-alsa/gnuradio-audio-alsa.pc.in2
-rw-r--r--gr-audio-alsa/src/Makefile.am3
-rw-r--r--gr-audio-alsa/src/audio_alsa_sink.cc4
-rw-r--r--gr-audio-alsa/src/audio_alsa_source.cc4
-rwxr-xr-xgr-audio-alsa/src/qa_alsa.py6
5 files changed, 9 insertions, 10 deletions
diff --git a/gr-audio-alsa/gnuradio-audio-alsa.pc.in b/gr-audio-alsa/gnuradio-audio-alsa.pc.in
index 797bfc0244..d5147e6af0 100644
--- a/gr-audio-alsa/gnuradio-audio-alsa.pc.in
+++ b/gr-audio-alsa/gnuradio-audio-alsa.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: gnuradio-audio-alsa
Description: The GNU Radio block for the ALSA sound system
Requires: gnuradio-core alsa
-Version: @VERSION@
+Version: @LIBVER@
Libs: -L${libdir} -lgnuradio-audio-alsa
Cflags: -I${includedir}
diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am
index ee7498af48..ed92cc197d 100644
--- a/gr-audio-alsa/src/Makefile.am
+++ b/gr-audio-alsa/src/Makefile.am
@@ -50,8 +50,7 @@ libgnuradio_audio_alsa_la_LIBADD = \
$(GNURADIO_CORE_LA) \
$(ALSA_LIBS)
-libgnuradio_audio_alsa_la_LDFLAGS = \
- $(NO_UNDEFINED)
+libgnuradio_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
if PYTHON
###################################
diff --git a/gr-audio-alsa/src/audio_alsa_sink.cc b/gr-audio-alsa/src/audio_alsa_sink.cc
index fe3f043bf6..d6b7f84cfb 100644
--- a/gr-audio-alsa/src/audio_alsa_sink.cc
+++ b/gr-audio-alsa/src/audio_alsa_sink.cc
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2010 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -70,7 +70,7 @@ audio_alsa_make_sink (int sampling_rate,
const std::string dev,
bool ok_to_block)
{
- return audio_alsa_sink_sptr (new audio_alsa_sink (sampling_rate, dev,
+ return gnuradio::get_initial_sptr(new audio_alsa_sink (sampling_rate, dev,
ok_to_block));
}
diff --git a/gr-audio-alsa/src/audio_alsa_source.cc b/gr-audio-alsa/src/audio_alsa_source.cc
index 381e553f54..7b3d91b9dd 100644
--- a/gr-audio-alsa/src/audio_alsa_source.cc
+++ b/gr-audio-alsa/src/audio_alsa_source.cc
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2010 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -68,7 +68,7 @@ audio_alsa_source_sptr
audio_alsa_make_source (int sampling_rate, const std::string dev,
bool ok_to_block)
{
- return audio_alsa_source_sptr (new audio_alsa_source (sampling_rate, dev,
+ return gnuradio::get_initial_sptr(new audio_alsa_source (sampling_rate, dev,
ok_to_block));
}
diff --git a/gr-audio-alsa/src/qa_alsa.py b/gr-audio-alsa/src/qa_alsa.py
index f2a480a50b..52dbfdc7a5 100755
--- a/gr-audio-alsa/src/qa_alsa.py
+++ b/gr-audio-alsa/src/qa_alsa.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2005,2007 Free Software Foundation, Inc.
+# Copyright 2005,2007,2010 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -23,7 +23,7 @@
from gnuradio import gr, gr_unittest
import audio_alsa
-class qa_alsa (gr_unittest.TestCase):
+class test_audio_alsa (gr_unittest.TestCase):
def setUp (self):
self.tb = gr.top_block ()
@@ -37,4 +37,4 @@ class qa_alsa (gr_unittest.TestCase):
pass
if __name__ == '__main__':
- gr_unittest.main ()
+ gr_unittest.run(test_audio_alsa, "test_audio_alsa.xml")