VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-25 09:18:54 -05:00
Code Issues Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
srcejon 2024-10-15 08:56:54 +01:00
parent 4ac29d2052
commit 240c3d502e
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
plugins/samplesource/rtlsdr/rtlsdrthread.cpp
View File

@ -46,17 +46,18 @@ RTLSDRThread::~RTLSDRThread()
{ {
qDebug() << "RTLSDRThread::~RTLSDRThread"; qDebug() << "RTLSDRThread::~RTLSDRThread";
if (m_running) { if (m_running) {
stopWork(); stopWork();
} }
} }
void RTLSDRThread::startWork() void RTLSDRThread::startWork()
{ {
connect(&m_inputMessageQueue, &MessageQueue::messageEnqueued, this, &RTLSDRThread::handleInputMessages); connect(&m_inputMessageQueue, &MessageQueue::messageEnqueued, this, &RTLSDRThread::handleInputMessages);
m_startWaitMutex.lock(); m_startWaitMutex.lock();
start(); start();
while(!m_running) while (!m_running) {
m_startWaiter.wait(&m_startWaitMutex, 100); m_startWaiter.wait(&m_startWaitMutex, 100);
}
m_startWaitMutex.unlock(); m_startWaitMutex.unlock();
} }
@ -65,9 +66,9 @@ void RTLSDRThread::stopWork()
if (m_running) if (m_running)
{ {
disconnect(&m_inputMessageQueue, &MessageQueue::messageEnqueued, this, &RTLSDRThread::handleInputMessages); disconnect(&m_inputMessageQueue, &MessageQueue::messageEnqueued, this, &RTLSDRThread::handleInputMessages);
m_running = false; // Cause run() to finish m_running = false; // Cause run() to finish
#ifndef __EMSCRIPTEN__ #ifndef __EMSCRIPTEN__
wait(); wait();
#endif #endif
} }
} }
@ -79,25 +80,25 @@ void RTLSDRThread::run()
m_running = true; m_running = true;
m_startWaiter.wakeAll(); m_startWaiter.wakeAll();
while (m_running) while (m_running)
{ {
#ifndef __EMSCRIPTEN__ #ifndef __EMSCRIPTEN__
if ((res = rtlsdr_read_async(m_dev, &RTLSDRThread::callbackHelper, this, 32, FCD_BLOCKSIZE)) < 0) if ((res = rtlsdr_read_async(m_dev, &RTLSDRThread::callbackHelper, this, 32, FCD_BLOCKSIZE)) < 0)
{ {
if (m_running) { if (m_running) {
qCritical("RTLSDRThread: async read error: %s", strerror(errno)); qCritical("RTLSDRThread: async read error: %s", strerror(errno));
} }
break; break;
} }
#else #else
int len = 0; int len = 0;
unsigned char buf[FCD_BLOCKSIZE]; unsigned char buf[FCD_BLOCKSIZE];
if ((res = rtlsdr_read_sync(m_dev, buf, sizeof(buf), &len)) < 0) if ((res = rtlsdr_read_sync(m_dev, buf, sizeof(buf), &len)) < 0)
{ {
qCritical("RTLSDRThread: read error: %s", strerror(errno)); qCritical("RTLSDRThread: read error: %s", strerror(errno));
break; break;
} }
else else
{ {
if (m_settings.m_iqOrder) { if (m_settings.m_iqOrder) {
@ -109,7 +110,7 @@ void RTLSDRThread::run()
#endif #endif
} }
m_running = false; m_running = false;
} }
// Decimate according to specified log2 (ex: log2=4 => decim=16) // Decimate according to specified log2 (ex: log2=4 => decim=16)