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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp
+1 -1
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))
{
plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp
+22 -1
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);
}
plugins/samplesource/sdrdaemonsource/sdrdaemonsourceudphandler.cpp
+2 -6
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);
}
}