Remove public access to demod internal state vars and clean-up improper use

This commit is contained in:
Charles J. Cliffe
2015-02-02 18:24:04 -05:00
parent 48399ccc68
commit b4e4f3017f
5 changed files with 7 additions and 12 deletions
+4 -4
View File
@@ -765,10 +765,10 @@ void WaterfallCanvas::OnMouseReleased(wxMouseEvent& event) {
} else {
isNew = true;
demod = wxGetApp().getDemodMgr().newThread();
demod->getParams().frequency = freq;
demod->setFrequency(freq);
if (DemodulatorInstance *last = wxGetApp().getDemodMgr().getLastActiveDemodulator()) {
demod->getParams().bandwidth = last->getBandwidth();
demod->setBandwidth(last->getBandwidth());
demod->setDemodulatorType(last->getDemodulatorType());
demod->setSquelchLevel(last->getSquelchLevel());
demod->setSquelchEnabled(last->isSquelchEnabled());
@@ -826,8 +826,8 @@ void WaterfallCanvas::OnMouseReleased(wxMouseEvent& event) {
demod = wxGetApp().getDemodMgr().getLastActiveDemodulator();
} else {
demod = wxGetApp().getDemodMgr().newThread();
demod->getParams().frequency = freq;
demod->getParams().bandwidth = bw;
demod->setFrequency(freq);
demod->setBandwidth(bw);
if (DemodulatorInstance *last = wxGetApp().getDemodMgr().getLastActiveDemodulator()) {
demod->setDemodulatorType(last->getDemodulatorType());
demod->setSquelchLevel(last->getSquelchLevel());