VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-28 04:54:13 -04:00
Code Issues Projects Releases Wiki Activity

UDP source: refactor constructor

Browse Source
This commit is contained in:
f4exb
2017-10-04 22:05:38 +02:00
parent 74d2619848
commit a1afc0ebe6
6 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/channelrx/udpsrc/udpsrc.cpp
+3 -4
View File
@@ -31,11 +31,13 @@ MESSAGE_CLASS_DEFINITION(UDPSrc::MsgUDPSrcConfigure, Message)
MESSAGE_CLASS_DEFINITION(UDPSrc::MsgUDPSrcConfigureImmediate, Message)
MESSAGE_CLASS_DEFINITION(UDPSrc::MsgUDPSrcSpectrum, Message)
UDPSrc::UDPSrc(MessageQueue* uiMessageQueue, UDPSrcGUI* udpSrcGUI, BasebandSampleSink* spectrum) :
UDPSrc::UDPSrc(DeviceSourceAPI *deviceAPI) :
m_deviceAPI(deviceAPI),
m_outMovingAverage(480, 1e-10),
m_inMovingAverage(480, 1e-10),
m_amMovingAverage(1200, 1e-10),
m_audioFifo(24000),
m_spectrum(0),
m_squelchOpen(false),
m_squelchOpenCount(0),
m_squelchCloseCount(0),
@@ -57,9 +59,6 @@ UDPSrc::UDPSrc(MessageQueue* uiMessageQueue, UDPSrcGUI* udpSrcGUI, BasebandSampl
m_nco.setFreq(0, m_config.m_inputSampleRate);
m_interpolator.create(16, m_config.m_inputSampleRate, m_config.m_rfBandwidth / 2.0);
m_sampleDistanceRemain = m_config.m_inputSampleRate / m_config.m_outputSampleRate;
m_uiMessageQueue = uiMessageQueue;
m_udpSrcGUI = udpSrcGUI;
m_spectrum = spectrum;
m_spectrumEnabled = false;
m_nextSSBId = 0;
m_nextS16leId = 0;
plugins/channelrx/udpsrc/udpsrc.h
+5 -4
View File
@@ -34,7 +34,7 @@
class QUdpSocket;
class UDPSrcGUI;
class DeviceSourceAPI;
class UDPSrc : public BasebandSampleSink {
Q_OBJECT
@@ -54,8 +54,9 @@ public:
FormatNone
};
UDPSrc(MessageQueue* uiMessageQueue, UDPSrcGUI* udpSrcGUI, BasebandSampleSink* spectrum);
UDPSrc(DeviceSourceAPI *deviceAPI);
virtual ~UDPSrc();
void setSpectrum(BasebandSampleSink* spectrum) { m_spectrum = spectrum; }
void configure(MessageQueue* messageQueue,
SampleFormat sampleFormat,
@@ -292,8 +293,8 @@ protected:
Config m_config;
Config m_running;
MessageQueue* m_uiMessageQueue;
UDPSrcGUI* m_udpSrcGUI;
DeviceSourceAPI *m_deviceAPI;
QUdpSocket *m_audioSocket;
double m_magsq;
plugins/channelrx/udpsrc/udpsrcgui.cpp
+2 -1
View File
@@ -271,7 +271,8 @@ UDPSrcGUI::UDPSrcGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget*
setAttribute(Qt::WA_DeleteOnClose, true);
m_spectrumVis = new SpectrumVis(ui->glSpectrum);
m_udpSrc = new UDPSrc(m_pluginAPI->getMainWindowMessageQueue(), this, m_spectrumVis);
m_udpSrc = new UDPSrc(m_deviceAPI);
m_udpSrc->setSpectrum(m_spectrumVis);
m_channelizer = new DownChannelizer(m_udpSrc);
m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this);
m_deviceAPI->addThreadedSink(m_threadedChannelizer);