diff options
| author | Tom Rondeau | 2011-04-06 17:10:16 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-04-06 17:10:16 -0400 |
| commit | 831134234e5ab6d3a29f21f89b338c9656328946 (patch) | |
| tree | 2318091e9c4140952c8780130310ceec5f29c534 /gr-uhd/lib/gr_uhd_usrp_sink.cc | |
| parent | b30c79326c3eedf5ebf20be62306f0511b98a0e7 (diff) | |
| parent | eca5501969aa6175562b7e70b350cf3e6ddec603 (diff) | |
| download | gnuradio-831134234e5ab6d3a29f21f89b338c9656328946.tar.gz gnuradio-831134234e5ab6d3a29f21f89b338c9656328946.tar.bz2 gnuradio-831134234e5ab6d3a29f21f89b338c9656328946.zip | |
Merge branch 'master' into 8psk
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) |