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-oss | |
| 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-oss')
| -rw-r--r-- | gr-audio-oss/src/audio_oss_sink.cc | 4 | ||||
| -rw-r--r-- | gr-audio-oss/src/audio_oss_source.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gr-audio-oss/src/audio_oss_sink.cc b/gr-audio-oss/src/audio_oss_sink.cc index a14edc9d2..8230ab9b6 100644 --- a/gr-audio-oss/src/audio_oss_sink.cc +++ b/gr-audio-oss/src/audio_oss_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 * @@ -47,7 +47,7 @@ default_device_name () audio_oss_sink_sptr audio_oss_make_sink (int sampling_rate, const std::string dev, bool ok_to_block) { - return audio_oss_sink_sptr (new audio_oss_sink (sampling_rate, dev, ok_to_block)); + return gnuradio::get_initial_sptr(new audio_oss_sink (sampling_rate, dev, ok_to_block)); } audio_oss_sink::audio_oss_sink (int sampling_rate, diff --git a/gr-audio-oss/src/audio_oss_source.cc b/gr-audio-oss/src/audio_oss_source.cc index 1df98a5eb..fbb898f8c 100644 --- a/gr-audio-oss/src/audio_oss_source.cc +++ b/gr-audio-oss/src/audio_oss_source.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 * @@ -47,7 +47,7 @@ default_device_name () audio_oss_source_sptr audio_oss_make_source (int sampling_rate, const std::string dev, bool ok_to_block) { - return audio_oss_source_sptr (new audio_oss_source (sampling_rate, dev, ok_to_block)); + return gnuradio::get_initial_sptr(new audio_oss_source (sampling_rate, dev, ok_to_block)); } |