comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-13 23:51:46 -05:00
Code Issues Projects Releases Wiki Activity

Fix broken lastGain property usage

Browse Source
This commit is contained in:
Charles J. Cliffe 2016-03-07 20:15:27 -05:00
parent 29d411cead
commit b155338b1d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AppFrame.cpp
View File

@ -1189,6 +1189,7 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
if (demod != activeDemodulator) { if (demod != activeDemodulator) {
demodSignalMeter->setInputValue(demod->getSquelchLevel()); demodSignalMeter->setInputValue(demod->getSquelchLevel());
demodGainMeter->setInputValue(demod->getGain()); demodGainMeter->setInputValue(demod->getGain());
wxGetApp().getDemodMgr().setLastGain(demod->getGain());
int outputDevice = demod->getOutputDevice(); int outputDevice = demod->getOutputDevice();
scopeCanvas->setDeviceName(outputDevices[outputDevice].name); scopeCanvas->setDeviceName(outputDevices[outputDevice].name);
outputDeviceMenuItems[outputDevice]->Check(true); outputDeviceMenuItems[outputDevice]->Check(true);
@ -1848,6 +1849,7 @@ int AppFrame::OnGlobalKeyDown(wxKeyEvent &event) {
wxGetApp().getDemodMgr().setActiveDemodulator(nullptr); wxGetApp().getDemodMgr().setActiveDemodulator(nullptr);
wxGetApp().getDemodMgr().setActiveDemodulator(demod, false); wxGetApp().getDemodMgr().setActiveDemodulator(demod, false);
} }
return 1;
break; break;
default: default:
break; break;

1
src/demod/DemodulatorInstance.cpp
View File

@ -359,7 +359,6 @@ int DemodulatorInstance::getAudioSampleRate() {
void DemodulatorInstance::setGain(float gain_in) { void DemodulatorInstance::setGain(float gain_in) {
currentAudioGain = gain_in; currentAudioGain = gain_in;
audioThread->setGain(gain_in); audioThread->setGain(gain_in);
wxGetApp().getDemodMgr().setLastGain(gain_in);
} }
float DemodulatorInstance::getGain() { float DemodulatorInstance::getGain() {