diff options
| author | Josh Blum <josh@joshknows.com> | 2011-03-16 15:07:37 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-03-28 10:30:22 -0700 |
| commit | f8ce10742ab6b9ac170432ae78d2ee2d6c538d72 (patch) | |
| tree | ddca9aad42ae4a90c13029df4f81520a240f13d6 /gr-audio/include | |
| parent | 35a4938e598f6be6034e21ef1818c412a16a22d1 (diff) | |
audio: cleanup audio source/sink with virtual inheritance
The audio implementations now inherit from sync block (as they used to).
And the redundant constructor in audio source/sink has been removed.
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 c76ec65508..ca3b15a37a 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 ed3c31c10c..b8ae2ca5fa 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( |