diff --git a/plugins/channelrx/demoddsd/dsddemod.cpp b/plugins/channelrx/demoddsd/dsddemod.cpp index e649f9fc8..1cb1a6d0b 100644 --- a/plugins/channelrx/demoddsd/dsddemod.cpp +++ b/plugins/channelrx/demoddsd/dsddemod.cpp @@ -414,7 +414,7 @@ void DSDDemod::applySettings(const DSDDemodSettings& settings, bool force) << " m_slot2On: " << m_settings.m_slot2On << " m_tdmaStereo: " << m_settings.m_tdmaStereo << " m_pllLock: " << m_settings.m_pllLock - << " m_udpCopyAudio: " << m_settings.m_udpCopyAudio + << " m_udpCopyAudio: " << m_settings.m_copyAudioToUDP << " m_udpAddress: " << m_settings.m_udpAddress << " m_udpPort: " << m_settings.m_udpPort << " m_highPassFilter: "<< m_settings.m_highPassFilter @@ -479,12 +479,12 @@ void DSDDemod::applySettings(const DSDDemodSettings& settings, bool force) m_udpBufferAudio->setPort(settings.m_udpPort); } - if ((settings.m_udpCopyAudio != m_settings.m_udpCopyAudio) + if ((settings.m_copyAudioToUDP != m_settings.m_copyAudioToUDP) || (settings.m_slot1On != m_settings.m_slot1On) || (settings.m_slot2On != m_settings.m_slot2On) || force) { - m_audioFifo1.setCopyToUDP(settings.m_slot1On && settings.m_udpCopyAudio); - m_audioFifo2.setCopyToUDP(settings.m_slot2On && !settings.m_slot1On && settings.m_udpCopyAudio); + m_audioFifo1.setCopyToUDP(settings.m_slot1On && settings.m_copyAudioToUDP); + m_audioFifo2.setCopyToUDP(settings.m_slot2On && !settings.m_slot1On && settings.m_copyAudioToUDP); } if ((settings.m_highPassFilter != m_settings.m_highPassFilter) || force) diff --git a/plugins/channelrx/demoddsd/dsddemodgui.cpp b/plugins/channelrx/demoddsd/dsddemodgui.cpp index 863a7ff6b..7a019eede 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.cpp +++ b/plugins/channelrx/demoddsd/dsddemodgui.cpp @@ -215,7 +215,7 @@ void DSDDemodGUI::on_symbolPLLLock_toggled(bool checked) void DSDDemodGUI::on_udpOutput_toggled(bool checked) { - m_settings.m_udpCopyAudio = checked; + m_settings.m_copyAudioToUDP = checked; applySettings(); } @@ -381,7 +381,7 @@ void DSDDemodGUI::displaySettings() ui->slot2On->setChecked(m_settings.m_slot2On); ui->tdmaStereoSplit->setChecked(m_settings.m_tdmaStereo); ui->audioMute->setChecked(m_settings.m_audioMute); - ui->udpOutput->setChecked(m_settings.m_udpCopyAudio); + ui->udpOutput->setChecked(m_settings.m_copyAudioToUDP); ui->symbolPLLLock->setChecked(m_settings.m_pllLock); ui->baudRate->setCurrentIndex(DSDDemodBaudRates::getRateIndex(m_settings.m_baudRate)); diff --git a/plugins/channelrx/demoddsd/dsddemodsettings.cpp b/plugins/channelrx/demoddsd/dsddemodsettings.cpp index 6a6ff4feb..c7404ee77 100644 --- a/plugins/channelrx/demoddsd/dsddemodsettings.cpp +++ b/plugins/channelrx/demoddsd/dsddemodsettings.cpp @@ -46,7 +46,7 @@ void DSDDemodSettings::resetToDefaults() m_slot2On = false; m_tdmaStereo = false; m_pllLock = true; - m_udpCopyAudio = false; + m_copyAudioToUDP = false; m_udpAddress = "127.0.0.1"; m_udpPort = 9999; m_rgbColor = QColor(0, 255, 255).rgb(); diff --git a/plugins/channelrx/demoddsd/dsddemodsettings.h b/plugins/channelrx/demoddsd/dsddemodsettings.h index 0c86c3cf1..f60a4d6c2 100644 --- a/plugins/channelrx/demoddsd/dsddemodsettings.h +++ b/plugins/channelrx/demoddsd/dsddemodsettings.h @@ -39,7 +39,7 @@ struct DSDDemodSettings bool m_slot2On; bool m_tdmaStereo; bool m_pllLock; - bool m_udpCopyAudio; + bool m_copyAudioToUDP; QString m_udpAddress; quint16 m_udpPort; quint32 m_rgbColor; diff --git a/plugins/channelrx/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp index 2d1ab13cf..aee0c751d 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.cpp +++ b/plugins/channelrx/demodnfm/nfmdemod.cpp @@ -414,6 +414,7 @@ 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;