mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-09-29 16:26:47 -04:00
Make the DSP source engine forward messages to own source input GUI message queue. Example of handling with SDRplay
This commit is contained in:
parent
c83b6e61d5
commit
dc45452a76
@ -69,8 +69,9 @@ SDRPlayGui::SDRPlayGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
|
|||||||
|
|
||||||
displaySettings();
|
displaySettings();
|
||||||
|
|
||||||
connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages()));
|
// connect(m_sampleSource->getOutputMessageQueueToGUI(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages()));
|
||||||
connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
|
// connect(m_deviceAPI->getDeviceEngineOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection);
|
||||||
|
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()));
|
||||||
}
|
}
|
||||||
|
|
||||||
SDRPlayGui::~SDRPlayGui()
|
SDRPlayGui::~SDRPlayGui()
|
||||||
@ -167,40 +168,32 @@ bool SDRPlayGui::handleMessage(const Message& message)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void SDRPlayGui::handleDSPMessages()
|
void SDRPlayGui::handleInputMessages()
|
||||||
{
|
{
|
||||||
Message* message;
|
Message* message;
|
||||||
|
|
||||||
while ((message = m_deviceAPI->getDeviceEngineOutputMessageQueue()->pop()) != 0)
|
while ((message = m_inputMessageQueue.pop()) != 0)
|
||||||
{
|
{
|
||||||
qDebug("SDRPlayGui::handleDSPMessages: message: %s", message->getIdentifier());
|
qDebug("SDRPlayGui::handleInputMessages: message: %s", message->getIdentifier());
|
||||||
|
|
||||||
if (DSPSignalNotification::match(*message))
|
if (DSPSignalNotification::match(*message))
|
||||||
{
|
{
|
||||||
DSPSignalNotification* notif = (DSPSignalNotification*) message;
|
DSPSignalNotification* notif = (DSPSignalNotification*) message;
|
||||||
m_sampleRate = notif->getSampleRate();
|
m_sampleRate = notif->getSampleRate();
|
||||||
m_deviceCenterFrequency = notif->getCenterFrequency();
|
m_deviceCenterFrequency = notif->getCenterFrequency();
|
||||||
qDebug("SDRPlayGui::handleDSPMessages: SampleRate:%d, CenterFrequency:%llu", notif->getSampleRate(), notif->getCenterFrequency());
|
qDebug("SDRPlayGui::handleInputMessages: DSPSignalNotification: SampleRate:%d, CenterFrequency:%llu", notif->getSampleRate(), notif->getCenterFrequency());
|
||||||
updateSampleRateAndFrequency();
|
updateSampleRateAndFrequency();
|
||||||
|
|
||||||
delete message;
|
delete message;
|
||||||
}
|
}
|
||||||
}
|
else
|
||||||
}
|
|
||||||
|
|
||||||
void SDRPlayGui::handleSourceMessages()
|
|
||||||
{
|
|
||||||
Message* message;
|
|
||||||
|
|
||||||
while ((message = m_sampleSource->getOutputMessageQueueToGUI()->pop()) != 0)
|
|
||||||
{
|
{
|
||||||
qDebug("SDRPlayGui::HandleSourceMessages: message: %s", message->getIdentifier());
|
|
||||||
|
|
||||||
if (handleMessage(*message))
|
if (handleMessage(*message))
|
||||||
{
|
{
|
||||||
delete message;
|
delete message;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void SDRPlayGui::updateSampleRateAndFrequency()
|
void SDRPlayGui::updateSampleRateAndFrequency()
|
||||||
|
@ -73,8 +73,7 @@ private:
|
|||||||
private slots:
|
private slots:
|
||||||
void updateHardware();
|
void updateHardware();
|
||||||
void updateStatus();
|
void updateStatus();
|
||||||
void handleSourceMessages();
|
void handleInputMessages();
|
||||||
void handleDSPMessages();
|
|
||||||
void on_centerFrequency_changed(quint64 value);
|
void on_centerFrequency_changed(quint64 value);
|
||||||
void on_ppm_valueChanged(int value);
|
void on_ppm_valueChanged(int value);
|
||||||
void on_dcOffset_toggled(bool checked);
|
void on_dcOffset_toggled(bool checked);
|
||||||
|
@ -629,7 +629,7 @@ void DSPDeviceSourceEngine::handleInputMessages()
|
|||||||
|
|
||||||
qDebug() << "DSPDeviceSourceEngine::handleInputMessages: DSPSignalNotification(" << m_sampleRate << "," << m_centerFrequency << ")";
|
qDebug() << "DSPDeviceSourceEngine::handleInputMessages: DSPSignalNotification(" << m_sampleRate << "," << m_centerFrequency << ")";
|
||||||
|
|
||||||
// forward source changes to sinks with immediate execution
|
// forward source changes to channel sinks with immediate execution (no queuing)
|
||||||
|
|
||||||
for(BasebandSampleSinks::const_iterator it = m_basebandSampleSinks.begin(); it != m_basebandSampleSinks.end(); it++)
|
for(BasebandSampleSinks::const_iterator it = m_basebandSampleSinks.begin(); it != m_basebandSampleSinks.end(); it++)
|
||||||
{
|
{
|
||||||
@ -643,10 +643,16 @@ void DSPDeviceSourceEngine::handleInputMessages()
|
|||||||
(*it)->handleSinkMessage(*message);
|
(*it)->handleSinkMessage(*message);
|
||||||
}
|
}
|
||||||
|
|
||||||
// forward changes to listeners on DSP output queue
|
// forward changes to source GUI input queue
|
||||||
|
|
||||||
DSPSignalNotification* rep = new DSPSignalNotification(*notif); // make a copy for the output queue
|
MessageQueue *guiMessageQueue = m_deviceSampleSource->getMessageQueueToGUI();
|
||||||
m_outputMessageQueue.push(rep);
|
|
||||||
|
if (guiMessageQueue) {
|
||||||
|
DSPSignalNotification* rep = new DSPSignalNotification(*notif); // make a copy for the source GUI
|
||||||
|
m_deviceSampleSource->getMessageQueueToGUI()->push(rep);
|
||||||
|
}
|
||||||
|
|
||||||
|
//m_outputMessageQueue.push(rep);
|
||||||
|
|
||||||
delete message;
|
delete message;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user