diff options
author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2010-08-03 14:21:36 -0700 |
---|---|---|
committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2010-08-03 14:21:36 -0700 |
commit | 62328b4e78e2df20bccb2983bbe7591f99ba013f (patch) | |
tree | c249fa5639c2c46066782012b7075bb8b7879335 /gr-audio-portaudio/src | |
parent | 8034e2cd49fd71bfdf1ed587d49781a444e1cced (diff) | |
parent | 0a9b999b5cce596f4de05828005f698047e14ce9 (diff) |
Merge branch 'maint'
Diffstat (limited to 'gr-audio-portaudio/src')
-rw-r--r-- | gr-audio-portaudio/src/audio_portaudio_sink.cc | 4 | ||||
-rw-r--r-- | gr-audio-portaudio/src/audio_portaudio_source.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gr-audio-portaudio/src/audio_portaudio_sink.cc b/gr-audio-portaudio/src/audio_portaudio_sink.cc index 65a38f9119..9a3baf40ef 100644 --- a/gr-audio-portaudio/src/audio_portaudio_sink.cc +++ b/gr-audio-portaudio/src/audio_portaudio_sink.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -120,7 +120,7 @@ portaudio_sink_callback (const void *inputBuffer, audio_portaudio_sink_sptr audio_portaudio_make_sink (int sampling_rate, const std::string dev, bool ok_to_block) { - return audio_portaudio_sink_sptr (new audio_portaudio_sink (sampling_rate, + return gnuradio::get_initial_sptr(new audio_portaudio_sink (sampling_rate, dev, ok_to_block)); } diff --git a/gr-audio-portaudio/src/audio_portaudio_source.cc b/gr-audio-portaudio/src/audio_portaudio_source.cc index 484b7f1e54..23801a8bf7 100644 --- a/gr-audio-portaudio/src/audio_portaudio_source.cc +++ b/gr-audio-portaudio/src/audio_portaudio_source.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006 Free Software Foundation, Inc. + * Copyright 2006,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -119,7 +119,7 @@ portaudio_source_callback (const void *inputBuffer, audio_portaudio_source_sptr audio_portaudio_make_source (int sampling_rate, const std::string dev, bool ok_to_block) { - return audio_portaudio_source_sptr (new audio_portaudio_source (sampling_rate, + return gnuradio::get_initial_sptr(new audio_portaudio_source (sampling_rate, dev, ok_to_block)); } |