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

FCDProPlus: moved open/close source to input so that open source failure is correctly reported as an error

Browse Source
This commit is contained in:
f4exb
2018-11-18 21:56:33 +01:00
parent f5357e9917
commit 865d26cc15
5 changed files with 129 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/fcdproplus/fcdproplusthread.cpp
+24 -85
View File
@@ -23,9 +23,9 @@
#include "dsp/samplesinkfifo.h"
#include "fcdtraits.h"
FCDProPlusThread::FCDProPlusThread(SampleSinkFifo* sampleFifo, QObject* parent) :
FCDProPlusThread::FCDProPlusThread(SampleSinkFifo* sampleFifo, snd_pcm_t *fcd_handle, QObject* parent) :
QThread(parent),
fcd_handle(NULL),
m_fcd_handle(fcd_handle),
m_running(false),
m_convertBuffer(fcd_traits<ProPlus>::convBufSize),
m_sampleFifo(sampleFifo)
@@ -59,89 +59,17 @@ void FCDProPlusThread::stopWork()
void FCDProPlusThread::run()
{
if ( !OpenSource(fcd_traits<ProPlus>::alsaDeviceName) )
{
qCritical() << "FCDThread::run: cannot open FCD sound card";
return;
}
// TODO: fallback to original fcd
m_running = true;
qDebug("FCDThread::run: start running loop");
while(m_running)
while (m_running)
{
if (work(fcd_traits<ProPlus>::convBufSize) < 0)
{
if (work(fcd_traits<ProPlus>::convBufSize) < 0) {
break;
}
}
CloseSource();
}
bool FCDProPlusThread::OpenSource(const char* cardname)
{
bool fail = false;
snd_pcm_hw_params_t* params;
//fcd_rate = FCDPP_RATE;
//fcd_channels =2;
//fcd_format = SND_PCM_SFMT_U16_LE;
snd_pcm_stream_t fcd_stream = SND_PCM_STREAM_CAPTURE;
if (fcd_handle)
{
return false;
}
if (snd_pcm_open(&fcd_handle, cardname, fcd_stream, 0) < 0)
{
qCritical("FCDThread::OpenSource: cannot open %s", cardname);
return false;
}
snd_pcm_hw_params_alloca(&params);
if (snd_pcm_hw_params_any(fcd_handle, params) < 0)
{
qCritical("FCDProPlusThread::OpenSource: snd_pcm_hw_params_any failed");
fail = true;
}
else if (snd_pcm_hw_params(fcd_handle, params) < 0)
{
qCritical("FCDProPlusThread::OpenSource: snd_pcm_hw_params failed");
fail = true;
// TODO: check actual samplerate, may be crippled firmware
}
else
{
if (snd_pcm_start(fcd_handle) < 0)
{
qCritical("FCDProPlusThread::OpenSource: snd_pcm_start failed");
fail = true;
}
}
if (fail)
{
snd_pcm_close( fcd_handle );
return false;
}
else
{
qDebug("FCDProPlusThread::OpenSource: Funcube stream started");
}
return true;
}
void FCDProPlusThread::CloseSource()
{
if (fcd_handle)
{
snd_pcm_close( fcd_handle );
}
fcd_handle = NULL;
qDebug("FCDThread::run: running loop stopped");
}
int FCDProPlusThread::work(int n_items)
@@ -152,14 +80,25 @@ int FCDProPlusThread::work(int n_items)
it = m_convertBuffer.begin();
out = (void *)&it[0];
l = snd_pcm_mmap_readi(fcd_handle, out, (snd_pcm_uframes_t)n_items);
l = snd_pcm_mmap_readi(m_fcd_handle, out, (snd_pcm_uframes_t)n_items);
if (l > 0)
m_sampleFifo->write(it, it + l);
if (l == -EPIPE) {
qDebug("FCDProPlusThread::work: Overrun detected");
return 0;
{
m_sampleFifo->write(it, it + l);
}
else
{
if (l == -EPIPE) {
qDebug("FCDProPlusThread::work: Overrun detected");
} else if (l < 0) {
qDebug("FCDProPlusThread::work: snd_pcm_mmap_readi failed with code %d", l);
} else {
qDebug("FCDProPlusThread::work: snd_pcm_mmap_readi empty");
}
return 0;
}
return l;
}