Multi vfo upstream

.github/workflows/build.yml

@@ -91,7 +91,7 @@ jobs:
           sudo chown -R runner:admin /usr/local/
           brew update
           brew install --HEAD librtlsdr
-          brew install airspy airspyhf boost dylibbundler gnuradio hackrf libbladerf libserialport portaudio pybind11 six soapyremote uhd qt@6 || true
+          brew install airspy airspyhf boost dylibbundler gnuradio hackrf libbladerf libserialport portaudio pybind11 six soapyremote uhd libsndfile qt@6 || true
 
           cd /tmp
           git clone https://github.com/analogdevicesinc/libiio.git

.github/workflows/ci.yml

@@ -77,7 +77,7 @@ jobs:
           # for https://github.com/actions/runner-images/issues/9272
           sudo chown -R runner:admin /usr/local/
           brew update
-          brew install airspy boost gnuradio hackrf libbladerf librtlsdr pybind11 six uhd qt@6 || true
+          brew install airspy boost gnuradio hackrf libbladerf librtlsdr pybind11 six uhd libsndfile qt@6 || true
 
           cd /tmp
           git clone https://gitea.osmocom.org/sdr/gr-osmosdr.git

CMakeLists.txt

@@ -138,6 +138,7 @@ endif()
 
 include(FindPkgConfig)
 find_package(Gnuradio-osmosdr REQUIRED)
+find_package(SNDFILE REQUIRED)
 
 set(GR_REQUIRED_COMPONENTS RUNTIME ANALOG AUDIO BLOCKS DIGITAL FILTER FFT PMT)
 find_package(Gnuradio REQUIRED COMPONENTS analog audio blocks digital filter fft network)

README.md

@@ -110,6 +110,7 @@ To compile gqrx from source you need the following dependencies:
     - Network
     - Widgets
     - Svg (runtime-only)
+- libsndfile
 - cmake version >= 3.2.0
 
 Gqrx can be compiled from within Qt Creator or in a terminal:

cmake/Modules/FindSNDFILE.cmake

@@ -0,0 +1,34 @@
+find_package(PkgConfig)
+PKG_CHECK_MODULES(PC_SNDFILE "sndfile")
+
+FIND_PATH(SNDFILE_INCLUDE_DIRS
+    NAMES sndfile.h
+    HINTS ${PC_SNDFILE_INCLUDE_DIR}
+    ${CMAKE_INSTALL_PREFIX}/include
+    PATHS
+    /usr/local/include
+    /usr/include
+)
+
+FIND_LIBRARY(SNDFILE_LIBRARIES
+    NAMES sndfile ${SNDFILE_LIBRARY_NAME}
+    HINTS ${PC_SNDFILE_LIBDIR}
+    ${CMAKE_INSTALL_PREFIX}/lib
+    ${CMAKE_INSTALL_PREFIX}/lib64
+    PATHS
+    ${SNDFILE_INCLUDE_DIRS}/../lib
+    /usr/local/lib
+    /usr/lib
+)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SNDFILE DEFAULT_MSG SNDFILE_LIBRARIES SNDFILE_INCLUDE_DIRS)
+MARK_AS_ADVANCED(SNDFILE_LIBRARIES SNDFILE_INCLUDE_DIRS)
+
+if (SNDFILE_FOUND AND NOT TARGET sndfile::sndfile)
+  add_library(sndfile::sndfile INTERFACE IMPORTED)
+  set_target_properties(sndfile::sndfile PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${SNDFILE_INCLUDE_DIRS}"
+    INTERFACE_LINK_LIBRARIES "${SNDFILE_LIBRARIES}"
+  )
+endif()

resources/icons.qrc

@@ -1,25 +1,28 @@
 <RCC>
-    <qresource prefix="/icons">
-        <file>icons/audio-card.svg</file>
-        <file>icons/bookmark-new.svg</file>
-        <file>icons/clear.svg</file>
-        <file>icons/clock.svg</file>
-        <file>icons/close.svg</file>
-        <file>icons/document.svg</file>
-        <file>icons/flash.svg</file>
-        <file>icons/folder.svg</file>
-        <file>icons/fullscreen.svg</file>
-        <file>icons/floppy.svg</file>
-        <file>icons/gqrx.svg</file>
-        <file>icons/help.svg</file>
-        <file>icons/info.svg</file>
-        <file>icons/play.svg</file>
-        <file>icons/power-off.svg</file>
-        <file>icons/record.svg</file>
-        <file>icons/refresh.svg</file>
-        <file>icons/settings.svg</file>
-        <file>icons/signal.svg</file>
-        <file>icons/tangeo-network-idle.svg</file>
-        <file>icons/terminal.svg</file>
-    </qresource>
+  <qresource prefix="/icons">
+    <file>icons/lock.svg</file>
+    <file>icons/remove.svg</file>
+    <file>icons/add.svg</file>
+    <file>icons/audio-card.svg</file>
+    <file>icons/bookmark-new.svg</file>
+    <file>icons/clear.svg</file>
+    <file>icons/clock.svg</file>
+    <file>icons/close.svg</file>
+    <file>icons/document.svg</file>
+    <file>icons/flash.svg</file>
+    <file>icons/folder.svg</file>
+    <file>icons/fullscreen.svg</file>
+    <file>icons/floppy.svg</file>
+    <file>icons/gqrx.svg</file>
+    <file>icons/help.svg</file>
+    <file>icons/info.svg</file>
+    <file>icons/play.svg</file>
+    <file>icons/power-off.svg</file>
+    <file>icons/record.svg</file>
+    <file>icons/refresh.svg</file>
+    <file>icons/settings.svg</file>
+    <file>icons/signal.svg</file>
+    <file>icons/tangeo-network-idle.svg</file>
+    <file>icons/terminal.svg</file>
+  </qresource>
 </RCC>