Updating all of the QA code that I can actually test to work with the new XML output...

[debian/gnuradio] / gr-usrp / src / usrp_sink_s.cc

diff --git a/gr-usrp/src/usrp_sink_s.cc b/gr-usrp/src/usrp_sink_s.cc
index adbf3acbd9330dc2434f6909907c5f3830160456..1ffaeed963cd6fb4a4958e99ff10dcf0cc80e010 100644 (file)
--- a/gr-usrp/src/usrp_sink_s.cc
+++ b/gr-usrp/src/usrp_sink_s.cc
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2009,2010 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -26,8 +26,8 @@
 
 #include <usrp_sink_s.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
-#include <usrp_bytesex.h>
+#include <usrp/usrp_standard.h>
+#include <usrp/usrp_bytesex.h>
 
 usrp_sink_s_sptr
 usrp_make_sink_s (int which_board,
@@ -40,7 +40,7 @@ usrp_make_sink_s (int which_board,
                   const std::string firmware_filename
                   ) throw (std::runtime_error)
 {
-  return usrp_sink_s_sptr (new usrp_sink_s (which_board,
+  return gnuradio::get_initial_sptr(new usrp_sink_s (which_board,
                                              interp_rate,
                                              nchan,
                                              mux,