From d67c3adeb45dadd142d418701282473329c96968 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 27 Mar 2018 09:20:23 +0200 Subject: [PATCH] Plugins: RTP cleanup --- plugins/channelrx/demodam/amdemod.cpp | 5 --- plugins/channelrx/demodam/amdemod.h | 2 -- plugins/channelrx/demodnfm/nfmdemod.cpp | 30 ----------------- plugins/channelrx/demodnfm/nfmdemod.h | 2 -- plugins/channelrx/demodnfm/nfmdemodgui.cpp | 14 -------- plugins/channelrx/demodnfm/nfmdemodgui.h | 1 - plugins/channelrx/demodnfm/nfmdemodgui.ui | 21 +----------- .../channelrx/demodnfm/nfmdemodsettings.cpp | 3 -- plugins/channelrx/demodnfm/nfmdemodsettings.h | 1 - plugins/channelrx/demodssb/ssbdemod.cpp | 26 --------------- plugins/channelrx/demodssb/ssbdemod.h | 2 -- plugins/channelrx/demodssb/ssbdemodgui.cpp | 13 -------- plugins/channelrx/demodssb/ssbdemodgui.h | 1 - plugins/channelrx/demodssb/ssbdemodgui.ui | 32 ++----------------- .../channelrx/demodssb/ssbdemodsettings.cpp | 3 -- plugins/channelrx/demodssb/ssbdemodsettings.h | 1 - plugins/channelrx/demodwfm/wfmdemod.cpp | 25 --------------- plugins/channelrx/demodwfm/wfmdemod.h | 2 -- plugins/channelrx/demodwfm/wfmdemodgui.cpp | 14 -------- plugins/channelrx/demodwfm/wfmdemodgui.h | 1 - plugins/channelrx/demodwfm/wfmdemodgui.ui | 21 +----------- .../channelrx/demodwfm/wfmdemodsettings.cpp | 1 - plugins/channelrx/demodwfm/wfmdemodsettings.h | 1 - .../api/swagger/include/NFMDemod.yaml | 2 -- 24 files changed, 4 insertions(+), 220 deletions(-) diff --git a/plugins/channelrx/demodam/amdemod.cpp b/plugins/channelrx/demodam/amdemod.cpp index e0562dbdf..34f0f5a6f 100644 --- a/plugins/channelrx/demodam/amdemod.cpp +++ b/plugins/channelrx/demodam/amdemod.cpp @@ -87,11 +87,6 @@ AMDemod::~AMDemod() delete m_channelizer; } -bool AMDemod::isAudioNetSinkRTPCapable() const -{ - return m_audioNetSink && m_audioNetSink->isRTPCapable(); -} - void AMDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst __attribute__((unused))) { Complex ci; diff --git a/plugins/channelrx/demodam/amdemod.h b/plugins/channelrx/demodam/amdemod.h index 3fec30633..37e22601d 100644 --- a/plugins/channelrx/demodam/amdemod.h +++ b/plugins/channelrx/demodam/amdemod.h @@ -129,8 +129,6 @@ public: m_magsqCount = 0; } - bool isAudioNetSinkRTPCapable() const; - static const QString m_channelIdURI; static const QString m_channelId; diff --git a/plugins/channelrx/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp index 7759ea7e7..b2c9d3def 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.cpp +++ b/plugins/channelrx/demodnfm/nfmdemod.cpp @@ -103,11 +103,6 @@ NFMDemod::~NFMDemod() delete m_channelizer; } -bool NFMDemod::isAudioNetSinkRTPCapable() const -{ - return m_audioNetSink && m_audioNetSink->isRTPCapable(); -} - float arctan2(Real y, Real x) { Real coeff_1 = M_PI / 4; @@ -436,7 +431,6 @@ void NFMDemod::applySettings(const NFMDemodSettings& settings, bool force) << " m_ctcssOn: " << settings.m_ctcssOn << " m_audioMute: " << settings.m_audioMute << " m_copyAudioToUDP: " << settings.m_copyAudioToUDP - << " m_copyAudioUseRTP: " << settings.m_copyAudioUseRTP << " m_udpAddress: " << settings.m_udpAddress << " m_udpPort: " << settings.m_udpPort << " force: " << force; @@ -501,26 +495,6 @@ void NFMDemod::applySettings(const NFMDemodSettings& settings, bool force) setSelectedCtcssIndex(settings.m_ctcssIndex); } - if ((settings.m_copyAudioUseRTP != m_settings.m_copyAudioUseRTP) || force) - { - if (settings.m_copyAudioUseRTP) - { - if (m_audioNetSink->selectType(AudioNetSink::SinkRTP)) { - qDebug("NFMDemod::applySettings: set audio sink to RTP mode"); - } else { - qWarning("NFMDemod::applySettings: RTP support for audio sink not available. Fall back too UDP"); - } - } - else - { - if (m_audioNetSink->selectType(AudioNetSink::SinkUDP)) { - qDebug("NFMDemod::applySettings: set audio sink to UDP mode"); - } else { - qWarning("NFMDemod::applySettings: failed to set audio sink to UDP mode"); - } - } - } - m_settings = settings; } @@ -580,9 +554,6 @@ int NFMDemod::webapiSettingsPutPatch( if (channelSettingsKeys.contains("copyAudioToUDP")) { settings.m_copyAudioToUDP = response.getNfmDemodSettings()->getCopyAudioToUdp() != 0; } - if (channelSettingsKeys.contains("copyAudioUseRTP")) { - settings.m_copyAudioUseRTP = response.getNfmDemodSettings()->getCopyAudioUseRtp() != 0; - } if (channelSettingsKeys.contains("ctcssIndex")) { settings.m_ctcssIndex = response.getNfmDemodSettings()->getCtcssIndex(); } @@ -662,7 +633,6 @@ void NFMDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& resp response.getNfmDemodSettings()->setAudioMute(settings.m_audioMute ? 1 : 0); response.getNfmDemodSettings()->setAudioSampleRate(settings.m_audioSampleRate); response.getNfmDemodSettings()->setCopyAudioToUdp(settings.m_copyAudioToUDP ? 1 : 0); - response.getNfmDemodSettings()->setCopyAudioUseRtp(settings.m_copyAudioUseRTP ? 1 : 0); response.getNfmDemodSettings()->setCtcssIndex(settings.m_ctcssIndex); response.getNfmDemodSettings()->setCtcssOn(settings.m_ctcssOn ? 1 : 0); response.getNfmDemodSettings()->setDeltaSquelch(settings.m_deltaSquelch ? 1 : 0); diff --git a/plugins/channelrx/demodnfm/nfmdemod.h b/plugins/channelrx/demodnfm/nfmdemod.h index 54e397495..376024132 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.h +++ b/plugins/channelrx/demodnfm/nfmdemod.h @@ -163,8 +163,6 @@ public: m_magsqCount = 0; } - bool isAudioNetSinkRTPCapable() const; - static const QString m_channelIdURI; static const QString m_channelId; diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp index 1f65583a1..b49c8302f 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp @@ -210,12 +210,6 @@ void NFMDemodGUI::on_copyAudioToUDP_toggled(bool checked) applySettings(); } -void NFMDemodGUI::on_useRTP_toggled(bool checked) -{ - m_settings.m_copyAudioUseRTP = checked; - applySettings(); -} - void NFMDemodGUI::on_ctcss_currentIndexChanged(int index) { m_settings.m_ctcssIndex = index; @@ -320,10 +314,6 @@ NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban QChar delta = QChar(0x94, 0x03); ui->deltaSquelch->setText(delta); - if (!m_nfmDemod->isAudioNetSinkRTPCapable()) { - ui->useRTP->hide(); - } - connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages())); displaySettings(); @@ -402,10 +392,6 @@ void NFMDemodGUI::displaySettings() ui->ctcss->setCurrentIndex(m_settings.m_ctcssIndex); - if (m_nfmDemod->isAudioNetSinkRTPCapable()) { - ui->useRTP->setChecked(m_settings.m_copyAudioUseRTP); - } - blockApplySettings(false); } diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.h b/plugins/channelrx/demodnfm/nfmdemodgui.h index 3b4b0e68d..4920c7b54 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.h +++ b/plugins/channelrx/demodnfm/nfmdemodgui.h @@ -79,7 +79,6 @@ private slots: void on_ctcssOn_toggled(bool checked); void on_audioMute_toggled(bool checked); void on_copyAudioToUDP_toggled(bool checked); - void on_useRTP_toggled(bool checked); void onWidgetRolled(QWidget* widget, bool rollDown); void onMenuDialogCalled(const QPoint& p); void handleInputMessages(); diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.ui b/plugins/channelrx/demodnfm/nfmdemodgui.ui index 6c7d73d4e..b59c3e9f4 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.ui +++ b/plugins/channelrx/demodnfm/nfmdemodgui.ui @@ -53,16 +53,7 @@ 3 - - 2 - - - 2 - - - 2 - - + 2 @@ -611,16 +602,6 @@ - - - - Use RTP protocol for audio copy to UDP - - - R - - - diff --git a/plugins/channelrx/demodnfm/nfmdemodsettings.cpp b/plugins/channelrx/demodnfm/nfmdemodsettings.cpp index 1abf809fd..445541bc1 100644 --- a/plugins/channelrx/demodnfm/nfmdemodsettings.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodsettings.cpp @@ -51,7 +51,6 @@ void NFMDemodSettings::resetToDefaults() m_ctcssIndex = 0; m_audioSampleRate = DSPEngine::instance()->getDefaultAudioSampleRate(); m_copyAudioToUDP = false; - m_copyAudioUseRTP = false; m_udpAddress = "127.0.0.1"; m_udpPort = 9998; m_rgbColor = QColor(255, 0, 0).rgb(); @@ -78,7 +77,6 @@ QByteArray NFMDemodSettings::serialize() const } s.writeString(14, m_title); - s.writeBool(15, m_copyAudioUseRTP); return s.final(); } @@ -122,7 +120,6 @@ bool NFMDemodSettings::deserialize(const QByteArray& data) d.readS32(11, &m_squelchGate, 5); d.readBool(12, &m_deltaSquelch, false); d.readString(14, &m_title, "NFM Demodulator"); - d.readBool(15, &m_copyAudioUseRTP, false); return true; } diff --git a/plugins/channelrx/demodnfm/nfmdemodsettings.h b/plugins/channelrx/demodnfm/nfmdemodsettings.h index 578f7cdd6..a758edb58 100644 --- a/plugins/channelrx/demodnfm/nfmdemodsettings.h +++ b/plugins/channelrx/demodnfm/nfmdemodsettings.h @@ -40,7 +40,6 @@ struct NFMDemodSettings int m_ctcssIndex; uint32_t m_audioSampleRate; bool m_copyAudioToUDP; - bool m_copyAudioUseRTP; QString m_udpAddress; uint16_t m_udpPort; quint32 m_rgbColor; diff --git a/plugins/channelrx/demodssb/ssbdemod.cpp b/plugins/channelrx/demodssb/ssbdemod.cpp index dd6e362ba..390c3514d 100644 --- a/plugins/channelrx/demodssb/ssbdemod.cpp +++ b/plugins/channelrx/demodssb/ssbdemod.cpp @@ -113,11 +113,6 @@ SSBDemod::~SSBDemod() delete m_channelizer; } -bool SSBDemod::isAudioNetSinkRTPCapable() const -{ - return m_audioNetSink && m_audioNetSink->isRTPCapable(); -} - void SSBDemod::configure(MessageQueue* messageQueue, Real Bandwidth, Real LowCutoff, @@ -396,7 +391,6 @@ void SSBDemod::applySettings(const SSBDemodSettings& settings, bool force) << " m_dsb: " << settings.m_dsb << " m_audioMute: " << settings.m_audioMute << " m_copyAudioToUDP: " << settings.m_copyAudioToUDP - << " m_copyAudioUseRTP: " << settings.m_copyAudioUseRTP << " m_agcActive: " << settings.m_agc << " m_agcClamping: " << settings.m_agcClamping << " m_agcTimeLog2: " << settings.m_agcTimeLog2 @@ -496,26 +490,6 @@ void SSBDemod::applySettings(const SSBDemodSettings& 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("NFMDemod::applySettings: set audio sink to RTP mode"); - } else { - qWarning("NFMDemod::applySettings: RTP support for audio sink not available. Fall back too UDP"); - } - } - else - { - if (m_audioNetSink->selectType(AudioNetSink::SinkUDP)) { - qDebug("NFMDemod::applySettings: set audio sink to UDP mode"); - } else { - qWarning("NFMDemod::applySettings: failed to set audio sink to UDP mode"); - } - } - } - m_spanLog2 = settings.m_spanLog2; m_audioBinaual = settings.m_audioBinaural; m_audioFlipChannels = settings.m_audioFlipChannels; diff --git a/plugins/channelrx/demodssb/ssbdemod.h b/plugins/channelrx/demodssb/ssbdemod.h index c71698e01..b026298dc 100644 --- a/plugins/channelrx/demodssb/ssbdemod.h +++ b/plugins/channelrx/demodssb/ssbdemod.h @@ -134,8 +134,6 @@ public: m_magsqCount = 0; } - bool isAudioNetSinkRTPCapable() const; - static const QString m_channelIdURI; static const QString m_channelId; diff --git a/plugins/channelrx/demodssb/ssbdemodgui.cpp b/plugins/channelrx/demodssb/ssbdemodgui.cpp index eb9c63e0e..2e07bc7c1 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.cpp +++ b/plugins/channelrx/demodssb/ssbdemodgui.cpp @@ -203,12 +203,6 @@ void SSBDemodGUI::on_copyAudioToUDP_toggled(bool checked) applySettings(); } -void SSBDemodGUI::on_useRTP_toggled(bool checked) -{ - m_settings.m_copyAudioUseRTP = checked; - applySettings(); -} - void SSBDemodGUI::onMenuDialogCalled(const QPoint &p) { BasicChannelSettingsDialog dialog(&m_channelMarker, this); @@ -288,9 +282,6 @@ SSBDemodGUI::SSBDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban m_deviceUISet->addChannelMarker(&m_channelMarker); m_deviceUISet->addRollupWidget(this); - if (!m_ssbDemod->isAudioNetSinkRTPCapable()) { - ui->useRTP->hide(); - } connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); @@ -523,10 +514,6 @@ void SSBDemodGUI::displaySettings() ui->agcThresholdGateText->setText(s); ui->copyAudioToUDP->setChecked(m_settings.m_copyAudioToUDP); - if (m_ssbDemod->isAudioNetSinkRTPCapable()) { - ui->useRTP->setChecked(m_settings.m_copyAudioUseRTP); - } - blockApplySettings(false); } diff --git a/plugins/channelrx/demodssb/ssbdemodgui.h b/plugins/channelrx/demodssb/ssbdemodgui.h index 52b2a9cd5..79c15f4fa 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.h +++ b/plugins/channelrx/demodssb/ssbdemodgui.h @@ -96,7 +96,6 @@ private slots: void on_spanLog2_valueChanged(int value); void on_flipSidebands_clicked(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 tick(); diff --git a/plugins/channelrx/demodssb/ssbdemodgui.ui b/plugins/channelrx/demodssb/ssbdemodgui.ui index 4fd0a4800..8530ff19d 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.ui +++ b/plugins/channelrx/demodssb/ssbdemodgui.ui @@ -53,16 +53,7 @@ 3 - - 2 - - - 2 - - - 2 - - + 2 @@ -873,16 +864,6 @@ - - - - Use RTP protocol for audio copy to UDP - - - R - - - @@ -921,16 +902,7 @@ 2 - - 3 - - - 3 - - - 3 - - + 3 diff --git a/plugins/channelrx/demodssb/ssbdemodsettings.cpp b/plugins/channelrx/demodssb/ssbdemodsettings.cpp index f6ddc9d1b..e01656eb4 100644 --- a/plugins/channelrx/demodssb/ssbdemodsettings.cpp +++ b/plugins/channelrx/demodssb/ssbdemodsettings.cpp @@ -45,7 +45,6 @@ void SSBDemodSettings::resetToDefaults() m_agc = false; m_agcClamping = false; m_copyAudioToUDP = false; - m_copyAudioUseRTP = false; m_agcPowerThreshold = -40; m_agcThresholdGate = 4; m_agcTimeLog2 = 7; @@ -84,7 +83,6 @@ QByteArray SSBDemodSettings::serialize() const s.writeS32(14, m_agcThresholdGate); s.writeBool(15, m_agcClamping); s.writeString(16, m_title); - s.writeBool(17, m_copyAudioUseRTP); return s.final(); } @@ -129,7 +127,6 @@ bool SSBDemodSettings::deserialize(const QByteArray& data) d.readS32(14, &m_agcThresholdGate, 4); d.readBool(15, &m_agcClamping, false); d.readString(16, &m_title, "SSB Demodulator"); - d.readBool(17, &m_copyAudioUseRTP, false); return true; } diff --git a/plugins/channelrx/demodssb/ssbdemodsettings.h b/plugins/channelrx/demodssb/ssbdemodsettings.h index a13232797..fda0e1fad 100644 --- a/plugins/channelrx/demodssb/ssbdemodsettings.h +++ b/plugins/channelrx/demodssb/ssbdemodsettings.h @@ -34,7 +34,6 @@ struct SSBDemodSettings bool m_dsb; bool m_audioMute; bool m_copyAudioToUDP; - bool m_copyAudioUseRTP; bool m_agc; bool m_agcClamping; int m_agcTimeLog2; diff --git a/plugins/channelrx/demodwfm/wfmdemod.cpp b/plugins/channelrx/demodwfm/wfmdemod.cpp index a8544b605..5aad81543 100644 --- a/plugins/channelrx/demodwfm/wfmdemod.cpp +++ b/plugins/channelrx/demodwfm/wfmdemod.cpp @@ -88,11 +88,6 @@ WFMDemod::~WFMDemod() delete m_channelizer; } -bool WFMDemod::isAudioNetSinkRTPCapable() const -{ - return m_audioNetSink && m_audioNetSink->isRTPCapable(); -} - void WFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst __attribute__((unused))) { Complex ci; @@ -334,26 +329,6 @@ void WFMDemod::applySettings(const WFMDemodSettings& 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("WFMDemod::applySettings: set audio sink to RTP mode"); - } else { - qWarning("WFMDemod::applySettings: RTP support for audio sink not available. Fall back too UDP"); - } - } - else - { - if (m_audioNetSink->selectType(AudioNetSink::SinkUDP)) { - qDebug("WFMDemod::applySettings: set audio sink to UDP mode"); - } else { - qWarning("WFMDemod::applySettings: failed to set audio sink to UDP mode"); - } - } - } - m_settings = settings; } diff --git a/plugins/channelrx/demodwfm/wfmdemod.h b/plugins/channelrx/demodwfm/wfmdemod.h index 4a17378b1..8f8e664dd 100644 --- a/plugins/channelrx/demodwfm/wfmdemod.h +++ b/plugins/channelrx/demodwfm/wfmdemod.h @@ -119,8 +119,6 @@ public: m_magsqCount = 0; } - bool isAudioNetSinkRTPCapable() const; - static const QString m_channelIdURI; static const QString m_channelId; diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.cpp b/plugins/channelrx/demodwfm/wfmdemodgui.cpp index 15c476568..3280f8420 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.cpp +++ b/plugins/channelrx/demodwfm/wfmdemodgui.cpp @@ -137,12 +137,6 @@ void WFMDemodGUI::on_copyAudioToUDP_toggled(bool checked) applySettings(); } -void WFMDemodGUI::on_useRTP_toggled(bool checked) -{ - m_settings.m_copyAudioUseRTP = checked; - applySettings(); -} - void WFMDemodGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool rollDown __attribute__((unused))) { } @@ -213,10 +207,6 @@ WFMDemodGUI::WFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban m_deviceUISet->addChannelMarker(&m_channelMarker); m_deviceUISet->addRollupWidget(this); - if (!m_wfmDemod->isAudioNetSinkRTPCapable()) { - ui->useRTP->hide(); - } - connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor())); connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor())); @@ -279,10 +269,6 @@ void WFMDemodGUI::displaySettings() ui->squelch->setValue(m_settings.m_squelch); ui->squelchText->setText(QString("%1 dB").arg(m_settings.m_squelch)); - if (m_wfmDemod->isAudioNetSinkRTPCapable()) { - ui->useRTP->setChecked(m_settings.m_copyAudioUseRTP); - } - blockApplySettings(false); } diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.h b/plugins/channelrx/demodwfm/wfmdemodgui.h index 9ac64abde..a9b85ba32 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.h +++ b/plugins/channelrx/demodwfm/wfmdemodgui.h @@ -81,7 +81,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 tick(); diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.ui b/plugins/channelrx/demodwfm/wfmdemodgui.ui index 05ffd6164..c746145e7 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.ui +++ b/plugins/channelrx/demodwfm/wfmdemodgui.ui @@ -59,16 +59,7 @@ 3 - - 2 - - - 2 - - - 2 - - + 2 @@ -384,16 +375,6 @@ - - - - Use RTP protocol for audio copy to UDP - - - R - - - diff --git a/plugins/channelrx/demodwfm/wfmdemodsettings.cpp b/plugins/channelrx/demodwfm/wfmdemodsettings.cpp index 467615136..a9e5edc0c 100644 --- a/plugins/channelrx/demodwfm/wfmdemodsettings.cpp +++ b/plugins/channelrx/demodwfm/wfmdemodsettings.cpp @@ -44,7 +44,6 @@ void WFMDemodSettings::resetToDefaults() m_audioMute = false; m_audioSampleRate = DSPEngine::instance()->getDefaultAudioSampleRate(); m_copyAudioToUDP = false; - m_copyAudioUseRTP = false; m_udpAddress = "127.0.0.1"; m_udpPort = 9999; m_rgbColor = QColor(0, 0, 255).rgb(); diff --git a/plugins/channelrx/demodwfm/wfmdemodsettings.h b/plugins/channelrx/demodwfm/wfmdemodsettings.h index 9688d8984..9c643d12b 100644 --- a/plugins/channelrx/demodwfm/wfmdemodsettings.h +++ b/plugins/channelrx/demodwfm/wfmdemodsettings.h @@ -32,7 +32,6 @@ struct WFMDemodSettings bool m_audioMute; quint32 m_audioSampleRate; bool m_copyAudioToUDP; - bool m_copyAudioUseRTP; QString m_udpAddress; quint16 m_udpPort; quint32 m_rgbColor; diff --git a/swagger/sdrangel/api/swagger/include/NFMDemod.yaml b/swagger/sdrangel/api/swagger/include/NFMDemod.yaml index 645bcb0a8..f9a7068e7 100644 --- a/swagger/sdrangel/api/swagger/include/NFMDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/NFMDemod.yaml @@ -37,8 +37,6 @@ NFMDemodSettings: type: integer copyAudioToUDP: type: integer - copyAudioUseRTP: - type: integer udpAddress: type: string udpPort: