ryzerth/sdrpp
1
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2026-04-20 07:12:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed radio bandwidth not adjusted when the menu is closed or hidden

Browse Source
This commit is contained in:
Ryzerth
2021-08-20 20:40:14 +02:00
parent 1465fb784f
commit b2ce47d975
11 changed files with 164 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
radio/src/dsb_demod.h
View File

@@ -55,6 +55,11 @@ public:
resamp.updateWindow(&win);
m2s.init(&resamp.out);
onUserChangedBandwidthHandler.handler = vfoUserChangedBandwidthHandler;
onUserChangedBandwidthHandler.ctx = this;
_vfo->wtfVFO->onUserChangedBandwidth.bindHandler(&onUserChangedBandwidthHandler);
}
void start() {
@@ -89,6 +94,7 @@ public:
void setVFO(VFOManager::VFO* vfo) {
_vfo = vfo;
squelch.setInput(_vfo->output);
_vfo->wtfVFO->onUserChangedBandwidth.bindHandler(&onUserChangedBandwidthHandler);
}
VFOManager::VFO* getVFO() {
@@ -130,15 +136,6 @@ public:
_config->conf[uiPrefix]["DSB"]["bandwidth"] = bw;
_config->release(true);
}
if (running) {
if (_vfo->getBandwidthChanged()) {
bw = _vfo->getBandwidth();
setBandwidth(bw, false);
_config->acquire();
_config->conf[uiPrefix]["DSB"]["bandwidth"] = bw;
_config->release(true);
}
}
ImGui::Text("Snap Interval");
ImGui::SameLine();
@@ -160,7 +157,18 @@ public:
_config->conf[uiPrefix]["DSB"]["squelchLevel"] = squelchLevel;
_config->release(true);
}
}
}
static void vfoUserChangedBandwidthHandler(double newBw, void* ctx) {
DSBDemodulator* _this = (DSBDemodulator*)ctx;
if (_this->running) {
_this->bw = newBw;
_this->setBandwidth(_this->bw, false);
_this->_config->acquire();
_this->_config->conf[_this->uiPrefix]["DSB"]["bandwidth"] = _this->bw;
_this->_config->release(true);
}
}
void setBandwidth(float bandWidth, bool updateWaterfall = true) {
bandWidth = std::clamp<float>(bandWidth, bwMin, bwMax);
@@ -170,9 +178,9 @@ public:
void saveParameters(bool lock = true) {
if (lock) { _config->acquire(); }
_config->conf[uiPrefix]["WFM"]["bandwidth"] = bw;
_config->conf[uiPrefix]["WFM"]["snapInterval"] = snapInterval;
_config->conf[uiPrefix]["WFM"]["squelchLevel"] = squelchLevel;
_config->conf[uiPrefix]["DSB"]["bandwidth"] = bw;
_config->conf[uiPrefix]["DSB"]["snapInterval"] = snapInterval;
_config->conf[uiPrefix]["DSB"]["squelchLevel"] = squelchLevel;
if (lock) { _config->release(true); }
}
@@ -203,4 +211,6 @@ private:
ConfigManager* _config;
EventHandler<double> onUserChangedBandwidthHandler;
};