Source plugins: put a serializer and deserializer in the core plugin for server. NFM demod: fixed deserializer

plugins/samplesource/bladerfinput/bladerfinput.cpp

@@ -207,6 +207,33 @@ void BladerfInput::stop()
 	m_running = false;
 }
 
+QByteArray BladerfInput::serialize() const
+{
+    return m_settings.serialize();
+}
+
+bool BladerfInput::deserialize(const QByteArray& data)
+{
+    bool success = true;
+
+    if (!m_settings.deserialize(data))
+    {
+        m_settings.resetToDefaults();
+        success = false;
+    }
+
+    MsgConfigureBladerf* message = MsgConfigureBladerf::create(m_settings, true);
+    m_inputMessageQueue.push(message);
+
+    if (m_guiMessageQueue)
+    {
+        MsgConfigureBladerf* messageToGUI = MsgConfigureBladerf::create(m_settings, true);
+        m_guiMessageQueue->push(messageToGUI);
+    }
+
+    return success;
+}
+
 const QString& BladerfInput::getDeviceDescription() const
 {
 	return m_deviceDescription;
@@ -223,6 +250,21 @@ quint64 BladerfInput::getCenterFrequency() const
 	return m_settings.m_centerFrequency;
 }
 
+void BladerfInput::setCenterFrequency(qint64 centerFrequency)
+{
+    BladeRFInputSettings settings = m_settings;
+    settings.m_centerFrequency = centerFrequency;
+
+    MsgConfigureBladerf* message = MsgConfigureBladerf::create(settings, false);
+    m_inputMessageQueue.push(message);
+
+    if (m_guiMessageQueue)
+    {
+        MsgConfigureBladerf* messageToGUI = MsgConfigureBladerf::create(settings, false);
+        m_guiMessageQueue->push(messageToGUI);
+    }
+}
+
 bool BladerfInput::handleMessage(const Message& message)
 {
 	if (MsgConfigureBladerf::match(message))

plugins/samplesource/bladerfinput/bladerfinput.h

@@ -17,13 +17,13 @@
 #ifndef INCLUDE_BLADERFINPUT_H
 #define INCLUDE_BLADERFINPUT_H
 
+#include <QString>
+#include <QByteArray>
+
+#include <libbladeRF.h>
 #include <dsp/devicesamplesource.h>
 #include "bladerf/devicebladerf.h"
 #include "bladerf/devicebladerfparam.h"
-
-#include <libbladeRF.h>
-#include <QString>
-
 #include "bladerfinputsettings.h"
 
 class DeviceSourceAPI;
@@ -101,10 +101,14 @@ public:
 	virtual bool start();
 	virtual void stop();
 
+    virtual QByteArray serialize() const;
+    virtual bool deserialize(const QByteArray& data);
+
     virtual void setMessageQueueToGUI(MessageQueue *queue) { m_guiMessageQueue = queue; }
 	virtual const QString& getDeviceDescription() const;
 	virtual int getSampleRate() const;
 	virtual quint64 getCenterFrequency() const;
+    virtual void setCenterFrequency(qint64 centerFrequency);
 
 	virtual bool handleMessage(const Message& message);
 

plugins/samplesource/bladerfinput/bladerfinputgui.cpp

@@ -126,7 +126,16 @@ bool BladerfInputGui::deserialize(const QByteArray& data)
 
 bool BladerfInputGui::handleMessage(const Message& message)
 {
-    if (BladerfInput::MsgStartStop::match(message))
+    if (BladerfInput::MsgConfigureBladerf::match(message))
+    {
+        const BladerfInput::MsgConfigureBladerf& cfg = (BladerfInput::MsgConfigureBladerf&) message;
+        m_settings = cfg.getSettings();
+        blockApplySettings(true);
+        displaySettings();
+        blockApplySettings(false);
+        return true;
+    }
+    else if (BladerfInput::MsgStartStop::match(message))
     {
         BladerfInput::MsgStartStop& notif = (BladerfInput::MsgStartStop&) message;
         blockApplySettings(true);