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

Deep redesign: debug phase #3: Fixed exit sequence

This commit is contained in:
f4exb 2015-08-18 03:14:26 +02:00
parent d6ae378e52
commit 2db6c3a4c7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sdrbase/dsp/dspengine.cpp
View File

@ -475,7 +475,7 @@ DSPEngine::State DSPEngine::gotoError(const QString& errorMessage)
void DSPEngine::handleSetSource(SampleSource* source) void DSPEngine::handleSetSource(SampleSource* source)
{ {
qDebug() << "DSPEngine::handleSetSource: " << source->getDeviceDescription().toStdString().c_str(); qDebug() << "DSPEngine::handleSetSource";
gotoIdle(); gotoIdle();
@ -489,10 +489,14 @@ void DSPEngine::handleSetSource(SampleSource* source)
if(m_sampleSource != 0) if(m_sampleSource != 0)
{ {
qDebug() << " - connect"; qDebug() << " - set " << source->getDeviceDescription().toStdString().c_str();
connect(m_sampleSource->getSampleFifo(), SIGNAL(dataReady()), this, SLOT(handleData()), Qt::QueuedConnection); connect(m_sampleSource->getSampleFifo(), SIGNAL(dataReady()), this, SLOT(handleData()), Qt::QueuedConnection);
connect(m_sampleSource->getOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages())); connect(m_sampleSource->getOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages()));
} }
else
{
qDebug() << " - set none";
}
} }
void DSPEngine::handleData() void DSPEngine::handleData()
@ -505,8 +509,8 @@ void DSPEngine::handleData()
void DSPEngine::handleSynchronousMessages() void DSPEngine::handleSynchronousMessages()
{ {
qDebug() << "DSPEngine::handleSynchronousMessages";
Message *message = m_syncMessenger.getMessage(); Message *message = m_syncMessenger.getMessage();
qDebug() << "DSPEngine::handleSynchronousMessages: " << message->getIdentifier();
if (DSPExit::match(*message)) if (DSPExit::match(*message))
{ {
@ -580,11 +584,7 @@ void DSPEngine::handleSynchronousMessages()
if (threadedSinkIt != m_threadedSampleSinks.end()) if (threadedSinkIt != m_threadedSampleSinks.end())
{ {
if (m_state == StRunning) (*threadedSinkIt)->stop();
{
(*threadedSinkIt)->stop();
}
m_threadedSampleSinks.remove(*threadedSinkIt); m_threadedSampleSinks.remove(*threadedSinkIt);
delete (*threadedSinkIt); delete (*threadedSinkIt);
} }