More bugfix + folder selection in recorder

core/src/core.cpp

@@ -10,7 +10,7 @@
 #include <gui/icons.h>
 #include <version.h>
 #include <spdlog/spdlog.h>
-#include <gui/bandplan.h>
+#include <gui/widgets/bandplan.h>
 #include <module.h>
 #include <stb_image.h>
 #include <config.h>

core/src/gui/gui.h

@@ -1,7 +1,7 @@
 #pragma once
-#include <gui/waterfall.h>
-#include <gui/frequency_select.h>
-#include <gui/menu.h>
+#include <gui/widgets/waterfall.h>
+#include <gui/widgets/frequency_select.h>
+#include <gui/widgets/menu.h>
 #include <gui/dialogs/loading_screen.h>
 #include <module.h>
 

core/src/gui/main_window.cpp

@@ -9,12 +9,12 @@
 #include <imgui_plot.h>
 #include <thread>
 #include <complex>
-#include <gui/waterfall.h>
-#include <gui/frequency_select.h>
+#include <gui/widgets/waterfall.h>
+#include <gui/widgets/frequency_select.h>
 #include <fftw3.h>
 #include <signal_path/dsp.h>
 #include <gui/icons.h>
-#include <gui/bandplan.h>
+#include <gui/widgets/bandplan.h>
 #include <watcher.h>
 #include <module.h>
 #include <signal_path/vfo_manager.h>
@@ -122,12 +122,13 @@ void windowInit() {
     displaymenu::init();
 
     // TODO for 0.2.5
-    // Add a loading screen
-    // Add "select folder" option for the recorder module
-    // Add squelsh
-    // CW and RAW modes;
-    // Bring VFO to a visible place when changing sample rate if it's smaller
-    // Use DUK_USE_DATE_NOW_WINDOWS for windows 7 support
+    // Add "select folder" option for the file source
+    // Fix SSB demod
+    // FIX AUDIO ISSUE ON BOTH LINUX AND SOMETIMES WINDOWS (probly the ring buffer, though double buffering could help)
+    // Rewrite radio module with CW and RAW modes
+    // Add default main config to avoid having to ship one
+    // Have a good directory system on both linux and windows
+    // Switch to double buffering
 
     // TODO for 0.2.6
     // And a module add/remove/change order menu

core/src/gui/menus/bandplan.cpp

@@ -1,5 +1,5 @@
 #include <gui/menus/bandplan.h>
-#include <gui/bandplan.h>
+#include <gui/widgets/bandplan.h>
 #include <gui/gui.h>
 #include <core.h>
 

core/src/gui/widgets/bandplan.cpp

@@ -1,4 +1,4 @@
-#include <gui/bandplan.h>
+#include <gui/widgets/bandplan.h>
 #include <fstream>
 #include <spdlog/spdlog.h>
 #include <filesystem>

core/src/gui/widgets/frequency_select.cpp

@@ -1,4 +1,4 @@
-#include <gui/frequency_select.h>
+#include <gui/widgets/frequency_select.h>
 #include <config.h>
 #include <gui/style.h>
 

core/src/gui/widgets/menu.cpp

@@ -1,4 +1,4 @@
-#include <gui/menu.h>
+#include <gui/widgets/menu.h>
 #include <imgui/imgui.h>
 
 Menu::Menu() {

core/src/gui/widgets/waterfall.cpp

@@ -1,4 +1,4 @@
-#include <gui/waterfall.h>
+#include <gui/widgets/waterfall.h>
 #include <imgui.h>
 #include <imgui_internal.h>
 #include <GL/glew.h>
@@ -564,6 +564,14 @@ namespace ImGui {
         double currentRatio = viewBandwidth / wholeBandwidth;
         wholeBandwidth = bandWidth;
         setViewBandwidth(bandWidth * currentRatio);
+        for (auto const& [name, vfo] : vfos) {
+            if (vfo->lowerOffset < -(bandWidth / 2)) {
+                vfo->setCenterOffset(-(bandWidth / 2));
+            }
+            if (vfo->upperOffset > (bandWidth / 2)) {
+                vfo->setCenterOffset(bandWidth / 2);
+            }
+        }
         updateAllVFOs();
     }
 

core/src/gui/widgets/waterfall.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <vector>
 #include <mutex>
-#include <gui/bandplan.h>
+#include <gui/widgets/bandplan.h>
 #include <imgui/imgui.h>
 #include <imgui/imgui_internal.h>
 #include <GL/glew.h>

core/src/signal_path/vfo_manager.h

@@ -1,6 +1,6 @@
 #pragma once
 #include <dsp/vfo.h>
-#include <gui/waterfall.h>
+#include <gui/widgets/waterfall.h>
 #include <gui/gui.h>
 
 class VFOManager {