get initial sptr using new convention

[debian/gnuradio] / gr-usrp2 / src / usrp2_sink_16sc.cc

diff --git a/gr-usrp2/src/usrp2_sink_16sc.cc b/gr-usrp2/src/usrp2_sink_16sc.cc
index f1356bb42d4c1ad8d2a01cf540613fce85cc4413..deb61bb7231886fb92b1c875d6f98c53d5625675 100644 (file)
--- a/gr-usrp2/src/usrp2_sink_16sc.cc
+++ b/gr-usrp2/src/usrp2_sink_16sc.cc
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <usrp2_sink_16sc.h>
@@ -33,7 +33,7 @@ usrp2_sink_16sc_sptr
 usrp2_make_sink_16sc(const std::string &ifc, const std::string &mac_addr) 
   throw (std::runtime_error)
 {
-  return usrp2_sink_16sc_sptr(new usrp2_sink_16sc(ifc, mac_addr));
+  return gnuradio::get_initial_sptr(new usrp2_sink_16sc(ifc, mac_addr));
 }
 
 usrp2_sink_16sc::usrp2_sink_16sc(const std::string &ifc, const std::string &mac_addr) 
@@ -62,10 +62,10 @@ usrp2_sink_16sc::work(int noutput_items,
   metadata.send_now = 1;
   metadata.start_of_burst = 1;
 
-  bool ok = d_u2->tx_16sc(0,  // FIXME: someday, streams will have channel numbers
+  bool ok = d_u2->tx_16sc(0,  // FIXME: use channel number instead of 0
                          in, noutput_items, &metadata);
   if (!ok){
-    std::cerr << "usrp2_sink_16sc: tx_complex_int16 failed" << std::endl;
+    std::cerr << "usrp2_sink_16sc: tx_16sc failed" << std::endl;
     return -1; // say we're done
   }