From 5ba857f278950f29e1c95c9ee8455182d2a4fd6b Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sun, 19 Nov 2017 18:17:28 +0100
Subject: [PATCH] SDRdaemon source: use settings structure in source

---
 .../samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp   | 6 ++----
 plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.h | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp
index 723638bf0..beb5842b3 100644
--- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp
@@ -44,8 +44,6 @@ SDRdaemonSourceInput::SDRdaemonSourceInput(DeviceSourceAPI *deviceAPI) :
 	m_port(9090),
 	m_SDRdaemonUDPHandler(0),
 	m_deviceDescription(),
-	m_sampleRate(0),
-	m_centerFrequency(0),
 	m_startingTimeStamp(0),
     m_masterTimer(deviceAPI->getMasterTimer()),
     m_autoFollowRate(false),
@@ -96,12 +94,12 @@ const QString& SDRdaemonSourceInput::getDeviceDescription() const
 
 int SDRdaemonSourceInput::getSampleRate() const
 {
-	return m_sampleRate;
+	return m_settings.m_sampleRate;
 }
 
 quint64 SDRdaemonSourceInput::getCenterFrequency() const
 {
-	return m_centerFrequency;
+	return m_settings.m_centerFrequency;
 }
 
 std::time_t SDRdaemonSourceInput::getStartingTimeStamp() const
diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.h b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.h
index a966e69f7..cb44ecea2 100644
--- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.h
+++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.h
@@ -323,12 +323,11 @@ public:
 private:
 	DeviceSourceAPI *m_deviceAPI;
 	QMutex m_mutex;
+	SDRdaemonSourceSettings m_settings;
 	QString m_address;
 	quint16 m_port;
 	SDRdaemonSourceUDPHandler* m_SDRdaemonUDPHandler;
 	QString m_deviceDescription;
-	int m_sampleRate;
-	quint64 m_centerFrequency;
 	std::time_t m_startingTimeStamp;
 	const QTimer& m_masterTimer;
     bool m_autoFollowRate;