mirror of
https://github.com/f4exb/sdrangel.git
synced 2026-06-01 21:54:55 -04:00
Source plugins: put a serializer and deserializer in the core plugin for server. NFM demod: fixed deserializer
This commit is contained in:
@@ -188,6 +188,33 @@ void HackRFInput::stop()
|
||||
m_running = false;
|
||||
}
|
||||
|
||||
QByteArray HackRFInput::serialize() const
|
||||
{
|
||||
return m_settings.serialize();
|
||||
}
|
||||
|
||||
bool HackRFInput::deserialize(const QByteArray& data)
|
||||
{
|
||||
bool success = true;
|
||||
|
||||
if (!m_settings.deserialize(data))
|
||||
{
|
||||
m_settings.resetToDefaults();
|
||||
success = false;
|
||||
}
|
||||
|
||||
MsgConfigureHackRF* message = MsgConfigureHackRF::create(m_settings, true);
|
||||
m_inputMessageQueue.push(message);
|
||||
|
||||
if (m_guiMessageQueue)
|
||||
{
|
||||
MsgConfigureHackRF* messageToGUI = MsgConfigureHackRF::create(m_settings, true);
|
||||
m_guiMessageQueue->push(messageToGUI);
|
||||
}
|
||||
|
||||
return success;
|
||||
}
|
||||
|
||||
const QString& HackRFInput::getDeviceDescription() const
|
||||
{
|
||||
return m_deviceDescription;
|
||||
@@ -203,6 +230,21 @@ quint64 HackRFInput::getCenterFrequency() const
|
||||
return m_settings.m_centerFrequency;
|
||||
}
|
||||
|
||||
void HackRFInput::setCenterFrequency(qint64 centerFrequency)
|
||||
{
|
||||
HackRFInputSettings settings = m_settings;
|
||||
settings.m_centerFrequency = centerFrequency;
|
||||
|
||||
MsgConfigureHackRF* message = MsgConfigureHackRF::create(settings, false);
|
||||
m_inputMessageQueue.push(message);
|
||||
|
||||
if (m_guiMessageQueue)
|
||||
{
|
||||
MsgConfigureHackRF* messageToGUI = MsgConfigureHackRF::create(settings, false);
|
||||
m_guiMessageQueue->push(messageToGUI);
|
||||
}
|
||||
}
|
||||
|
||||
bool HackRFInput::handleMessage(const Message& message)
|
||||
{
|
||||
if (MsgConfigureHackRF::match(message))
|
||||
|
||||
@@ -17,10 +17,11 @@
|
||||
#ifndef INCLUDE_HACKRFINPUT_H
|
||||
#define INCLUDE_HACKRFINPUT_H
|
||||
|
||||
#include <dsp/devicesamplesource.h>
|
||||
#include "libhackrf/hackrf.h"
|
||||
#include <QString>
|
||||
#include <QByteArray>
|
||||
|
||||
#include "libhackrf/hackrf.h"
|
||||
#include <dsp/devicesamplesource.h>
|
||||
#include "hackrf/devicehackrf.h"
|
||||
#include "hackrf/devicehackrfparam.h"
|
||||
#include "hackrfinputsettings.h"
|
||||
@@ -118,10 +119,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);
|
||||
|
||||
|
||||
@@ -125,7 +125,16 @@ bool HackRFInputGui::deserialize(const QByteArray& data)
|
||||
|
||||
bool HackRFInputGui::handleMessage(const Message& message)
|
||||
{
|
||||
if (HackRFInput::MsgReportHackRF::match(message))
|
||||
if (HackRFInput::MsgConfigureHackRF::match(message))
|
||||
{
|
||||
const HackRFInput::MsgConfigureHackRF& cfg = (HackRFInput::MsgConfigureHackRF&) message;
|
||||
m_settings = cfg.getSettings();
|
||||
blockApplySettings(true);
|
||||
displaySettings();
|
||||
blockApplySettings(false);
|
||||
return true;
|
||||
}
|
||||
else if (HackRFInput::MsgReportHackRF::match(message))
|
||||
{
|
||||
displaySettings();
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user