From 3b882e78b4600218da9a4e5a5f3af807d3c595ef Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 28 Mar 2018 09:43:33 +0200 Subject: [PATCH] BFM demod: removed UDP/RTP copy audio entirely --- plugins/channelrx/demodbfm/bfmdemod.cpp | 3 --- plugins/channelrx/demodbfm/bfmdemodgui.cpp | 2 -- plugins/channelrx/demodbfm/bfmdemodsettings.cpp | 2 -- plugins/channelrx/demodbfm/bfmdemodsettings.h | 2 -- 4 files changed, 9 deletions(-) diff --git a/plugins/channelrx/demodbfm/bfmdemod.cpp b/plugins/channelrx/demodbfm/bfmdemod.cpp index 593063128..43c4eae61 100644 --- a/plugins/channelrx/demodbfm/bfmdemod.cpp +++ b/plugins/channelrx/demodbfm/bfmdemod.cpp @@ -21,7 +21,6 @@ #include #include "audio/audiooutput.h" -#include "audio/audionetsink.h" #include "dsp/dspengine.h" #include "dsp/downchannelizer.h" #include "dsp/threadedbasebandsamplesink.h" @@ -451,8 +450,6 @@ void BFMDemod::applySettings(const BFMDemodSettings& settings, bool force) << " m_lsbStereo: " << settings.m_lsbStereo << " m_showPilot: " << settings.m_showPilot << " m_rdsActive: " << settings.m_rdsActive - << " m_udpAddress: " << settings.m_udpAddress - << " m_udpPort: " << settings.m_udpPort << " m_audioDeviceName: " << settings.m_audioDeviceName << " force: " << force; diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp index 8dbe9233c..395682b4f 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.cpp +++ b/plugins/channelrx/demodbfm/bfmdemodgui.cpp @@ -307,8 +307,6 @@ void BFMDemodGUI::onMenuDialogCalled(const QPoint &p) dialog.exec(); m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency(); - m_settings.m_udpAddress = m_channelMarker.getUDPAddress(), - m_settings.m_udpPort = m_channelMarker.getUDPSendPort(), m_settings.m_rgbColor = m_channelMarker.getColor().rgb(); m_settings.m_title = m_channelMarker.getTitle(); diff --git a/plugins/channelrx/demodbfm/bfmdemodsettings.cpp b/plugins/channelrx/demodbfm/bfmdemodsettings.cpp index b68d2ae69..9bb54d736 100644 --- a/plugins/channelrx/demodbfm/bfmdemodsettings.cpp +++ b/plugins/channelrx/demodbfm/bfmdemodsettings.cpp @@ -45,8 +45,6 @@ void BFMDemodSettings::resetToDefaults() m_lsbStereo = false; m_showPilot = false; m_rdsActive = false; - m_udpAddress = "127.0.0.1"; - m_udpPort = 9999; m_rgbColor = QColor(80, 120, 228).rgb(); m_title = "Broadcast FM Demod"; m_audioDeviceName = AudioDeviceManager::m_defaultDeviceName; diff --git a/plugins/channelrx/demodbfm/bfmdemodsettings.h b/plugins/channelrx/demodbfm/bfmdemodsettings.h index 18341b7ef..5400baff3 100644 --- a/plugins/channelrx/demodbfm/bfmdemodsettings.h +++ b/plugins/channelrx/demodbfm/bfmdemodsettings.h @@ -32,8 +32,6 @@ struct BFMDemodSettings bool m_lsbStereo; bool m_showPilot; bool m_rdsActive; - QString m_udpAddress; - quint16 m_udpPort; quint32 m_rgbColor; QString m_title; QString m_audioDeviceName;