diff options
| author | Tom Rondeau | 2011-05-08 11:54:44 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-05-08 11:54:44 -0400 |
| commit | cbf76b863bfd62ca22913b84bc705908a817b664 (patch) | |
| tree | 3a2692c067a60487b965201f1ed4a92ca26f0816 /gr-audio/lib/alsa | |
| parent | 918d53d764736fe2be79e1a6e08aba7d2e75f56d (diff) | |
| parent | 6c3623b0b084ce9328557ebd3cd487c484ee1c5b (diff) | |
| download | gnuradio-cbf76b863bfd62ca22913b84bc705908a817b664.tar.gz gnuradio-cbf76b863bfd62ca22913b84bc705908a817b664.tar.bz2 gnuradio-cbf76b863bfd62ca22913b84bc705908a817b664.zip | |
Merge branch '8psk' of github.com:trondeau/gnuradio into 8psk
Conflicts:
gr-digital/lib/digital_costas_loop_cc.cc
gr-digital/python/qa_costas_loop_cc.py
Diffstat (limited to 'gr-audio/lib/alsa')
| -rw-r--r-- | gr-audio/lib/alsa/audio_alsa_sink.cc | 2 | ||||
| -rw-r--r-- | gr-audio/lib/alsa/audio_alsa_source.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gr-audio/lib/alsa/audio_alsa_sink.cc b/gr-audio/lib/alsa/audio_alsa_sink.cc index 0728f421c..5fd197ec7 100644 --- a/gr-audio/lib/alsa/audio_alsa_sink.cc +++ b/gr-audio/lib/alsa/audio_alsa_sink.cc @@ -74,7 +74,7 @@ default_nperiods () audio_alsa_sink::audio_alsa_sink (int sampling_rate, const std::string device_name, bool ok_to_block) - : audio_sink ("audio_alsa_sink", + : gr_sync_block ("audio_alsa_sink", gr_make_io_signature (0, 0, 0), gr_make_io_signature (0, 0, 0)), d_sampling_rate (sampling_rate), diff --git a/gr-audio/lib/alsa/audio_alsa_source.cc b/gr-audio/lib/alsa/audio_alsa_source.cc index e46a7fdd4..4f0042b22 100644 --- a/gr-audio/lib/alsa/audio_alsa_source.cc +++ b/gr-audio/lib/alsa/audio_alsa_source.cc @@ -73,7 +73,7 @@ default_nperiods () audio_alsa_source::audio_alsa_source (int sampling_rate, const std::string device_name, bool ok_to_block) - : audio_source ("audio_alsa_source", + : gr_sync_block ("audio_alsa_source", gr_make_io_signature (0, 0, 0), gr_make_io_signature (0, 0, 0)), d_sampling_rate (sampling_rate), |