From e5dac73f76ab0bb242594cab9c02be2107e34a9f Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Fri, 7 Feb 2014 16:15:45 +0100
Subject: UHD output: remove compilation warning

---
 src/OutputUHD.cpp |  6 +++---
 src/OutputUHD.h   | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/OutputUHD.cpp b/src/OutputUHD.cpp
index 18cb55e..462bf94 100644
--- a/src/OutputUHD.cpp
+++ b/src/OutputUHD.cpp
@@ -173,7 +173,7 @@ OutputUHD::OutputUHD(
     first_run = true;
 
     shared_ptr<barrier> b(new barrier(2));
-    my_sync_barrier = b;
+    mySyncBarrier = b;
     uwd.sync_barrier = b;
 
     worker.start(&uwd);
@@ -234,7 +234,7 @@ int OutputUHD::process(Buffer* dataIn, Buffer* dataOut)
             throw std::runtime_error("Non-constant input length!");
         }
         //fprintf(stderr, "OutUHD.process:Waiting for barrier\n");
-        my_sync_barrier.get()->wait();
+        mySyncBarrier.get()->wait();
 
         // write into the our buffer while
         // the worker sends the other.
@@ -262,7 +262,7 @@ int OutputUHD::process(Buffer* dataIn, Buffer* dataOut)
 
 }
 
-void UHDWorker::process(struct UHDWorkerData *uwd)
+void UHDWorker::process()
 {
     int workerbuffer  = 0;
     time_t tx_second = 0;
diff --git a/src/OutputUHD.h b/src/OutputUHD.h
index f06b98a..107df2a 100644
--- a/src/OutputUHD.h
+++ b/src/OutputUHD.h
@@ -125,7 +125,8 @@ class UHDWorker {
 
         void start(struct UHDWorkerData *uhdworkerdata) {
             running = true;
-            uhd_thread = boost::thread(&UHDWorker::process, this, uhdworkerdata);
+            uwd = uhdworkerdata;
+            uhd_thread = boost::thread(&UHDWorker::process, this);
         }
 
         void stop() {
@@ -134,11 +135,11 @@ class UHDWorker {
             uhd_thread.join();
         }
 
-        void process(struct UHDWorkerData *uhdworkerdata);
+        void process();
 
 
     private:
-        struct UHDWorkerData *workerdata;
+        struct UHDWorkerData *uwd;
         bool running;
         boost::thread uhd_thread;
 
@@ -184,10 +185,9 @@ class OutputUHD: public ModOutput, public RemoteControllable {
         }
 
         /*********** REMOTE CONTROL ***************/
-        /* Tell the controllable to enrol at the given controller /
-        virtual void enrol_at(BaseRemoteController& controller) {
-            controller.enrol(this);
-        } // */
+        /* virtual void enrol_at(BaseRemoteController& controller)
+         * is inherited
+         */
 
         /* Base function to set parameters. */
         virtual void set_parameter(string parameter, string value);
@@ -204,7 +204,7 @@ class OutputUHD: public ModOutput, public RemoteControllable {
         int myTxGain;
         double myFrequency;
         uhd::usrp::multi_usrp::sptr myUsrp;
-        shared_ptr<barrier> my_sync_barrier;
+        shared_ptr<barrier> mySyncBarrier;
         UHDWorker worker;
         bool first_run;
         struct UHDWorkerData uwd;
-- 
cgit v1.2.3