VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 09:48:45 -05:00
Code Issues Projects Releases Wiki Activity

Cosmetic changes

Browse Source
This commit is contained in:
f4exb 2018-02-05 18:01:23 +01:00
parent 9cf57f5aca
commit 5e57c0462f
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/channelrx/demoddsd/dsddemod.cpp
View File

@ -414,7 +414,7 @@ void DSDDemod::applySettings(const DSDDemodSettings& settings, bool force)
<< " m_slot2On: " << m_settings.m_slot2On << " m_slot2On: " << m_settings.m_slot2On
<< " m_tdmaStereo: " << m_settings.m_tdmaStereo << " m_tdmaStereo: " << m_settings.m_tdmaStereo
<< " m_pllLock: " << m_settings.m_pllLock << " 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_udpAddress: " << m_settings.m_udpAddress
<< " m_udpPort: " << m_settings.m_udpPort << " m_udpPort: " << m_settings.m_udpPort
<< " m_highPassFilter: "<< m_settings.m_highPassFilter << " m_highPassFilter: "<< m_settings.m_highPassFilter
@ -479,12 +479,12 @@ void DSDDemod::applySettings(const DSDDemodSettings& settings, bool force)
m_udpBufferAudio->setPort(settings.m_udpPort); 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_slot1On != m_settings.m_slot1On)
|| (settings.m_slot2On != m_settings.m_slot2On) || force) || (settings.m_slot2On != m_settings.m_slot2On) || force)
{ {
m_audioFifo1.setCopyToUDP(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_udpCopyAudio); m_audioFifo2.setCopyToUDP(settings.m_slot2On && !settings.m_slot1On && settings.m_copyAudioToUDP);
} }
if ((settings.m_highPassFilter != m_settings.m_highPassFilter) || force) if ((settings.m_highPassFilter != m_settings.m_highPassFilter) || force)

4
plugins/channelrx/demoddsd/dsddemodgui.cpp
View File

@ -215,7 +215,7 @@ void DSDDemodGUI::on_symbolPLLLock_toggled(bool checked)
void DSDDemodGUI::on_udpOutput_toggled(bool checked) void DSDDemodGUI::on_udpOutput_toggled(bool checked)
{ {
m_settings.m_udpCopyAudio = checked; m_settings.m_copyAudioToUDP = checked;
applySettings(); applySettings();
} }
@ -381,7 +381,7 @@ void DSDDemodGUI::displaySettings()
ui->slot2On->setChecked(m_settings.m_slot2On); ui->slot2On->setChecked(m_settings.m_slot2On);
ui->tdmaStereoSplit->setChecked(m_settings.m_tdmaStereo); ui->tdmaStereoSplit->setChecked(m_settings.m_tdmaStereo);
ui->audioMute->setChecked(m_settings.m_audioMute); 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->symbolPLLLock->setChecked(m_settings.m_pllLock);
ui->baudRate->setCurrentIndex(DSDDemodBaudRates::getRateIndex(m_settings.m_baudRate)); ui->baudRate->setCurrentIndex(DSDDemodBaudRates::getRateIndex(m_settings.m_baudRate));

2
plugins/channelrx/demoddsd/dsddemodsettings.cpp
View File

@ -46,7 +46,7 @@ void DSDDemodSettings::resetToDefaults()
m_slot2On = false; m_slot2On = false;
m_tdmaStereo = false; m_tdmaStereo = false;
m_pllLock = true; m_pllLock = true;
m_udpCopyAudio = false; m_copyAudioToUDP = false;
m_udpAddress = "127.0.0.1"; m_udpAddress = "127.0.0.1";
m_udpPort = 9999; m_udpPort = 9999;
m_rgbColor = QColor(0, 255, 255).rgb(); m_rgbColor = QColor(0, 255, 255).rgb();

2
plugins/channelrx/demoddsd/dsddemodsettings.h
View File

@ -39,7 +39,7 @@ struct DSDDemodSettings
bool m_slot2On; bool m_slot2On;
bool m_tdmaStereo; bool m_tdmaStereo;
bool m_pllLock; bool m_pllLock;
bool m_udpCopyAudio; bool m_copyAudioToUDP;
QString m_udpAddress; QString m_udpAddress;
quint16 m_udpPort; quint16 m_udpPort;
quint32 m_rgbColor; quint32 m_rgbColor;

1
plugins/channelrx/demodnfm/nfmdemod.cpp
View File

@ -414,6 +414,7 @@ void NFMDemod::applySettings(const NFMDemodSettings& settings, bool force)
<< " m_ctcssOn: " << settings.m_ctcssOn << " m_ctcssOn: " << settings.m_ctcssOn
<< " m_audioMute: " << settings.m_audioMute << " m_audioMute: " << settings.m_audioMute
<< " m_copyAudioToUDP: " << settings.m_copyAudioToUDP << " m_copyAudioToUDP: " << settings.m_copyAudioToUDP
<< " m_copyAudioUseRTP: " << settings.m_copyAudioUseRTP
<< " m_udpAddress: " << settings.m_udpAddress << " m_udpAddress: " << settings.m_udpAddress
<< " m_udpPort: " << settings.m_udpPort << " m_udpPort: " << settings.m_udpPort
<< " force: " << force; << " force: " << force;