From fc9e155481323791bcbcccdba86dbca721a6532b Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Wed, 9 Dec 2020 04:47:30 +0100 Subject: [PATCH] random bug fixes --- core/src/gui/main_window.cpp | 6 +++--- core/src/gui/widgets/waterfall.h | 1 - core/src/signal_path/dsp.cpp | 2 -- core/src/signal_path/vfo_manager.cpp | 2 +- root_dev/config.json | 6 +++--- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/core/src/gui/main_window.cpp b/core/src/gui/main_window.cpp index 702ca88a..b4adb124 100644 --- a/core/src/gui/main_window.cpp +++ b/core/src/gui/main_window.cpp @@ -159,10 +159,10 @@ void windowInit() { displaymenu::init(); // TODO for 0.2.5 - // Add "select folder" option for the file source + // Add "select file" option for the file source // Add default main config to avoid having to ship one - // Have a good directory system on both linux and windows (should fix occassional underruns) - // Switch to double buffering + // Have a good directory system on both linux and windows + // Switch to double buffering (should fix occassional underruns) // Fix gain not updated on startup, soapysdr // Fix memory leak when enabling and disabling repeatedly diff --git a/core/src/gui/widgets/waterfall.h b/core/src/gui/widgets/waterfall.h index 0b9bd009..11d27ef3 100644 --- a/core/src/gui/widgets/waterfall.h +++ b/core/src/gui/widgets/waterfall.h @@ -9,7 +9,6 @@ #define WATERFALL_RESOLUTION 1000000 namespace ImGui { - class WaterfallVFO { public: void setOffset(double offset); diff --git a/core/src/signal_path/dsp.cpp b/core/src/signal_path/dsp.cpp index 5ef07a2e..aab8e25d 100644 --- a/core/src/signal_path/dsp.cpp +++ b/core/src/signal_path/dsp.cpp @@ -60,7 +60,6 @@ dsp::VFO* SignalPath::addVFO(std::string name, double outSampleRate, double band if (vfos.find(name) != vfos.end()) { return NULL; } - VFO_t vfo; vfo.inputStream = new dsp::stream; split.bindStream(vfo.inputStream); @@ -74,7 +73,6 @@ dsp::VFO* SignalPath::addVFO(std::string name, double outSampleRate, double band void SignalPath::removeVFO(std::string name) { if (vfos.find(name) == vfos.end()) { return; - } VFO_t vfo = vfos[name]; vfo.vfo->stop(); diff --git a/core/src/signal_path/vfo_manager.cpp b/core/src/signal_path/vfo_manager.cpp index d7be903b..8520c2a2 100644 --- a/core/src/signal_path/vfo_manager.cpp +++ b/core/src/signal_path/vfo_manager.cpp @@ -80,8 +80,8 @@ void VFOManager::deleteVFO(VFOManager::VFO* vfo) { if (name == "") { return; } - delete vfo; vfos.erase(name); + delete vfo; } void VFOManager::setOffset(std::string name, double offset) { diff --git a/root_dev/config.json b/root_dev/config.json index 07af47b2..7d67ba9d 100644 --- a/root_dev/config.json +++ b/root_dev/config.json @@ -1,9 +1,9 @@ { "bandPlan": "General", "bandPlanEnabled": true, - "centerTuning": true, + "centerTuning": false, "fftHeight": 300, - "frequency": 99000000, + "frequency": 100485981, "max": 0.0, "maximized": false, "menuOrder": [ @@ -41,7 +41,7 @@ "Radio": { "muted": false, "sink": "Audio", - "volume": 0.47959184646606445 + "volume": 0.41326531767845154 }, "Radio 1": { "muted": false,