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/portaudio | |
| 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/portaudio')
| -rw-r--r-- | gr-audio/lib/portaudio/audio_portaudio_sink.cc | 2 | ||||
| -rw-r--r-- | gr-audio/lib/portaudio/audio_portaudio_source.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gr-audio/lib/portaudio/audio_portaudio_sink.cc b/gr-audio/lib/portaudio/audio_portaudio_sink.cc index 515cd04d9..7fdb99577 100644 --- a/gr-audio/lib/portaudio/audio_portaudio_sink.cc +++ b/gr-audio/lib/portaudio/audio_portaudio_sink.cc @@ -130,7 +130,7 @@ portaudio_sink_callback (const void *inputBuffer, audio_portaudio_sink::audio_portaudio_sink(int sampling_rate, const std::string device_name, bool ok_to_block) - : audio_sink ("audio_portaudio_sink", + : gr_sync_block ("audio_portaudio_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/portaudio/audio_portaudio_source.cc b/gr-audio/lib/portaudio/audio_portaudio_source.cc index bdb8b3b3d..55828ad21 100644 --- a/gr-audio/lib/portaudio/audio_portaudio_source.cc +++ b/gr-audio/lib/portaudio/audio_portaudio_source.cc @@ -129,7 +129,7 @@ portaudio_source_callback (const void *inputBuffer, audio_portaudio_source::audio_portaudio_source(int sampling_rate, const std::string device_name, bool ok_to_block) - : audio_source ("audio_portaudio_source", + : gr_sync_block ("audio_portaudio_source", gr_make_io_signature(0, 0, 0), gr_make_io_signature(0, 0, 0)), d_sampling_rate(sampling_rate), |