Fixed scripting + cleaner code + fixed RTLTCP

core/src/gui/bandplan.cpp

@@ -1,4 +1,9 @@
 #include <gui/bandplan.h>
+#include <fstream>
+#include <spdlog/spdlog.h>
+#include <filesystem>
+#include <sstream>
+#include <iomanip>
 
 namespace bandplan {
     std::map<std::string, BandPlan_t> bandplans;

core/src/gui/bandplan.h

@@ -1,11 +1,7 @@
 #pragma once
 #include <json.hpp>
-#include <fstream>
-#include <spdlog/spdlog.h>
-#include <filesystem>
-#include <sstream>
-#include <iomanip>
 #include <imgui/imgui.h>
+#include <stdint.h>
 
 using nlohmann::json;
 

core/src/gui/dialogs/credits.cpp

@@ -1,6 +1,7 @@
 #include <gui/dialogs/credits.h>
 #include <imgui.h>
 #include <gui/icons.h>
+#include <config.h>
 
 namespace credits {
     ImFont* bigFont;

core/src/gui/frequency_select.cpp

@@ -1,4 +1,5 @@
 #include <gui/frequency_select.h>
+#include <config.h>
 
 bool isInArea(ImVec2 val, ImVec2 min, ImVec2 max) {
     return val.x >= min.x && val.x < max.x && val.y >= min.y && val.y < max.y;

core/src/gui/frequency_select.h

@@ -2,7 +2,6 @@
 #include <imgui.h>
 #include <imgui_internal.h>
 #include <stdint.h>
-#include <config.h>
 
 class FrequencySelect {
 public:

core/src/gui/gui.h

@@ -8,4 +8,6 @@ namespace gui {
     SDRPP_EXPORT ImGui::WaterFall waterfall;
     SDRPP_EXPORT FrequencySelect freqSelect;
     SDRPP_EXPORT Menu menu;
+
+    void selectSource(std::string name);
 };

core/src/gui/icons.cpp

@@ -1,4 +1,7 @@
 #include <gui/icons.h>
+#include <stdint.h>
+#include <GL/glew.h>
+#include <config.h>
 
 #define STB_IMAGE_IMPLEMENTATION
 #include <imgui/stb_image.h>

core/src/gui/icons.h

@@ -1,8 +1,7 @@
 #pragma once
 #include <imgui/imgui.h>
-#include <stdint.h>
 #include <GL/glew.h>
-#include <config.h>
+#include <string>
 
 namespace icons {
     extern ImTextureID LOGO;

core/src/gui/main_window.cpp

@@ -1,5 +1,40 @@
 #include <gui/main_window.h>
 #include <gui/gui.h>
+#include "imgui.h"
+#include "imgui_impl_glfw.h"
+#include "imgui_impl_opengl3.h"
+#include <stdio.h>
+#include <GL/glew.h>
+#include <GLFW/glfw3.h>
+#include <imgui_plot.h>
+#include <dsp/resampling.h>
+#include <dsp/demodulator.h>
+#include <dsp/filter.h>
+#include <thread>
+#include <complex>
+#include <dsp/source.h>
+#include <dsp/math.h>
+#include <gui/waterfall.h>
+#include <gui/frequency_select.h>
+#include <fftw3.h>
+#include <signal_path/dsp.h>
+#include <gui/icons.h>
+#include <gui/bandplan.h>
+#include <watcher.h>
+#include <module.h>
+#include <signal_path/vfo_manager.h>
+#include <signal_path/audio.h>
+#include <gui/style.h>
+#include <config.h>
+#include <signal_path/signal_path.h>
+#include <core.h>
+#include <gui/menus/source.h>
+#include <gui/menus/display.h>
+#include <gui/menus/bandplan.h>
+#include <gui/menus/audio.h>
+#include <gui/menus/scripting.h>
+#include <gui/dialogs/credits.h>
+#include <signal_path/source.h>
 
 std::thread worker;
 std::mutex fft_mtx;
@@ -106,7 +141,6 @@ void windowInit() {
     gui::waterfall.setWaterfallMax(fftMax);
 
     float frequency = core::configManager.conf["frequency"];
-    
 
     gui::freqSelect.setFrequency(frequency);
     gui::freqSelect.frequencyChanged = false;
@@ -459,12 +493,4 @@ void drawWindow() {
     if (showCredits) {
         credits::show();
     }
-}
-
-void bindVolumeVariable(float* vol) {
-    volume = vol;
-}
-
-void unbindVolumeVariable() {
-    volume = &dummyVolume;
 }

core/src/gui/main_window.h

@@ -1,43 +1,7 @@
 #pragma once
 #include "imgui.h"
-#include "imgui_impl_glfw.h"
-#include "imgui_impl_opengl3.h"
-#include <stdio.h>
-#include <GL/glew.h>
-#include <GLFW/glfw3.h>
-#include <imgui_plot.h>
-#include <dsp/resampling.h>
-#include <dsp/demodulator.h>
-#include <dsp/filter.h>
-#include <thread>
-#include <complex>
-#include <dsp/source.h>
-#include <dsp/math.h>
-#include <gui/waterfall.h>
-#include <gui/frequency_select.h>
-#include <fftw3.h>
-#include <signal_path/dsp.h>
-#include <gui/icons.h>
-#include <gui/bandplan.h>
-#include <watcher.h>
-#include <module.h>
-#include <signal_path/vfo_manager.h>
-#include <signal_path/audio.h>
-#include <gui/style.h>
-#include <config.h>
-#include <signal_path/signal_path.h>
-#include <core.h>
-#include <gui/menus/source.h>
-#include <gui/menus/display.h>
-#include <gui/menus/bandplan.h>
-#include <gui/menus/audio.h>
-#include <gui/menus/scripting.h>
-#include <gui/dialogs/credits.h>
-#include <signal_path/source.h>
 
 #define WINDOW_FLAGS    ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoBackground
 
 void windowInit();
-void drawWindow();
-void bindVolumeVariable(float* vol);
-void unbindVolumeVariable();
+void drawWindow();

core/src/gui/menu.cpp

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

core/src/gui/menu.h

@@ -1,5 +1,4 @@
 #pragma once
-#include <imgui/imgui.h>
 #include <string>
 #include <vector>
 #include <map>

core/src/gui/menus/scripting.cpp

@@ -1,6 +1,7 @@
 #include <gui/menus/scripting.h>
 #include <core.h>
 #include <gui/style.h>
+#include <imgui/imgui.h>
 
 namespace scriptingmenu {
     void init() {

core/src/gui/style.cpp

@@ -1,4 +1,7 @@
 #include <gui/style.h>
+#include <imgui.h>
+#include <imgui_internal.h>
+#include <config.h>
 
 namespace style {
     void setDefaultStyle() {

core/src/gui/style.h

@@ -1,7 +1,4 @@
 #pragma once
-#include <imgui.h>
-#include <imgui_internal.h>
-#include <config.h>
 
 namespace style {
     void setDefaultStyle();

core/src/gui/waterfall.cpp

@@ -1,4 +1,9 @@
 #include <gui/waterfall.h>
+#include <imgui.h>
+#include <imgui_internal.h>
+#include <GL/glew.h>
+#include <imutils.h>
+#include <algorithm>
 
 float COLOR_MAP[][3] = {
     {0x00, 0x00, 0x20},

core/src/gui/waterfall.h

@@ -1,12 +1,10 @@
 #pragma once
-#include <imgui.h>
-#include <imgui_internal.h>
 #include <vector>
 #include <mutex>
-#include <GL/glew.h>
-#include <imutils.h>
 #include <gui/bandplan.h>
-#include <algorithm>
+#include <imgui/imgui.h>
+#include <imgui/imgui_internal.h>
+#include <GL/glew.h>
 
 #define WATERFALL_RESOLUTION    1000000