diff options
| author | Johnathan Corgan | 2010-08-03 14:21:46 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-08-03 14:21:46 -0700 |
| commit | f2020441564063e7595ed2f82a858500deda9252 (patch) | |
| tree | 5d9c376a711f4acb1d42ecd46834bc5a508d16fe /gr-audio-alsa/src | |
| parent | 5198dfe1d9fae8a2b4fa180cdc868a3bfdded7f5 (diff) | |
| parent | 62328b4e78e2df20bccb2983bbe7591f99ba013f (diff) | |
| download | gnuradio-f2020441564063e7595ed2f82a858500deda9252.tar.gz gnuradio-f2020441564063e7595ed2f82a858500deda9252.tar.bz2 gnuradio-f2020441564063e7595ed2f82a858500deda9252.zip | |
Merge branch 'master' into next
Diffstat (limited to 'gr-audio-alsa/src')
| -rw-r--r-- | gr-audio-alsa/src/audio_alsa_sink.cc | 4 | ||||
| -rw-r--r-- | gr-audio-alsa/src/audio_alsa_source.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gr-audio-alsa/src/audio_alsa_sink.cc b/gr-audio-alsa/src/audio_alsa_sink.cc index fe3f043bf..d6b7f84cf 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 381e553f5..7b3d91b9d 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)); } |