VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-05 14:47:50 -04:00
Code Issues Projects Releases Wiki Activity

SDRPlayV3: prevent segfault when SDRPlay library fails to initialize

Browse Source
This commit is contained in:
f4exb 2022-02-06 12:08:04 +01:00
parent 50d61c7247
commit 7880a523a7
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/samplesource/sdrplayv3/sdrplayv3input.cpp
View File

@ -146,7 +146,7 @@ bool SDRPlayV3Input::start()
m_sdrPlayThread->setFcPos((int) m_settings.m_fcPos); m_sdrPlayThread->setFcPos((int) m_settings.m_fcPos);
m_sdrPlayThread->startWork(); m_sdrPlayThread->startWork();
m_running = true; m_running = m_sdrPlayThread->isRunning();
applySettings(m_settings, true, true); applySettings(m_settings, true, true);
return true; return true;

34
plugins/samplesource/sdrplayv3/sdrplayv3thread.cpp
View File

@ -44,10 +44,27 @@ SDRPlayV3Thread::~SDRPlayV3Thread()
void SDRPlayV3Thread::startWork() void SDRPlayV3Thread::startWork()
{ {
sdrplay_api_ErrT err;
sdrplay_api_CallbackFnsT cbFns;
cbFns.StreamACbFn = &SDRPlayV3Thread::callbackHelper;
cbFns.StreamBCbFn = &SDRPlayV3Thread::callbackHelper;
cbFns.EventCbFn = &SDRPlayV3Thread::eventCallback;
if ((err = sdrplay_api_Init(m_dev->dev, &cbFns, this)) != sdrplay_api_Success)
{
qCritical() << "SDRPlayV3Thread::run: sdrplay_api_Init error: " << sdrplay_api_GetErrorString(err);
m_running = false;
return;
}
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();
} }
@ -58,9 +75,12 @@ void SDRPlayV3Thread::stopWork()
if (m_running) if (m_running)
{ {
m_running = false; m_running = false;
if ((err = sdrplay_api_Uninit(m_dev->dev)) != sdrplay_api_Success)
if ((err = sdrplay_api_Uninit(m_dev->dev)) != sdrplay_api_Success) {
qWarning() << "SDRPlayV3Thread::callbackHelper: sdrplay_api_Uninit error: " << sdrplay_api_GetErrorString(err); qWarning() << "SDRPlayV3Thread::callbackHelper: sdrplay_api_Uninit error: " << sdrplay_api_GetErrorString(err);
}
} }
wait(); wait();
} }
@ -94,16 +114,6 @@ bool SDRPlayV3Thread::waitForRfChanged()
// Don't really need a thread here - just using same structure as other plugins // Don't really need a thread here - just using same structure as other plugins
void SDRPlayV3Thread::run() void SDRPlayV3Thread::run()
{ {
sdrplay_api_ErrT err;
sdrplay_api_CallbackFnsT cbFns;
cbFns.StreamACbFn = &SDRPlayV3Thread::callbackHelper;
cbFns.StreamBCbFn = &SDRPlayV3Thread::callbackHelper;
cbFns.EventCbFn = &SDRPlayV3Thread::eventCallback;
if ((err = sdrplay_api_Init(m_dev->dev, &cbFns, this)) != sdrplay_api_Success)
qCritical() << "SDRPlayV3Thread::run: sdrplay_api_Init error: " << sdrplay_api_GetErrorString(err);
m_running = true; m_running = true;
m_startWaiter.wakeAll(); m_startWaiter.wakeAll();
} }

1
plugins/samplesource/sdrplayv3/sdrplayv3thread.h
View File

@ -37,6 +37,7 @@ public:
void startWork(); void startWork();
void stopWork(); void stopWork();
bool isRunning() const { return m_running; }
void setSamplerate(int samplerate); void setSamplerate(int samplerate);
void setLog2Decimation(unsigned int log2_decim); void setLog2Decimation(unsigned int log2_decim);
void setFcPos(int fcPos); void setFcPos(int fcPos);