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

plugins/samplesource/filesource/filesourcegui.cpp

@@ -156,7 +156,16 @@ void FileSourceGui::handleInputMessages()
 
 bool FileSourceGui::handleMessage(const Message& message)
 {
-	if (FileSourceInput::MsgReportFileSourceAcquisition::match(message))
+    if (FileSourceInput::MsgConfigureFileSource::match(message))
+    {
+        const FileSourceInput::MsgConfigureFileSource& cfg = (FileSourceInput::MsgConfigureFileSource&) message;
+        m_settings = cfg.getSettings();
+        blockApplySettings(true);
+        displaySettings();
+        blockApplySettings(false);
+        return true;
+    }
+    else if (FileSourceInput::MsgReportFileSourceAcquisition::match(message))
 	{
 		m_acquisition = ((FileSourceInput::MsgReportFileSourceAcquisition&)message).getAcquisition();
 		updateWithAcquisition();

plugins/samplesource/filesource/filesourceinput.cpp

@@ -189,6 +189,33 @@ void FileSourceInput::stop()
 	}
 }
 
+QByteArray FileSourceInput::serialize() const
+{
+    return m_settings.serialize();
+}
+
+bool FileSourceInput::deserialize(const QByteArray& data)
+{
+    bool success = true;
+
+    if (!m_settings.deserialize(data))
+    {
+        m_settings.resetToDefaults();
+        success = false;
+    }
+
+    MsgConfigureFileSource* message = MsgConfigureFileSource::create(m_settings);
+    m_inputMessageQueue.push(message);
+
+    if (m_guiMessageQueue)
+    {
+        MsgConfigureFileSource* messageToGUI = MsgConfigureFileSource::create(m_settings);
+        m_guiMessageQueue->push(messageToGUI);
+    }
+
+    return success;
+}
+
 const QString& FileSourceInput::getDeviceDescription() const
 {
 	return m_deviceDescription;
@@ -204,6 +231,21 @@ quint64 FileSourceInput::getCenterFrequency() const
 	return m_centerFrequency;
 }
 
+void FileSourceInput::setCenterFrequency(qint64 centerFrequency)
+{
+    FileSourceSettings settings = m_settings;
+    settings.m_centerFrequency = centerFrequency;
+
+    MsgConfigureFileSource* message = MsgConfigureFileSource::create(m_settings);
+    m_inputMessageQueue.push(message);
+
+    if (m_guiMessageQueue)
+    {
+        MsgConfigureFileSource* messageToGUI = MsgConfigureFileSource::create(m_settings);
+        m_guiMessageQueue->push(messageToGUI);
+    }
+}
+
 std::time_t FileSourceInput::getStartingTimeStamp() const
 {
 	return m_startingTimeStamp;

plugins/samplesource/filesource/filesourceinput.h

@@ -17,13 +17,14 @@
 #ifndef INCLUDE_FILESOURCEINPUT_H
 #define INCLUDE_FILESOURCEINPUT_H
 
-#include <dsp/devicesamplesource.h>
 #include <QString>
+#include <QByteArray>
 #include <QTimer>
 #include <ctime>
 #include <iostream>
 #include <fstream>
 
+#include <dsp/devicesamplesource.h>
 #include "filesourcesettings.h"
 
 class FileSourceThread;
@@ -230,10 +231,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);
 	std::time_t getStartingTimeStamp() const;
 
 	virtual bool handleMessage(const Message& message);