Web API: fixed segfault when mixing start/stop between GUI and API. Applied to BladeRF input, SDRdaemon input and SDRPlay

plugins/samplesource/bladerfinput/bladerfinput.cpp

@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <errno.h>
+#include <unistd.h>
 #include <QDebug>
 
 #include "SWGDeviceSettings.h"
@@ -34,6 +35,7 @@
 #include "bladerfinputthread.h"
 
 MESSAGE_CLASS_DEFINITION(BladerfInput::MsgConfigureBladerf, Message)
+MESSAGE_CLASS_DEFINITION(BladerfInput::MsgStartStop, Message)
 MESSAGE_CLASS_DEFINITION(BladerfInput::MsgFileRecord, Message)
 
 BladerfInput::BladerfInput(DeviceSourceAPI *deviceAPI) :
@@ -244,6 +246,27 @@ bool BladerfInput::handleMessage(const Message& message)
 
         return true;
     }
+    else if (MsgStartStop::match(message))
+    {
+        MsgStartStop& cmd = (MsgStartStop&) message;
+        qDebug() << "BladerfInput::handleMessage: MsgStartStop: " << (cmd.getStartStop() ? "start" : "stop");
+
+        if (cmd.getStartStop())
+        {
+            if (m_deviceAPI->initAcquisition())
+            {
+                m_deviceAPI->startAcquisition();
+                DSPEngine::instance()->startAudioOutput();
+            }
+        }
+        else
+        {
+            m_deviceAPI->stopAcquisition();
+            DSPEngine::instance()->stopAudioOutput();
+        }
+
+        return true;
+    }
 	else
 	{
 		return false;
@@ -558,19 +581,16 @@ int BladerfInput::webapiRun(
         SWGSDRangel::SWGDeviceState& response,
         QString& errorMessage __attribute__((unused)))
 {
-    if (run)
+    MsgStartStop *message = MsgStartStop::create(run);
+    m_inputMessageQueue.push(message);
+
+    if (m_guiMessageQueue) // forward to GUI if any
     {
-        if (m_deviceAPI->initAcquisition())
-        {
-            m_deviceAPI->startAcquisition();
-            DSPEngine::instance()->startAudioOutputImmediate();
-        }
-    }
-    else
-    {
-        m_deviceAPI->stopAcquisition();
+        MsgStartStop *msgToGUI = MsgStartStop::create(run);
+        m_guiMessageQueue->push(msgToGUI);
     }
 
+    usleep(100000);
     m_deviceAPI->getDeviceEngineStateStr(*response.getState());
     return 200;
 }

plugins/samplesource/bladerfinput/bladerfinput.h

@@ -74,7 +74,26 @@ public:
         { }
     };
 
-	BladerfInput(DeviceSourceAPI *deviceAPI);
+    class MsgStartStop : public Message {
+        MESSAGE_CLASS_DECLARATION
+
+    public:
+        bool getStartStop() const { return m_startStop; }
+
+        static MsgStartStop* create(bool startStop) {
+            return new MsgStartStop(startStop);
+        }
+
+    protected:
+        bool m_startStop;
+
+        MsgStartStop(bool startStop) :
+            Message(),
+            m_startStop(startStop)
+        { }
+    };
+
+    BladerfInput(DeviceSourceAPI *deviceAPI);
 	virtual ~BladerfInput();
 	virtual void destroy();
 

plugins/samplesource/bladerfinput/bladerfinputgui.cpp

@@ -124,9 +124,21 @@ bool BladerfInputGui::deserialize(const QByteArray& data)
 	}
 }
 
-bool BladerfInputGui::handleMessage(const Message& message __attribute__((unused)))
+bool BladerfInputGui::handleMessage(const Message& message)
 {
-    return false;
+    if (BladerfInput::MsgStartStop::match(message))
+    {
+        BladerfInput::MsgStartStop& notif = (BladerfInput::MsgStartStop&) message;
+        blockApplySettings(true);
+        ui->startStop->setChecked(notif.getStartStop());
+        blockApplySettings(false);
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
 }
 
 void BladerfInputGui::handleInputMessages()
@@ -147,6 +159,13 @@ void BladerfInputGui::handleInputMessages()
 
             delete message;
         }
+        else
+        {
+            if (handleMessage(*message))
+            {
+                delete message;
+            }
+        }
     }
 }
 
@@ -339,18 +358,10 @@ void BladerfInputGui::on_xb200_currentIndexChanged(int index)
 
 void BladerfInputGui::on_startStop_toggled(bool checked)
 {
-    if (checked)
+    if (m_doApplySettings)
     {
-        if (m_deviceUISet->m_deviceSourceAPI->initAcquisition())
-        {
-            m_deviceUISet->m_deviceSourceAPI->startAcquisition();
-            DSPEngine::instance()->startAudioOutput();
-        }
-    }
-    else
-    {
-        m_deviceUISet->m_deviceSourceAPI->stopAcquisition();
-        DSPEngine::instance()->stopAudioOutput();
+        BladerfInput::MsgStartStop *message = BladerfInput::MsgStartStop::create(checked);
+        m_sampleSource->getInputMessageQueue()->push(message);
     }
 }