VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 13:47:01 -04:00
Code Issues Projects Releases Wiki Activity

FCDPro+: open/close new style

Browse Source
This commit is contained in:
f4exb
2017-04-14 03:29:50 +02:00
parent f456293b84
commit 1e086fb303
3 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/fcdproplus/fcdproplusinput.cpp
+37 -17
View File
@@ -38,33 +38,46 @@ FCDProPlusInput::FCDProPlusInput(DeviceSourceAPI *deviceAPI) :
m_dev(0),
m_settings(),
m_FCDThread(0),
m_deviceDescription(fcd_traits<ProPlus>::displayedName)
m_deviceDescription(fcd_traits<ProPlus>::displayedName),
m_running(false)
{
openDevice();
}
FCDProPlusInput::~FCDProPlusInput()
{
stop();
if (m_running) stop();
closeDevice();
}
bool FCDProPlusInput::openDevice()
{
int device = m_deviceAPI->getSampleSourceSequence();
qDebug() << "FCDProPlusInput::openDevice with device #" << device;
m_dev = fcdOpen(fcd_traits<ProPlus>::vendorId, fcd_traits<ProPlus>::productId, device);
if (m_dev == 0)
{
qCritical("FCDProPlusInput::start: could not open FCD");
return false;
}
return true;
}
bool FCDProPlusInput::start(int device)
{
qDebug() << "FCDProPlusInput::start with device #" << device;
QMutexLocker mutexLocker(&m_mutex);
// QMutexLocker mutexLocker(&m_mutex);
if (m_FCDThread)
{
return false;
}
if (!m_dev) {
return false;
}
m_dev = fcdOpen(fcd_traits<ProPlus>::vendorId, fcd_traits<ProPlus>::productId, device);
if (m_running) stop();
if (m_dev == 0)
{
qCritical("FCDProPlusInput::start: could not open FCD");
return false;
}
qDebug() << "FCDProPlusInput::start";
/* Apply settings before streaming to avoid bus contention;
* there is very little spare bandwidth on a full speed USB device.
@@ -87,13 +100,21 @@ bool FCDProPlusInput::start(int device)
m_FCDThread->startWork();
mutexLocker.unlock();
// mutexLocker.unlock();
applySettings(m_settings, true);
qDebug("FCDProPlusInput::started");
m_running = true;
return true;
}
void FCDProPlusInput::closeDevice()
{
fcdClose(m_dev);
m_dev = 0;
}
void FCDProPlusInput::stop()
{
QMutexLocker mutexLocker(&m_mutex);
@@ -106,8 +127,7 @@ void FCDProPlusInput::stop()
m_FCDThread = 0;
}
fcdClose(m_dev);
m_dev = 0;
m_running = false;
}
const QString& FCDProPlusInput::getDeviceDescription() const