VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-16 05:11:49 -05:00
Code Issues Projects Releases Wiki Activity

SDRdaemon source: use settings structure in source

Browse Source
This commit is contained in:
f4exb 2017-11-19 18:17:28 +01:00
parent d0572a6f84
commit 5ba857f278
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp
View File

@ -44,8 +44,6 @@ SDRdaemonSourceInput::SDRdaemonSourceInput(DeviceSourceAPI *deviceAPI) :
m_port(9090), m_port(9090),
m_SDRdaemonUDPHandler(0), m_SDRdaemonUDPHandler(0),
m_deviceDescription(), m_deviceDescription(),
m_sampleRate(0),
m_centerFrequency(0),
m_startingTimeStamp(0), m_startingTimeStamp(0),
m_masterTimer(deviceAPI->getMasterTimer()), m_masterTimer(deviceAPI->getMasterTimer()),
m_autoFollowRate(false), m_autoFollowRate(false),
@ -96,12 +94,12 @@ const QString& SDRdaemonSourceInput::getDeviceDescription() const
int SDRdaemonSourceInput::getSampleRate() const int SDRdaemonSourceInput::getSampleRate() const
{ {
return m_sampleRate; return m_settings.m_sampleRate;
} }
quint64 SDRdaemonSourceInput::getCenterFrequency() const quint64 SDRdaemonSourceInput::getCenterFrequency() const
{ {
return m_centerFrequency; return m_settings.m_centerFrequency;
} }
std::time_t SDRdaemonSourceInput::getStartingTimeStamp() const std::time_t SDRdaemonSourceInput::getStartingTimeStamp() const

3
plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.h
View File

@ -323,12 +323,11 @@ public:
private: private:
DeviceSourceAPI *m_deviceAPI; DeviceSourceAPI *m_deviceAPI;
QMutex m_mutex; QMutex m_mutex;
SDRdaemonSourceSettings m_settings;
QString m_address; QString m_address;
quint16 m_port; quint16 m_port;
SDRdaemonSourceUDPHandler* m_SDRdaemonUDPHandler; SDRdaemonSourceUDPHandler* m_SDRdaemonUDPHandler;
QString m_deviceDescription; QString m_deviceDescription;
int m_sampleRate;
quint64 m_centerFrequency;
std::time_t m_startingTimeStamp; std::time_t m_startingTimeStamp;
const QTimer& m_masterTimer; const QTimer& m_masterTimer;
bool m_autoFollowRate; bool m_autoFollowRate;