Turn ArduControl command_queue into a Task

[r2c2.git] / source / libr2c2 / arducontrol.cpp

diff --git a/source/libr2c2/arducontrol.cpp b/source/libr2c2/arducontrol.cpp
index 6d75c7542dd0490fb3cde74b8b2e771560636eb1..4acfc60e0e761a0c5aaa7d4c260a0023988a8034 100644 (file)
--- a/source/libr2c2/arducontrol.cpp
+++ b/source/libr2c2/arducontrol.cpp
@@ -702,6 +702,17 @@ bool ArduControl::Queue<T>::empty() const
 }
 
 
+bool ArduControl::CommandQueueTask::get_work(PendingCommand &cmd)
+{
+       return queue.pop(cmd);
+}
+
+void ArduControl::CommandQueueTask::push(const PendingCommand &cmd)
+{
+       queue.push(cmd);
+}
+
+
 ArduControl::RefreshTask::RefreshTask():
        next(cycle.end()),
        round(0),
@@ -1035,6 +1046,7 @@ ArduControl::ControlThread::ControlThread(ArduControl &c):
        control(c),
        done(false)
 {
+       tasks.push_back(&control.command_queue);
        tasks.push_back(&control.monitor);
        tasks.push_back(&control.mfx_announce);
        tasks.push_back(&control.mfx_search);
@@ -1156,9 +1168,6 @@ void ArduControl::ControlThread::init_baud_rate()
 
 bool ArduControl::ControlThread::get_work(PendingCommand &cmd)
 {
-       if(control.command_queue.pop(cmd))
-               return true;
-
        for(vector<Task *>::iterator i=tasks.begin(); i!=tasks.end(); ++i)
                if((*i)->get_work(cmd))
                        return true;