diff --git a/sdrbase/audio/audionetsink.cpp b/sdrbase/audio/audionetsink.cpp index c8775662c..8960ff80e 100644 --- a/sdrbase/audio/audionetsink.cpp +++ b/sdrbase/audio/audionetsink.cpp @@ -24,15 +24,9 @@ const int AudioNetSink::m_udpBlockSize = 512; AudioNetSink::AudioNetSink(QObject *parent, bool stereo) : m_type(SinkUDP), m_udpBufferAudioMono(0), - m_udpBufferAudioStereo(0), m_rtpBufferAudio(0) { - if (stereo) { - m_udpBufferAudioStereo = new UDPSink(parent, m_udpBlockSize); - } else { - m_udpBufferAudioMono = new UDPSink(parent, m_udpBlockSize); - } - + m_udpBufferAudioMono = new UDPSink(parent, m_udpBlockSize); m_rtpBufferAudio = new RTPSink("127.0.0.1", 9999, stereo ? RTPSink::PayloadL16Stereo : RTPSink::PayloadL16Mono); } @@ -41,10 +35,6 @@ AudioNetSink::~AudioNetSink() if (m_udpBufferAudioMono) { delete m_udpBufferAudioMono; } - - if (m_udpBufferAudioStereo) { - delete m_udpBufferAudioStereo; - } if (m_rtpBufferAudio) { delete m_rtpBufferAudio; } @@ -78,9 +68,6 @@ void AudioNetSink::setDestination(const QString& address, uint16_t port) if (m_udpBufferAudioMono) { m_udpBufferAudioMono->setDestination(address, port); } - if (m_udpBufferAudioStereo) { - m_udpBufferAudioStereo->setDestination(address, port); - } if (m_rtpBufferAudio) { m_rtpBufferAudio->setDestination(address, port); } @@ -102,10 +89,6 @@ void AudioNetSink::deleteDestination(const QString& address, uint16_t port) void AudioNetSink::write(qint16 sample) { - if (m_udpBufferAudioMono == 0) { - return; - } - if (m_type == SinkUDP) { m_udpBufferAudioMono->write(sample); } else if (m_type == SinkRTP) { @@ -113,29 +96,12 @@ void AudioNetSink::write(qint16 sample) } } -void AudioNetSink::write(const AudioSample& sample) -{ - if (m_udpBufferAudioStereo == 0) { - return; - } - - if (m_type == SinkUDP) { - m_udpBufferAudioStereo->write(sample); - } else if (m_type == SinkRTP) { - m_rtpBufferAudio->write((uint8_t *) &sample); - } -} - void AudioNetSink::moveToThread(QThread *thread) { if (m_udpBufferAudioMono) { m_udpBufferAudioMono->moveToThread(thread); } - if (m_udpBufferAudioStereo) { - m_udpBufferAudioMono->moveToThread(thread); - } - if (m_rtpBufferAudio) { m_rtpBufferAudio->moveToThread(thread); } diff --git a/sdrbase/audio/audionetsink.h b/sdrbase/audio/audionetsink.h index 33456a50e..bd2c1f4f7 100644 --- a/sdrbase/audio/audionetsink.h +++ b/sdrbase/audio/audionetsink.h @@ -44,7 +44,6 @@ public: void deleteDestination(const QString& address, uint16_t port); void write(qint16 sample); - void write(const AudioSample& sample); bool isRTPCapable() const; bool selectType(SinkType type); @@ -56,7 +55,6 @@ public: protected: SinkType m_type; UDPSink *m_udpBufferAudioMono; - UDPSink *m_udpBufferAudioStereo; RTPSink *m_rtpBufferAudio; };