From 25ee0ce936a3088bfef694810ea6322f19dac3f2 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 16 Mar 2011 15:20:44 -0700
Subject: uhd: cleanup uhd usrp source/sink with virtual inheritance

The uhd block implementations now inherit from sync block.
And the redundant constructor in source/sink has been removed.
---
 gr-uhd/lib/gr_uhd_usrp_sink.cc   | 16 +++++-----------
 gr-uhd/lib/gr_uhd_usrp_source.cc | 16 +++++-----------
 2 files changed, 10 insertions(+), 22 deletions(-)

(limited to 'gr-uhd/lib')

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
@@ -23,14 +23,6 @@
 #include <gr_io_signature.h>
 #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
  **********************************************************************/
@@ -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)
diff --git a/gr-uhd/lib/gr_uhd_usrp_source.cc b/gr-uhd/lib/gr_uhd_usrp_source.cc
index 1234ed7fe..fed8e6624 100644
--- a/gr-uhd/lib/gr_uhd_usrp_source.cc
+++ b/gr-uhd/lib/gr_uhd_usrp_source.cc
@@ -25,14 +25,6 @@
 #include <iostream>
 #include <boost/format.hpp>
 
-/***********************************************************************
- * UHD Multi USRP Source
- **********************************************************************/
-uhd_usrp_source::uhd_usrp_source(gr_io_signature_sptr sig)
-:gr_sync_block("gr uhd usrp source", gr_make_io_signature(0, 0, 0), sig){
-    /* NOP */
-}
-
 /***********************************************************************
  * UHD Multi USRP Source Impl
  **********************************************************************/
@@ -43,9 +35,11 @@ public:
         const uhd::io_type_t &io_type,
         size_t num_channels
     ):
-        uhd_usrp_source(gr_make_io_signature(
-            num_channels, num_channels, io_type.size
-        )),
+        gr_sync_block(
+            "gr uhd usrp source",
+            gr_make_io_signature(0, 0, 0),
+            gr_make_io_signature(num_channels, num_channels, io_type.size)
+        ),
         _type(io_type),
         _nchan(num_channels),
         _stream_now(_nchan == 1),
-- 
cgit