diff options
| author | Johnathan Corgan | 2011-03-29 07:48:56 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2011-03-29 07:48:56 -0700 |
| commit | d44bed65837cffef9f17cc2cdc3dee2c65e5f984 (patch) | |
| tree | d5e1e0367ffb048111f50b7e35f74dd42e983fd4 /gr-audio/lib/osx | |
| parent | faa244588108ccb506d4973d0b824565924468a1 (diff) | |
| parent | 25ee0ce936a3088bfef694810ea6322f19dac3f2 (diff) | |
| download | gnuradio-d44bed65837cffef9f17cc2cdc3dee2c65e5f984.tar.gz gnuradio-d44bed65837cffef9f17cc2cdc3dee2c65e5f984.tar.bz2 gnuradio-d44bed65837cffef9f17cc2cdc3dee2c65e5f984.zip | |
Merge remote branch 'jblum/wip/gr_block_pure_virtual'
* jblum/wip/gr_block_pure_virtual:
uhd: cleanup uhd usrp source/sink with virtual inheritance
audio: cleanup audio source/sink with virtual inheritance
runtime: changes to block headers to allow pure virtual sub-classes (interfaces)
Diffstat (limited to 'gr-audio/lib/osx')
| -rw-r--r-- | gr-audio/lib/osx/audio_osx_sink.cc | 2 | ||||
| -rw-r--r-- | gr-audio/lib/osx/audio_osx_source.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gr-audio/lib/osx/audio_osx_sink.cc b/gr-audio/lib/osx/audio_osx_sink.cc index f7aeb54f8..901881da6 100644 --- a/gr-audio/lib/osx/audio_osx_sink.cc +++ b/gr-audio/lib/osx/audio_osx_sink.cc @@ -43,7 +43,7 @@ audio_osx_sink::audio_osx_sink (int sample_rate, bool do_block, int channel_config, int max_sample_count) - : audio_sink ("audio_osx_sink", + : gr_sync_block ("audio_osx_sink", gr_make_io_signature (0, 0, 0), gr_make_io_signature (0, 0, 0)), d_sample_rate (0.0), d_channel_config (0), d_n_channels (0), diff --git a/gr-audio/lib/osx/audio_osx_source.cc b/gr-audio/lib/osx/audio_osx_source.cc index e380156d6..61f8eb4a6 100644 --- a/gr-audio/lib/osx/audio_osx_source.cc +++ b/gr-audio/lib/osx/audio_osx_source.cc @@ -65,7 +65,7 @@ audio_osx_source::audio_osx_source (int sample_rate, bool do_block, int channel_config, int max_sample_count) - : audio_source ("audio_osx_source", + : gr_sync_block ("audio_osx_source", gr_make_io_signature (0, 0, 0), gr_make_io_signature (0, 0, 0)), d_deviceSampleRate (0.0), d_outputSampleRate (0.0), |