Merge remote-tracking branch 'upstream/master'

Mr-Precise · Mr-Precise · commit e845268cb588 · 2024-04-02T04:17:52.000+03:00
diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml
@@ -92,9 +92,6 @@ jobs:
         
         - name: Create Build Environment
           run: cmake -E make_directory ${{runner.workspace}}/build
-          
-        - name: Update brew repositories
-          run: brew update
 
         - name: Install dependencies
           run: brew install pkg-config libusb fftw glfw airspy airspyhf portaudio hackrf libbladerf codec2 zstd autoconf automake libtool && pip3 install mako
@@ -103,7 +100,7 @@ jobs:
           run: git clone --recursive https://github.com/gnuradio/volk && cd volk && mkdir build && cd build && cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=Release .. && make -j3 && sudo make install && cd ../../
 
         - name: Install SDRplay API
-          run: wget https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.12.1.pkg && sudo installer -pkg SDRplayAPI-macos-installer-universal-3.12.1.pkg -target /
+          run: wget https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.14.0.pkg && sudo installer -pkg SDRplayAPI-macos-installer-universal-3.14.0.pkg -target /
 
         - name: Install libiio
           run: wget https://github.com/analogdevicesinc/libiio/archive/refs/tags/v0.25.zip && 7z x v0.25.zip && cd libiio-0.25 && mkdir build && cd build && cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=Release .. && make -j3 && sudo make install && cd ../../
@@ -146,18 +143,15 @@ jobs:
         
         - name: Create Build Environment
           run: cmake -E make_directory ${{runner.workspace}}/build
-          
-        - name: Update brew repositories
-          run: brew update
 
         - name: Install dependencies
-          run: brew install pkg-config libusb fftw glfw airspy airspyhf portaudio hackrf libbladerf codec2 zstd autoconf automake libtool && pip3 install mako
+          run: brew install pkg-config libusb fftw glfw airspy airspyhf portaudio hackrf libbladerf codec2 zstd autoconf automake libtool && pip3 install mako --break-system-packages
 
         - name: Install volk
           run: git clone --recursive https://github.com/gnuradio/volk && cd volk && mkdir build && cd build && cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=Release .. && make -j3 && sudo make install && cd ../../
 
         - name: Install SDRplay API
-          run: wget https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.12.1.pkg && sudo installer -pkg SDRplayAPI-macos-installer-universal-3.12.1.pkg -target /
+          run: wget https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.14.0.pkg && sudo installer -pkg SDRplayAPI-macos-installer-universal-3.14.0.pkg -target /
 
         - name: Install libiio
           run: wget https://github.com/analogdevicesinc/libiio/archive/refs/tags/v0.25.zip && 7z x v0.25.zip && cd libiio-0.25 && mkdir build && cd build && cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=Release .. && make -j3 && sudo make install && cd ../../
diff --git a/core/src/gui/main_window.cpp b/core/src/gui/main_window.cpp
@@ -463,6 +463,8 @@ void MainWindow::draw() {
         }
     }
 
+    // Process menu keybinds
+    displaymenu::checkKeybinds();
 
     // Left Column
     lockWaterfallControls = false;
@@ -574,20 +576,20 @@ void MainWindow::draw() {
         // Handle scrollwheel
         int wheel = ImGui::GetIO().MouseWheel;
         if (wheel != 0 && (gui::waterfall.mouseInFFT || gui::waterfall.mouseInWaterfall)) {
-            // Select factor depending on modifier keys
-            double interval;
-            if (ImGui::IsKeyDown(ImGuiKey_LeftShift)) {
-                interval = vfo->snapInterval * 10.0;
-            }
-            else if (ImGui::IsKeyDown(ImGuiKey_LeftAlt)) {
-                interval = vfo->snapInterval * 0.1;
-            }
-            else {
-                interval = vfo->snapInterval;
-            }
-
             double nfreq;
             if (vfo != NULL) {
+                // Select factor depending on modifier keys
+                double interval;
+                if (ImGui::IsKeyDown(ImGuiKey_LeftShift)) {
+                    interval = vfo->snapInterval * 10.0;
+                }
+                else if (ImGui::IsKeyDown(ImGuiKey_LeftAlt)) {
+                    interval = vfo->snapInterval * 0.1;
+                }
+                else {
+                    interval = vfo->snapInterval;
+                }
+
                 nfreq = gui::waterfall.getCenterFrequency() + vfo->generalOffset + (interval * wheel);
                 nfreq = roundl(nfreq / interval) * interval;
             }
diff --git a/core/src/gui/menus/display.cpp b/core/src/gui/menus/display.cpp
@@ -127,15 +127,24 @@ namespace displaymenu {
         uiScaleId = uiScales.valueId(style::uiScale);
     }
 
+    void setWaterfallShown(bool shown) {
+        showWaterfall = shown;
+        showWaterfall ? gui::waterfall.showWaterfall() : gui::waterfall.hideWaterfall();
+        core::configManager.acquire();
+        core::configManager.conf["showWaterfall"] = showWaterfall;
+        core::configManager.release(true);
+    }
+
+    void checkKeybinds() {
+        if (ImGui::IsKeyPressed(ImGuiKey_Home, false)) {
+            setWaterfallShown(!showWaterfall);
+        }
+    }
+
     void draw(void* ctx) {
         float menuWidth = ImGui::GetContentRegionAvail().x;
-        bool homePressed = ImGui::IsKeyPressed(ImGuiKey_Home, false);
-        if (ImGui::Checkbox("Show Waterfall##_sdrpp", &showWaterfall) || homePressed) {
-            if (homePressed) { showWaterfall = !showWaterfall; }
-            showWaterfall ? gui::waterfall.showWaterfall() : gui::waterfall.hideWaterfall();
-            core::configManager.acquire();
-            core::configManager.conf["showWaterfall"] = showWaterfall;
-            core::configManager.release(true);
+        if (ImGui::Checkbox("Show Waterfall##_sdrpp", &showWaterfall)) {
+            setWaterfallShown(showWaterfall);
         }
 
         if (ImGui::Checkbox("Full Waterfall Update##_sdrpp", &fullWaterfallUpdate)) {
diff --git a/core/src/gui/menus/display.h b/core/src/gui/menus/display.h
@@ -2,5 +2,6 @@
 
 namespace displaymenu {
     void init();
+    void checkKeybinds();
     void draw(void* ctx);
 }
diff --git a/core/src/signal_path/source.cpp b/core/src/signal_path/source.cpp
@@ -84,7 +84,7 @@ void SourceManager::tune(double freq) {
     if (selectedHandler == NULL) {
         return;
     }
-    // TODO: No need to always retune the hardware in panadpter mode
+    // TODO: No need to always retune the hardware in Panadapter mode
     selectedHandler->tuneHandler(((tuneMode == TuningMode::NORMAL) ? freq : ifFreq) + tuneOffset, selectedHandler->ctx);
     onRetune.emit(freq);
     currentFreq = freq;
@@ -100,7 +100,7 @@ void SourceManager::setTuningMode(TuningMode mode) {
     tune(currentFreq);
 }
 
-void SourceManager::setPanadpterIF(double freq) {
+void SourceManager::setPanadapterIF(double freq) {
     ifFreq = freq;
     tune(currentFreq);
 }
diff --git a/core/src/signal_path/source.h b/core/src/signal_path/source.h
@@ -35,7 +35,7 @@ class SourceManager {
     void tune(double freq);
     void setTuningOffset(double offset);
     void setTuningMode(TuningMode mode);
-    void setPanadpterIF(double freq);
+    void setPanadapterIF(double freq);
 
     std::vector<std::string> getSourceNames();
 
diff --git a/docker_builds/debian_bookworm/do_build.sh b/docker_builds/debian_bookworm/do_build.sh
@@ -9,10 +9,10 @@ apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk2-dev
             libcodec2-dev autoconf libtool xxd
 
 # Install SDRPlay libraries
-wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.12.1.run
-7z x ./SDRplay_RSP_API-Linux-3.12.1.run
-7z x ./SDRplay_RSP_API-Linux-3.12.1
-cp x86_64/libsdrplay_api.so.3.12 /usr/lib/libsdrplay_api.so
+wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.14.0.run
+7z x ./SDRplay_RSP_API-Linux-3.14.0.run
+7z x ./SDRplay_RSP_API-Linux-3.14.0
+cp x86_64/libsdrplay_api.so.3.14 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
 # Install libperseus
diff --git a/docker_builds/debian_bullseye/do_build.sh b/docker_builds/debian_bullseye/do_build.sh
@@ -9,10 +9,10 @@ apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk2-dev
             libcodec2-dev autoconf libtool xxd
 
 # Install SDRPlay libraries
-wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.12.1.run
-7z x ./SDRplay_RSP_API-Linux-3.12.1.run
-7z x ./SDRplay_RSP_API-Linux-3.12.1
-cp x86_64/libsdrplay_api.so.3.12 /usr/lib/libsdrplay_api.so
+wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.14.0.run
+7z x ./SDRplay_RSP_API-Linux-3.14.0.run
+7z x ./SDRplay_RSP_API-Linux-3.14.0
+cp x86_64/libsdrplay_api.so.3.14 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
 # Install libperseus
diff --git a/docker_builds/debian_buster/do_build.sh b/docker_builds/debian_buster/do_build.sh
@@ -9,10 +9,10 @@ apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk1-dev
             libcodec2-dev autoconf libtool xxd
 
 # Install SDRPlay libraries
-wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.12.1.run
-7z x ./SDRplay_RSP_API-Linux-3.12.1.run
-7z x ./SDRplay_RSP_API-Linux-3.12.1
-cp x86_64/libsdrplay_api.so.3.12 /usr/lib/libsdrplay_api.so
+wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.14.0.run
+7z x ./SDRplay_RSP_API-Linux-3.14.0.run
+7z x ./SDRplay_RSP_API-Linux-3.14.0
+cp x86_64/libsdrplay_api.so.3.14 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
 # Install libperseus
diff --git a/docker_builds/debian_sid/do_build.sh b/docker_builds/debian_sid/do_build.sh
@@ -9,10 +9,10 @@ apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk-dev l
             libcodec2-dev autoconf libtool xxd
 
 # Install SDRPlay libraries
-wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.12.1.run
-7z x ./SDRplay_RSP_API-Linux-3.12.1.run
-7z x ./SDRplay_RSP_API-Linux-3.12.1
-cp x86_64/libsdrplay_api.so.3.12 /usr/lib/libsdrplay_api.so
+wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.14.0.run
+7z x ./SDRplay_RSP_API-Linux-3.14.0.run
+7z x ./SDRplay_RSP_API-Linux-3.14.0
+cp x86_64/libsdrplay_api.so.3.14 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
 # Install libperseus
diff --git a/docker_builds/ubuntu_bionic/do_build.sh b/docker_builds/ubuntu_bionic/do_build.sh
@@ -15,10 +15,10 @@ apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk1-dev
             libcodec2-dev libudev-dev autoconf libtool xxd
 
 # Install SDRPlay libraries
-wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.12.1.run
-7z x ./SDRplay_RSP_API-Linux-3.12.1.run
-7z x ./SDRplay_RSP_API-Linux-3.12.1
-cp x86_64/libsdrplay_api.so.3.12 /usr/lib/libsdrplay_api.so
+wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.14.0.run
+7z x ./SDRplay_RSP_API-Linux-3.14.0.run
+7z x ./SDRplay_RSP_API-Linux-3.14.0
+cp x86_64/libsdrplay_api.so.3.14 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
 # Install a more recent libusb version
diff --git a/docker_builds/ubuntu_focal/do_build.sh b/docker_builds/ubuntu_focal/do_build.sh
@@ -9,10 +9,10 @@ apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk2-dev
             libcodec2-dev autoconf libtool xxd
 
 # Install SDRPlay libraries
-wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.12.1.run
-7z x ./SDRplay_RSP_API-Linux-3.12.1.run
-7z x ./SDRplay_RSP_API-Linux-3.12.1
-cp x86_64/libsdrplay_api.so.3.12 /usr/lib/libsdrplay_api.so
+wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.14.0.run
+7z x ./SDRplay_RSP_API-Linux-3.14.0.run
+7z x ./SDRplay_RSP_API-Linux-3.14.0
+cp x86_64/libsdrplay_api.so.3.14 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
 # Install libperseus
diff --git a/docker_builds/ubuntu_jammy/do_build.sh b/docker_builds/ubuntu_jammy/do_build.sh
@@ -9,10 +9,10 @@ apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk2-dev
             libcodec2-dev autoconf libtool xxd
 
 # Install SDRPlay libraries
-wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.12.1.run
-7z x ./SDRplay_RSP_API-Linux-3.12.1.run
-7z x ./SDRplay_RSP_API-Linux-3.12.1
-cp x86_64/libsdrplay_api.so.3.12 /usr/lib/libsdrplay_api.so
+wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.14.0.run
+7z x ./SDRplay_RSP_API-Linux-3.14.0.run
+7z x ./SDRplay_RSP_API-Linux-3.14.0
+cp x86_64/libsdrplay_api.so.3.14 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
 # Install libperseus
diff --git a/docker_builds/ubuntu_mantic/do_build.sh b/docker_builds/ubuntu_mantic/do_build.sh
@@ -9,10 +9,10 @@ apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libvolk-dev l
             libcodec2-dev autoconf libtool xxd
 
 # Install SDRPlay libraries
-wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.12.1.run
-7z x ./SDRplay_RSP_API-Linux-3.12.1.run
-7z x ./SDRplay_RSP_API-Linux-3.12.1
-cp x86_64/libsdrplay_api.so.3.12 /usr/lib/libsdrplay_api.so
+wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.14.0.run
+7z x ./SDRplay_RSP_API-Linux-3.14.0.run
+7z x ./SDRplay_RSP_API-Linux-3.14.0
+cp x86_64/libsdrplay_api.so.3.14 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
 # Install libperseus
diff --git a/macos/bundle_utils.sh b/macos/bundle_utils.sh
@@ -26,7 +26,8 @@ bundle_is_not_to_be_installed() {
     if [ "$1" = "CFNetwork" ]; then echo 1; fi
     if [ "$1" = "SystemConfiguration" ]; then echo 1; fi
     if [ "$1" = "Security" ]; then echo 1; fi
-    if [ "$1" = "AppleFSCompression" ]; then echo 1; fi    
+    if [ "$1" = "AppleFSCompression" ]; then echo 1; fi
+    if [ "$1" = "libsdrplay_api.so.3.14" ]; then echo 1; fi
 }
 
 # ========================= FOR INTERNAL USE ONLY =========================
diff --git a/misc_modules/rigctl_client/src/main.cpp b/misc_modules/rigctl_client/src/main.cpp
@@ -86,7 +86,7 @@ class RigctlClientModule : public ModuleManager::Instance {
         }
 
         // Switch source to panadapter mode
-        sigpath::sourceManager.setPanadpterIF(ifFreq);
+        sigpath::sourceManager.setPanadapterIF(ifFreq);
         sigpath::sourceManager.setTuningMode(SourceManager::TuningMode::PANADAPTER);
         sigpath::sourceManager.onRetune.bindHandler(&_retuneHandler);
 
@@ -131,7 +131,7 @@ class RigctlClientModule : public ModuleManager::Instance {
         ImGui::FillWidth();
         if (ImGui::InputDouble(CONCAT("##_rigctl_if_freq_", _this->name), &_this->ifFreq, 100.0, 100000.0, "%.0f")) {
             if (_this->running) {
-                sigpath::sourceManager.setPanadpterIF(_this->ifFreq);
+                sigpath::sourceManager.setPanadapterIF(_this->ifFreq);
             }
             config.acquire();
             config.conf[_this->name]["ifFreq"] = _this->ifFreq;
diff --git a/readme.md b/readme.md
@@ -333,6 +333,7 @@ Modules in beta are still included in releases for the most part but not enabled
 |----------------------|------------|-------------------|--------------------------------|:---------------:|:-----------------------:|:---------------------------:|
 | airspy_source        | Working    | libairspy         | OPT_BUILD_AIRSPY_SOURCE        | ✅              | ✅                     | ✅                         |
 | airspyhf_source      | Working    | libairspyhf       | OPT_BUILD_AIRSPYHF_SOURCE      | ✅              | ✅                     | ✅                         |
+| audio_source         | Working    | rtaudio           | OPT_BUILD_AUDIO_SOURCE         | ✅              | ✅                     | ✅                         |
 | bladerf_source       | Working    | libbladeRF        | OPT_BUILD_BLADERF_SOURCE       | ⛔              | ✅ (not Debian Buster) | ✅                         |
 | file_source          | Working    | -                 | OPT_BUILD_FILE_SOURCE          | ✅              | ✅                     | ✅                         |
 | hackrf_source        | Working    | libhackrf         | OPT_BUILD_HACKRF_SOURCE        | ✅              | ✅                     | ✅                         |
diff --git a/root/res/bandplans/germany.json b/root/res/bandplans/germany.json
diff --git a/source_modules/usrp_source/src/main.cpp b/source_modules/usrp_source/src/main.cpp

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,6 @@`
`2`	`2`
`3`	`3`	`namespace displaymenu {`
`4`	`4`	`void init();`
	`5`	`+ void checkKeybinds();`
`5`	`6`	`void draw(void* ctx);`
`6`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ void SourceManager::tune(double freq) {`
`84`	`84`	`if (selectedHandler == NULL) {`
`85`	`85`	`return;`
`86`	`86`	`}`
`87`		`- // TODO: No need to always retune the hardware in panadpter mode`
	`87`	`+ // TODO: No need to always retune the hardware in Panadapter mode`
`88`	`88`	`selectedHandler->tuneHandler(((tuneMode == TuningMode::NORMAL) ? freq : ifFreq) + tuneOffset, selectedHandler->ctx);`
`89`	`89`	`onRetune.emit(freq);`
`90`	`90`	`currentFreq = freq;`
`@@ -100,7 +100,7 @@ void SourceManager::setTuningMode(TuningMode mode) {`
`100`	`100`	`tune(currentFreq);`
`101`	`101`	`}`
`102`	`102`
`103`		`-void SourceManager::setPanadpterIF(double freq) {`
	`103`	`+void SourceManager::setPanadapterIF(double freq) {`
`104`	`104`	`ifFreq = freq;`
`105`	`105`	`tune(currentFreq);`
`106`	`106`	`}`