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/oss/audio_oss_sink.cc | |
| 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/oss/audio_oss_sink.cc')
| -rw-r--r-- | gr-audio/lib/oss/audio_oss_sink.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-audio/lib/oss/audio_oss_sink.cc b/gr-audio/lib/oss/audio_oss_sink.cc index 4e9e7cd79..34af16cce 100644 --- a/gr-audio/lib/oss/audio_oss_sink.cc +++ b/gr-audio/lib/oss/audio_oss_sink.cc @@ -53,7 +53,7 @@ default_device_name () audio_oss_sink::audio_oss_sink (int sampling_rate, const std::string device_name, bool ok_to_block) - : audio_sink ("audio_oss_sink", + : gr_sync_block ("audio_oss_sink", gr_make_io_signature (1, 2, sizeof (float)), gr_make_io_signature (0, 0, 0)), d_sampling_rate (sampling_rate), |