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-uhd/lib/gr_uhd_usrp_sink.cc | |
| 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-uhd/lib/gr_uhd_usrp_sink.cc')
| -rw-r--r-- | gr-uhd/lib/gr_uhd_usrp_sink.cc | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/gr-uhd/lib/gr_uhd_usrp_sink.cc b/gr-uhd/lib/gr_uhd_usrp_sink.cc index b8b99a41a..d44af25ab 100644 --- a/gr-uhd/lib/gr_uhd_usrp_sink.cc +++ b/gr-uhd/lib/gr_uhd_usrp_sink.cc @@ -24,14 +24,6 @@ #include <stdexcept> /*********************************************************************** - * UHD Multi USRP Sink - **********************************************************************/ -uhd_usrp_sink::uhd_usrp_sink(gr_io_signature_sptr sig) -:gr_sync_block("gr uhd usrp sink", sig, gr_make_io_signature(0, 0, 0)){ - /* NOP */ -} - -/*********************************************************************** * UHD Multi USRP Sink Impl **********************************************************************/ class uhd_usrp_sink_impl : public uhd_usrp_sink{ @@ -41,9 +33,11 @@ public: const uhd::io_type_t &io_type, size_t num_channels ): - uhd_usrp_sink(gr_make_io_signature( - num_channels, num_channels, io_type.size - )), + gr_sync_block( + "gr uhd usrp sink", + gr_make_io_signature(num_channels, num_channels, io_type.size), + gr_make_io_signature(0, 0, 0) + ), _type(io_type), _nchan(num_channels), _has_time_spec(_nchan > 1) |