VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

SDRdaemon input: fixed reporting to the GUI. Device sample source: cleanup

This commit is contained in:
f4exb 2017-09-17 02:02:41 +02:00
parent 31ad75a405
commit 2af1f56fea
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp
View File

@ -258,7 +258,7 @@ void SDRdaemonSourceGui::handleInputMessages()
while ((message = m_inputMessageQueue.pop()) != 0)
{
qDebug("SDRdaemonGui::handleInputMessages: message: %s", message->getIdentifier());
//qDebug("SDRdaemonGui::handleInputMessages: message: %s", message->getIdentifier());
if (DSPSignalNotification::match(*message))
{

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

@ -52,7 +52,7 @@ SDRdaemonSourceInput::SDRdaemonSourceInput(DeviceSourceAPI *deviceAPI) :
m_autoCorrBuffer(false)
{
m_sampleFifo.setSize(96000 * 4);
m_SDRdaemonUDPHandler = new SDRdaemonSourceUDPHandler(&m_sampleFifo, getMessageQueueToGUI(), m_deviceAPI);
m_SDRdaemonUDPHandler = new SDRdaemonSourceUDPHandler(&m_sampleFifo, &m_inputMessageQueue, m_deviceAPI);
m_SDRdaemonUDPHandler->connectTimer(&m_masterTimer);
char recFileNameCStr[30];
@ -175,6 +175,26 @@ bool SDRdaemonSourceInput::handleMessage(const Message& message)
{
return true;
}
else if (MsgReportSDRdaemonSourceStreamData::match(message))
{
// Forward message to the GUI if it is present
if (getMessageQueueToGUI()) {
getMessageQueueToGUI()->push(const_cast<Message*>(&message));
return false; // deletion of message is handled by the GUI
} else {
return true; // delete the unused message
}
}
else if (MsgReportSDRdaemonSourceStreamTiming::match(message))
{
// Forward message to the GUI if it is present
if (getMessageQueueToGUI()) {
getMessageQueueToGUI()->push(const_cast<Message*>(&message));
return false; // deletion of message is handled by the GUI
} else {
return true; // delete the unused message
}
}
else
{
return false;
@ -183,6 +203,7 @@ bool SDRdaemonSourceInput::handleMessage(const Message& message)
void SDRdaemonSourceInput::setMessageQueueToGUI(MessageQueue *queue)
{
qDebug("SDRdaemonSourceInput::setMessageQueueToGUI: %p", queue);
DeviceSampleSource::setMessageQueueToGUI(queue);
m_SDRdaemonUDPHandler->setMessageQueueToGUI(queue);
}

8
plugins/samplesource/sdrdaemonsource/sdrdaemonsourceudphandler.cpp
View File

@ -180,9 +180,7 @@ void SDRdaemonSourceUDPHandler::processData()
m_tv_sec,
m_tv_usec);
if (m_outputMessageQueueToGUI) {
m_outputMessageQueueToGUI->push(report);
}
m_outputMessageQueueToGUI->push(report);
}
}
@ -262,8 +260,6 @@ void SDRdaemonSourceUDPHandler::tick()
nbOriginalBlocks,
nbFECblocks);
if (m_outputMessageQueueToGUI) {
m_outputMessageQueueToGUI->push(report);
}
m_outputMessageQueueToGUI->push(report);
}
}

2
sdrbase/dsp/devicesamplesource.h
View File

@ -44,7 +44,6 @@ public:
MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
void setMessageQueueToGUI(MessageQueue *queue) { m_guiMessageQueue = queue; }
MessageQueue *getMessageQueueToGUI() { return m_guiMessageQueue; }
//MessageQueue *getOutputMessageQueueToGUI() { return &m_outputMessageQueueToGUI; } // TODO: remove
SampleSinkFifo* getSampleFifo() { return &m_sampleFifo; }
protected slots:
@ -54,7 +53,6 @@ protected:
SampleSinkFifo m_sampleFifo;
MessageQueue m_inputMessageQueue; //!< Input queue to the source
MessageQueue *m_guiMessageQueue; //!< Input message queue to the GUI
MessageQueue m_outputMessageQueueToGUI; //!< Output queue specialized for the source GUI // TODO: remove
};
#endif // INCLUDE_SAMPLESOURCE_H