From c8a6bb71bae4204d1520e4f6b80617ac01540635 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 27 Mar 2018 00:57:41 +0200 Subject: [PATCH] AM demod: remove UDP copy using RTP --- plugins/channelrx/demodam/amdemod.cpp | 25 ------------------- plugins/channelrx/demodam/amdemodgui.cpp | 14 ----------- plugins/channelrx/demodam/amdemodgui.h | 1 - plugins/channelrx/demodam/amdemodgui.ui | 10 -------- plugins/channelrx/demodam/amdemodsettings.cpp | 3 --- plugins/channelrx/demodam/amdemodsettings.h | 1 - 6 files changed, 54 deletions(-) diff --git a/plugins/channelrx/demodam/amdemod.cpp b/plugins/channelrx/demodam/amdemod.cpp index 33dd1e750..3b57e7bdd 100644 --- a/plugins/channelrx/demodam/amdemod.cpp +++ b/plugins/channelrx/demodam/amdemod.cpp @@ -277,7 +277,6 @@ void AMDemod::applySettings(const AMDemodSettings& settings, bool force) << " m_audioMute: " << settings.m_audioMute << " m_bandpassEnable: " << settings.m_bandpassEnable << " m_copyAudioToUDP: " << settings.m_copyAudioToUDP - << " m_copyAudioUseRTP: " << settings.m_copyAudioUseRTP << " m_udpAddress: " << settings.m_udpAddress << " m_udpPort: " << settings.m_udpPort << " m_audioDeviceName: " << settings.m_audioDeviceName @@ -305,26 +304,6 @@ void AMDemod::applySettings(const AMDemodSettings& settings, bool force) m_audioNetSink->setDestination(settings.m_udpAddress, settings.m_udpPort); } - if ((settings.m_copyAudioUseRTP != m_settings.m_copyAudioUseRTP) || force) - { - if (settings.m_copyAudioUseRTP) - { - if (m_audioNetSink->selectType(AudioNetSink::SinkRTP)) { - qDebug("AMDemod::applySettings: set audio sink to RTP mode"); - } else { - qWarning("AMDemod::applySettings: RTP support for audio sink not available. Fall back too UDP"); - } - } - else - { - if (m_audioNetSink->selectType(AudioNetSink::SinkUDP)) { - qDebug("AMDemod::applySettings: set audio sink to UDP mode"); - } else { - qWarning("AMDemod::applySettings: failed to set audio sink to UDP mode"); - } - } - } - if ((settings.m_audioDeviceName != m_settings.m_audioDeviceName) || force) { AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager(); @@ -388,9 +367,6 @@ int AMDemod::webapiSettingsPutPatch( if (channelSettingsKeys.contains("copyAudioToUDP")) { settings.m_copyAudioToUDP = response.getAmDemodSettings()->getCopyAudioToUdp() != 0; } - if (channelSettingsKeys.contains("copyAudioUseRTP")) { - settings.m_copyAudioUseRTP = response.getAmDemodSettings()->getCopyAudioUseRtp() != 0; - } if (channelSettingsKeys.contains("inputFrequencyOffset")) { settings.m_inputFrequencyOffset = response.getAmDemodSettings()->getInputFrequencyOffset(); @@ -457,7 +433,6 @@ void AMDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& respo { response.getAmDemodSettings()->setAudioMute(settings.m_audioMute ? 1 : 0); response.getAmDemodSettings()->setCopyAudioToUdp(settings.m_copyAudioToUDP ? 1 : 0); - response.getAmDemodSettings()->setCopyAudioUseRtp(settings.m_copyAudioUseRTP ? 1 : 0); response.getAmDemodSettings()->setInputFrequencyOffset(settings.m_inputFrequencyOffset); response.getAmDemodSettings()->setRfBandwidth(settings.m_rfBandwidth); response.getAmDemodSettings()->setRgbColor(settings.m_rgbColor); diff --git a/plugins/channelrx/demodam/amdemodgui.cpp b/plugins/channelrx/demodam/amdemodgui.cpp index 9fed72589..4eb83e4a8 100644 --- a/plugins/channelrx/demodam/amdemodgui.cpp +++ b/plugins/channelrx/demodam/amdemodgui.cpp @@ -179,12 +179,6 @@ void AMDemodGUI::on_copyAudioToUDP_toggled(bool checked) applySettings(); } -void AMDemodGUI::on_useRTP_toggled(bool checked) -{ - m_settings.m_copyAudioUseRTP = checked; - applySettings(); -} - void AMDemodGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool rollDown __attribute__((unused))) { /* @@ -257,10 +251,6 @@ AMDemodGUI::AMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandS m_deviceUISet->addChannelMarker(&m_channelMarker); m_deviceUISet->addRollupWidget(this); - if (!m_amDemod->isAudioNetSinkRTPCapable()) { - ui->useRTP->hide(); - } - connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); @@ -326,10 +316,6 @@ void AMDemodGUI::displaySettings() ui->bandpassEnable->setChecked(m_settings.m_bandpassEnable); ui->copyAudioToUDP->setChecked(m_settings.m_copyAudioToUDP); - if (m_amDemod->isAudioNetSinkRTPCapable()) { - ui->useRTP->setChecked(m_settings.m_copyAudioUseRTP); - } - blockApplySettings(false); } diff --git a/plugins/channelrx/demodam/amdemodgui.h b/plugins/channelrx/demodam/amdemodgui.h index 2fb6974fb..7172fc18a 100644 --- a/plugins/channelrx/demodam/amdemodgui.h +++ b/plugins/channelrx/demodam/amdemodgui.h @@ -72,7 +72,6 @@ private slots: void on_squelch_valueChanged(int value); void on_audioMute_toggled(bool checked); void on_copyAudioToUDP_toggled(bool copy); - void on_useRTP_toggled(bool checked); void onWidgetRolled(QWidget* widget, bool rollDown); void onMenuDialogCalled(const QPoint& p); void handleInputMessages(); diff --git a/plugins/channelrx/demodam/amdemodgui.ui b/plugins/channelrx/demodam/amdemodgui.ui index ee4538366..a1b34df53 100644 --- a/plugins/channelrx/demodam/amdemodgui.ui +++ b/plugins/channelrx/demodam/amdemodgui.ui @@ -190,16 +190,6 @@ - - - - Use RTP protocol for audio copy to UDP - - - R - - - diff --git a/plugins/channelrx/demodam/amdemodsettings.cpp b/plugins/channelrx/demodam/amdemodsettings.cpp index 5d50a9c80..1bfc3d3e6 100644 --- a/plugins/channelrx/demodam/amdemodsettings.cpp +++ b/plugins/channelrx/demodam/amdemodsettings.cpp @@ -36,7 +36,6 @@ void AMDemodSettings::resetToDefaults() m_audioMute = false; m_bandpassEnable = false; m_copyAudioToUDP = false; - m_copyAudioUseRTP = false; m_udpAddress = "127.0.0.1"; m_udpPort = 9999; m_rgbColor = QColor(255, 255, 0).rgb(); @@ -59,7 +58,6 @@ QByteArray AMDemodSettings::serialize() const s.writeU32(7, m_rgbColor); s.writeBool(8, m_bandpassEnable); s.writeString(9, m_title); - s.writeBool(10, m_copyAudioUseRTP); s.writeString(11, m_audioDeviceName); return s.final(); } @@ -96,7 +94,6 @@ bool AMDemodSettings::deserialize(const QByteArray& data) d.readU32(7, &m_rgbColor); d.readBool(8, &m_bandpassEnable, false); d.readString(9, &m_title, "AM Demodulator"); - d.readBool(10, &m_copyAudioUseRTP, false); d.readString(11, &m_audioDeviceName, AudioDeviceManager::m_defaultDeviceName); return true; diff --git a/plugins/channelrx/demodam/amdemodsettings.h b/plugins/channelrx/demodam/amdemodsettings.h index f676e25a5..5222808db 100644 --- a/plugins/channelrx/demodam/amdemodsettings.h +++ b/plugins/channelrx/demodam/amdemodsettings.h @@ -30,7 +30,6 @@ struct AMDemodSettings bool m_audioMute; bool m_bandpassEnable; bool m_copyAudioToUDP; - bool m_copyAudioUseRTP; QString m_udpAddress; quint16 m_udpPort; quint32 m_rgbColor;