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

FreeDV: removed useless set callback functions. Use mutex appropriately

Browse Source
This commit is contained in:
f4exb
2020-12-09 01:15:38 +01:00
parent 214686beca
commit 04dbb028aa
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/channeltx/modfreedv/freedvmodsource.cpp
+4 -7
View File
@@ -32,7 +32,7 @@ FreeDVModSource::FreeDVModSource() :
m_lowCutoff(0.0),
m_hiCutoff(6000.0),
m_SSBFilter(nullptr),
m_SSBFilterBuffer(0),
m_SSBFilterBuffer(nullptr),
m_SSBFilterBufferIndex(0),
m_audioSampleRate(48000),
m_audioFifo(12000),
@@ -45,7 +45,7 @@ FreeDVModSource::FreeDVModSource() :
m_iSpeech(0),
m_iModem(0),
m_speechIn(nullptr),
m_modOut(0),
m_modOut(nullptr),
m_scaleFactor(SDR_TX_SCALEF),
m_mutex(QMutex::Recursive)
{
@@ -82,6 +82,7 @@ FreeDVModSource::~FreeDVModSource()
void FreeDVModSource::pull(SampleVector::iterator begin, unsigned int nbSamples)
{
QMutexLocker mlock(&m_mutex);
std::for_each(
begin,
begin + nbSamples,
@@ -427,6 +428,7 @@ void FreeDVModSource::applyFreeDVMode(FreeDVModSettings::FreeDVMode mode)
m_hiCutoff = FreeDVModSettings::getHiCutoff(mode);
m_lowCutoff = FreeDVModSettings::getLowCutoff(mode);
int modemSampleRate = FreeDVModSettings::getModSampleRate(mode);
QMutexLocker mlock(&m_mutex);
m_SSBFilter->create_filter(m_lowCutoff / modemSampleRate, m_hiCutoff / modemSampleRate);
@@ -493,10 +495,6 @@ void FreeDVModSource::applyFreeDVMode(FreeDVModSettings::FreeDVMode mode)
freedv_set_tx_bpf(m_freeDV, 1);
freedv_set_ext_vco(m_freeDV, 0);
freedv_set_callback_txt(m_freeDV, nullptr, nullptr, nullptr);
freedv_set_callback_protocol(m_freeDV, nullptr, nullptr, nullptr);
freedv_set_callback_data(m_freeDV, nullptr, nullptr, nullptr);
int nSpeechSamples = freedv_get_n_speech_samples(m_freeDV);
int nNomModemSamples = freedv_get_n_nom_modem_samples(m_freeDV);
int Fs = freedv_get_modem_sample_rate(m_freeDV);
@@ -557,7 +555,6 @@ void FreeDVModSource::applySettings(const FreeDVModSettings& settings, bool forc
void FreeDVModSource::handleAudio()
{
QMutexLocker mlock(&m_mutex);
unsigned int nbRead;
while ((nbRead = m_audioFifo.read(reinterpret_cast<quint8*>(&m_audioReadBuffer[m_audioReadBufferFill]), 4096)) != 0)