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

BladeRF plugins: fixed deadlock due to useless mutex and disable modules on stop

Browse Source
This commit is contained in:
f4exb
2017-01-03 00:56:18 +01:00
parent 171ba7674e
commit f1ac22576c
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/bladerfinput/bladerfinput.cpp
+10 -4
View File
@@ -55,7 +55,7 @@ bool BladerfInput::init(const Message& cmd)
bool BladerfInput::start(int device)
{
QMutexLocker mutexLocker(&m_mutex);
// QMutexLocker mutexLocker(&m_mutex);
if (m_dev != 0)
{
@@ -151,7 +151,7 @@ bool BladerfInput::start(int device)
m_bladerfThread->startWork();
mutexLocker.unlock();
// mutexLocker.unlock();
applySettings(m_settings, true);
qDebug("BladerfInput::startInput: started");
@@ -165,7 +165,8 @@ failed:
void BladerfInput::stop()
{
QMutexLocker mutexLocker(&m_mutex);
// QMutexLocker mutexLocker(&m_mutex);
int res;
if(m_bladerfThread != 0)
{
@@ -174,6 +175,11 @@ void BladerfInput::stop()
m_bladerfThread = 0;
}
if ((res = bladerf_enable_module(m_dev, BLADERF_MODULE_RX, false)) < 0)
{
qCritical("BladerfInput::stop: bladerf_enable_module with return code %d", res);
}
if (m_deviceAPI->getSinkBuddies().size() > 0)
{
DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[0];
@@ -252,7 +258,7 @@ bool BladerfInput::handleMessage(const Message& message)
bool BladerfInput::applySettings(const BladeRFInputSettings& settings, bool force)
{
bool forwardChange = false;
QMutexLocker mutexLocker(&m_mutex);
// QMutexLocker mutexLocker(&m_mutex);
qDebug() << "BladerfInput::applySettings: m_dev: " << m_dev;