From db962438755f9d38c9cf23bbe50e65cd69a42645 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 31 Aug 2016 14:11:11 +0200 Subject: [PATCH] DSD demod plugin: prepare dual TDMA slot audio handling (mbelib part) --- plugins/channel/demoddsd/dsddecoder.h | 4 ++-- plugins/channel/demoddsd/dsddemod.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/channel/demoddsd/dsddecoder.h b/plugins/channel/demoddsd/dsddecoder.h index 4fc48b35f..79077915d 100644 --- a/plugins/channel/demoddsd/dsddecoder.h +++ b/plugins/channel/demoddsd/dsddecoder.h @@ -31,8 +31,8 @@ public: void pushSample(short sample) { m_decoder.run(sample); } short getFilteredSample() const { return m_decoder.getFilteredSample(); } short getSymbolSyncSample() const { return m_decoder.getSymbolSyncSample(); } - short *getAudio(int& nbSamples) { return m_decoder.getAudio(nbSamples); } - void resetAudio() { m_decoder.resetAudio(); } + short *getAudio1(int& nbSamples) { return m_decoder.getAudio1(nbSamples); } + void resetAudio1() { m_decoder.resetAudio1(); } void enableMbelib(bool enable) { m_decoder.enableMbelib(enable); } bool mbeDVReady() const { return m_decoder.mbeDVReady(); } diff --git a/plugins/channel/demoddsd/dsddemod.cpp b/plugins/channel/demoddsd/dsddemod.cpp index fcabc95df..ba613f74b 100644 --- a/plugins/channel/demoddsd/dsddemod.cpp +++ b/plugins/channel/demoddsd/dsddemod.cpp @@ -207,7 +207,7 @@ void DSDDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto if (!DSPEngine::instance()->hasDVSerialSupport()) { int nbAudioSamples; - short *dsdAudio = m_dsdDecoder.getAudio(nbAudioSamples); + short *dsdAudio = m_dsdDecoder.getAudio1(nbAudioSamples); if (nbAudioSamples > 0) { @@ -215,7 +215,7 @@ void DSDDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto uint res = m_audioFifo.write((const quint8*) dsdAudio, nbAudioSamples, 10); } - m_dsdDecoder.resetAudio(); + m_dsdDecoder.resetAudio1(); } }