VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-28 21:12:26 -04:00
Code Issues Projects Releases Wiki Activity

UDP source: fixed settings passing

Browse Source
This commit is contained in:
f4exb 2017-10-07 06:04:05 +02:00
parent bb6b313bc8
commit 63d94ac9a1
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
plugins/channelrx/udpsrc/udpsrc.cpp
View File

@ -397,21 +397,21 @@ bool UDPSrc::handleMessage(const Message& cmd)
settings.m_inputSampleRate = m_settings.m_inputSampleRate; settings.m_inputSampleRate = m_settings.m_inputSampleRate;
settings.m_inputFrequencyOffset = m_settings.m_inputFrequencyOffset; settings.m_inputFrequencyOffset = m_settings.m_inputFrequencyOffset;
m_config.m_audioActive = m_settings.m_audioActive; m_config.m_audioActive = settings.m_audioActive;
m_config.m_audioStereo = m_settings.m_audioStereo; m_config.m_audioStereo = settings.m_audioStereo;
m_config.m_gain = m_settings.m_gain; m_config.m_gain = settings.m_gain;
m_config.m_volume = m_settings.m_volume; m_config.m_volume = settings.m_volume;
m_config.m_squelch = CalcDb::powerFromdB((double) m_settings.m_squelchdB); m_config.m_squelch = CalcDb::powerFromdB((double) settings.m_squelchdB);
m_config.m_squelchGate = m_settings.m_squelchGate; m_config.m_squelchGate = settings.m_squelchGate;
m_config.m_squelchEnabled = m_settings.m_squelchEnabled; m_config.m_squelchEnabled = settings.m_squelchEnabled;
m_config.m_agc = m_settings.m_agc; m_config.m_agc = settings.m_agc;
m_config.m_sampleFormat = m_settings.m_sampleFormat; m_config.m_sampleFormat = settings.m_sampleFormat;
m_config.m_outputSampleRate = m_settings.m_outputSampleRate; m_config.m_outputSampleRate = settings.m_outputSampleRate;
m_config.m_rfBandwidth = m_settings.m_rfBandwidth; m_config.m_rfBandwidth = settings.m_rfBandwidth;
m_config.m_udpAddressStr = m_settings.m_udpAddress; m_config.m_udpAddressStr = settings.m_udpAddress;
m_config.m_udpPort = m_settings.m_udpPort; m_config.m_udpPort = settings.m_udpPort;
m_config.m_audioPort = m_settings.m_audioPort; m_config.m_audioPort = settings.m_audioPort;
m_config.m_fmDeviation = m_settings.m_fmDeviation; m_config.m_fmDeviation = settings.m_fmDeviation;
apply(cfg.getForce()); apply(cfg.getForce());
@ -421,9 +421,10 @@ bool UDPSrc::handleMessage(const Message& cmd)
<< " m_audioActive: " << m_config.m_audioActive << " m_audioActive: " << m_config.m_audioActive
<< " m_audioStereo: " << m_config.m_audioStereo << " m_audioStereo: " << m_config.m_audioStereo
<< " m_gain: " << m_config.m_gain << " m_gain: " << m_config.m_gain
<< " m_volume: " << m_config.m_volume
<< " m_squelchEnabled: " << m_config.m_squelchEnabled << " m_squelchEnabled: " << m_config.m_squelchEnabled
<< " m_squelch: " << m_config.m_squelch << " m_squelch: " << m_config.m_squelch
<< " getSquelchDB: " << m_settings.m_squelchdB << " getSquelchDB: " << settings.m_squelchdB
<< " m_squelchGate" << m_config.m_squelchGate << " m_squelchGate" << m_config.m_squelchGate
<< " m_agc" << m_config.m_agc << " m_agc" << m_config.m_agc
<< " m_sampleFormat: " << m_config.m_sampleFormat << " m_sampleFormat: " << m_config.m_sampleFormat
@ -435,6 +436,8 @@ bool UDPSrc::handleMessage(const Message& cmd)
<< " m_audioPort: " << m_config.m_audioPort << " m_audioPort: " << m_config.m_audioPort
<< " force: " << cfg.getForce(); << " force: " << cfg.getForce();
m_settings = settings;
return true; return true;
} }
else if (MsgUDPSrcConfigureImmediate::match(cmd)) else if (MsgUDPSrcConfigureImmediate::match(cmd))

3
plugins/channelrx/udpsrc/udpsrc.h
View File

@ -63,7 +63,8 @@ public:
Message(), Message(),
m_settings(settings), m_settings(settings),
m_force(force) m_force(force)
{ } {
}
}; };
class MsgConfigureChannelizer : public Message { class MsgConfigureChannelizer : public Message {