VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-05 14:47:50 -04:00
Code Issues Projects Releases Wiki Activity

UDP Sink: removed useless and confusing references

Browse Source
This commit is contained in:
f4exb 2017-10-17 09:02:33 +02:00
parent 876001cf8c
commit 09f06b2561
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/channeltx/udpsink/udpsink.cpp
View File

@ -26,10 +26,8 @@ MESSAGE_CLASS_DEFINITION(UDPSink::MsgConfigureChannelizer, Message)
MESSAGE_CLASS_DEFINITION(UDPSink::MsgUDPSinkSpectrum, Message) MESSAGE_CLASS_DEFINITION(UDPSink::MsgUDPSinkSpectrum, Message)
MESSAGE_CLASS_DEFINITION(UDPSink::MsgResetReadIndex, Message) MESSAGE_CLASS_DEFINITION(UDPSink::MsgResetReadIndex, Message)
UDPSink::UDPSink(MessageQueue* uiMessageQueue, UDPSinkGUI* udpSinkGUI, BasebandSampleSink* spectrum) : UDPSink::UDPSink(BasebandSampleSink* spectrum) :
m_squelch(1e-6), m_squelch(1e-6),
m_uiMessageQueue(uiMessageQueue),
m_udpSinkGUI(udpSinkGUI),
m_spectrum(spectrum), m_spectrum(spectrum),
m_spectrumEnabled(false), m_spectrumEnabled(false),
m_spectrumChunkSize(2160), m_spectrumChunkSize(2160),
@ -441,16 +439,16 @@ bool UDPSink::handleMessage(const Message& cmd)
} }
} }
void UDPSink::setSpectrum(MessageQueue* messageQueue, bool enabled) void UDPSink::setSpectrum(bool enabled)
{ {
Message* cmd = MsgUDPSinkSpectrum::create(enabled); Message* cmd = MsgUDPSinkSpectrum::create(enabled);
messageQueue->push(cmd); getInputMessageQueue()->push(cmd);
} }
void UDPSink::resetReadIndex(MessageQueue* messageQueue) void UDPSink::resetReadIndex()
{ {
Message* cmd = MsgResetReadIndex::create(); Message* cmd = MsgResetReadIndex::create();
messageQueue->push(cmd); getInputMessageQueue()->push(cmd);
} }
void UDPSink::applySettings(const UDPSinkSettings& settings, bool force) void UDPSink::applySettings(const UDPSinkSettings& settings, bool force)

10
plugins/channeltx/udpsink/udpsink.h
View File

@ -30,8 +30,6 @@
#include "udpsinkudphandler.h" #include "udpsinkudphandler.h"
#include "udpsinksettings.h" #include "udpsinksettings.h"
class UDPSinkGUI;
class UDPSink : public BasebandSampleSource { class UDPSink : public BasebandSampleSource {
Q_OBJECT Q_OBJECT
@ -83,7 +81,7 @@ public:
{ } { }
}; };
UDPSink(MessageQueue* uiMessageQueue, UDPSinkGUI* udpSinkGUI, BasebandSampleSink* spectrum); UDPSink(BasebandSampleSink* spectrum);
virtual ~UDPSink(); virtual ~UDPSink();
virtual void start(); virtual void start();
@ -96,8 +94,8 @@ public:
int32_t getBufferGauge() const { return m_udpHandler.getBufferGauge(); } int32_t getBufferGauge() const { return m_udpHandler.getBufferGauge(); }
bool getSquelchOpen() const { return m_squelchOpen; } bool getSquelchOpen() const { return m_squelchOpen; }
void setSpectrum(MessageQueue* messageQueue, bool enabled); void setSpectrum(bool enabled);
void resetReadIndex(MessageQueue* messageQueue); void resetReadIndex();
signals: signals:
/** /**
@ -152,8 +150,6 @@ private:
NCO m_carrierNco; NCO m_carrierNco;
Complex m_modSample; Complex m_modSample;
MessageQueue* m_uiMessageQueue;
UDPSinkGUI* m_udpSinkGUI;
BasebandSampleSink* m_spectrum; BasebandSampleSink* m_spectrum;
bool m_spectrumEnabled; bool m_spectrumEnabled;
SampleVector m_sampleBuffer; SampleVector m_sampleBuffer;

6
plugins/channeltx/udpsink/udpsinkgui.cpp
View File

@ -122,7 +122,7 @@ UDPSinkGUI::UDPSinkGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget*
setAttribute(Qt::WA_DeleteOnClose, true); setAttribute(Qt::WA_DeleteOnClose, true);
m_spectrumVis = new SpectrumVis(ui->glSpectrum); m_spectrumVis = new SpectrumVis(ui->glSpectrum);
m_udpSink = new UDPSink(m_pluginAPI->getMainWindowMessageQueue(), this, m_spectrumVis); m_udpSink = new UDPSink(m_spectrumVis);
m_udpSink->setMessageQueueToGUI(getInputMessageQueue()); m_udpSink->setMessageQueueToGUI(getInputMessageQueue());
m_channelizer = new UpChannelizer(m_udpSink); m_channelizer = new UpChannelizer(m_udpSink);
m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this); m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this);
@ -402,7 +402,7 @@ void UDPSinkGUI::on_applyBtn_clicked()
void UDPSinkGUI::on_resetUDPReadIndex_clicked() void UDPSinkGUI::on_resetUDPReadIndex_clicked()
{ {
m_udpSink->resetReadIndex(m_udpSink->getInputMessageQueue()); m_udpSink->resetReadIndex();
} }
void UDPSinkGUI::on_autoRWBalance_toggled(bool checked) void UDPSinkGUI::on_autoRWBalance_toggled(bool checked)
@ -421,7 +421,7 @@ void UDPSinkGUI::onWidgetRolled(QWidget* widget, bool rollDown)
{ {
if ((widget == ui->spectrumBox) && (m_udpSink != 0)) if ((widget == ui->spectrumBox) && (m_udpSink != 0))
{ {
m_udpSink->setSpectrum(m_udpSink->getInputMessageQueue(), rollDown); m_udpSink->setSpectrum(rollDown);
} }
} }