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/include | |
| 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/include')
| -rw-r--r-- | gr-audio/include/gr_audio_sink.h | 9 | ||||
| -rw-r--r-- | gr-audio/include/gr_audio_source.h | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/gr-audio/include/gr_audio_sink.h b/gr-audio/include/gr_audio_sink.h index c76ec6550..ca3b15a37 100644 --- a/gr-audio/include/gr_audio_sink.h +++ b/gr-audio/include/gr_audio_sink.h @@ -25,16 +25,9 @@ #include <gr_audio_api.h> #include <gr_sync_block.h> -class GR_AUDIO_API audio_sink : public gr_sync_block{ +class GR_AUDIO_API audio_sink : virtual public gr_sync_block{ public: typedef boost::shared_ptr<audio_sink> sptr; - - audio_sink( - const std::string &name, - gr_io_signature_sptr insig, - gr_io_signature_sptr outsig - ); - }; GR_AUDIO_API audio_sink::sptr audio_make_sink( diff --git a/gr-audio/include/gr_audio_source.h b/gr-audio/include/gr_audio_source.h index ed3c31c10..b8ae2ca5f 100644 --- a/gr-audio/include/gr_audio_source.h +++ b/gr-audio/include/gr_audio_source.h @@ -25,16 +25,9 @@ #include <gr_audio_api.h> #include <gr_sync_block.h> -class GR_AUDIO_API audio_source : public gr_sync_block{ +class GR_AUDIO_API audio_source : virtual public gr_sync_block{ public: typedef boost::shared_ptr<audio_source> sptr; - - audio_source( - const std::string &name, - gr_io_signature_sptr insig, - gr_io_signature_sptr outsig - ); - }; GR_AUDIO_API audio_source::sptr audio_make_source( |