Temporarily disable building DATV plugins for MacOS CI

This is a temporary workaround to make CI succeed until the plugins code is modified to be compatible with a newer version of ffmpeg.
Fix CI for Mac OS
2024-04-26 23:04:12 +02:00 · 2024-04-26 22:57:41 +02:00 · 2024-04-25 00:23:12 +02:00 · 2024-04-23 20:23:07 +02:00 · 2024-04-22 23:05:04 +02:00 · 2024-04-22 22:42:00 +02:00
215 changed files with 98 additions and 227 deletions
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@ -121,11 +121,11 @@ jobs:
          rm -f /usr/local/bin/2to3
          brew install opencv
      - name: Install brew packages
-        run: brew install nasm boost hidapi libusb fftw ffmpeg faad2 zlib airspy airspyhf hackrf rtl-sdr libbladerf soapysdr qt
+        run: brew install nasm boost hidapi libusb fftw faad2 zlib airspy airspyhf hackrf rtl-sdr libbladerf soapysdr qt
      - name: Configure SDRangel
        run: |
          mkdir build && cd build
-          cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE
+          cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON -DENABLE_CHANNELRX_DEMODDATV=OFF -DENABLE_CHANNELTX_MODDATV=OFF -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE
      - name: Get filename
        id: get_filename
        run: echo "filename=$(grep CPACK_PACKAGE_FILE_NAME build/CMakeCache.txt | cut -d "=" -f2)" >> $GITHUB_OUTPUT
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -456,7 +456,7 @@ elseif(ANDROID)
  set(LIBDSDCC_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/dsdcc/lib/libdsdcc.so" CACHE INTERNAL "")

  set(FFMPEG_FOUND ON CACHE INTERNAL "")
-  set(FFMEG_SKIP_CHECK ON CACHE INTERNAL "")
+  set(FFMPEG_SKIP_CHECK ON CACHE INTERNAL "")
  set(FFMPEG_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/include" CACHE INTERNAL "")
  set(FFMPEG_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/bin" CACHE INTERNAL "")
  set(AVCODEC_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/include" CACHE INTERNAL "")
--- a/devices/bladerf1/devicebladerf1shared.h
+++ b/devices/bladerf1/devicebladerf1shared.h
@ -20,7 +20,6 @@
 #ifndef DEVICES_BLADERF_DEVICEHACKRFSHARED_H_
 #define DEVICES_BLADERF_DEVICEHACKRFSHARED_H_

-#include "util/message.h"
 #include "export.h"

 class DEVICES_API DeviceBladeRF1Shared
--- a/modemm17/Trellis.h
+++ b/modemm17/Trellis.h
@ -4,9 +4,6 @@

 #pragma once

-#include "Util.h"
-#include "Convolution.h"
-
 #include <array>
 #include <cstdlib>
 #include <cstdint>
--- a/modemm17/Viterbi.h
+++ b/modemm17/Viterbi.h
@ -2,7 +2,6 @@

 #pragma once

-#include "Trellis.h"
 #include "Convolution.h"
 #include "Util.h"

--- a/plugins/channelmimo/doa2/doa2baseband.h
+++ b/plugins/channelmimo/doa2/doa2baseband.h
@ -25,6 +25,7 @@
 #include <QRecursiveMutex>

 #include "dsp/samplemififo.h"
+#include "util/message.h"
 #include "util/messagequeue.h"
 #include "doa2streamsink.h"
 #include "doa2corr.h"
--- a/plugins/channelmimo/doa2/doa2corr.h
+++ b/plugins/channelmimo/doa2/doa2corr.h
@ -23,7 +23,6 @@

 #include "dsp/dsptypes.h"
 #include "dsp/fftwindow.h"
-#include "util/message.h"

 #include "doa2settings.h"

--- a/plugins/channelmimo/doa2/doa2webapiadapter.h
+++ b/plugins/channelmimo/doa2/doa2webapiadapter.h
@ -20,7 +20,6 @@

 #include "channel/channelwebapiadapter.h"
 #include "dsp/glscopesettings.h"
-#include "dsp/spectrumsettings.h"
 #include "doa2settings.h"

 /**
--- a/plugins/channelmimo/interferometer/interferometerbaseband.h
+++ b/plugins/channelmimo/interferometer/interferometerbaseband.h
@ -25,6 +25,7 @@
 #include <QRecursiveMutex>

 #include "dsp/samplemififo.h"
+#include "util/message.h"
 #include "util/messagequeue.h"
 #include "interferometerstreamsink.h"
 #include "interferometercorr.h"
--- a/plugins/channelmimo/interferometer/interferometercorr.h
+++ b/plugins/channelmimo/interferometer/interferometercorr.h
@ -23,7 +23,6 @@

 #include "dsp/dsptypes.h"
 #include "dsp/fftwindow.h"
-#include "util/message.h"

 #include "interferometersettings.h"

--- a/plugins/channelrx/CMakeLists.txt
+++ b/plugins/channelrx/CMakeLists.txt
@ -234,7 +234,7 @@ if(NOT SERVER_MODE)
      if(WIN32)
        add_subdirectory(demoddatv)
      else()
-        if(((AVUTIL_VERSION VERSION_GREATER "55.27.99") AND (AVCODEC_VERSION VERSION_GREATER "57.48.101")) OR FFMPEG_EXTERNAL OR FFMEG_SKIP_CHECK)
+        if(((AVUTIL_VERSION VERSION_GREATER "55.27.99") AND (AVCODEC_VERSION VERSION_GREATER "57.48.101")) OR FFMPEG_EXTERNAL OR FFMPEG_SKIP_CHECK)
            message(STATUS "Include demoddatv")
            add_subdirectory(demoddatv)
        else()
--- a/plugins/channelrx/chanalyzer/chanalyzer.h
+++ b/plugins/channelrx/chanalyzer/chanalyzer.h
@ -33,7 +33,6 @@
 #include "dsp/scopevis.h"
 #include "channel/channelapi.h"
 #include "util/message.h"
-#include "util/movingaverage.h"

 #include "chanalyzerbaseband.h"

--- a/plugins/channelrx/chanalyzer/chanalyzergui.h
+++ b/plugins/channelrx/chanalyzer/chanalyzergui.h
@ -23,7 +23,6 @@

 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/dsptypes.h"
 #include "util/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
--- a/plugins/channelrx/chanalyzer/chanalyzerwebapiadapter.h
+++ b/plugins/channelrx/chanalyzer/chanalyzerwebapiadapter.h
@ -19,8 +19,6 @@
 #define INCLUDE_CHANALYZER_WEBAPIADAPTER_H

 #include "channel/channelwebapiadapter.h"
-#include "dsp/glscopesettings.h"
-#include "dsp/spectrumsettings.h"
 #include "chanalyzersettings.h"

 /**
--- a/plugins/channelrx/demodadsb/adsbdemodgui.h
+++ b/plugins/channelrx/demodadsb/adsbdemodgui.h
@ -32,7 +32,6 @@
 #include "channel/channelgui.h"
 #include "dsp/dsptypes.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/aviationweather.h"
 #include "util/messagequeue.h"
 #include "util/azel.h"
@ -48,7 +47,6 @@
 #include "adsbdemodsettings.h"
 #include "util/ourairportsdb.h"
 #include "util/osndb.h"
-#include "util/airlines.h"

 class PluginAPI;
 class DeviceUISet;
--- a/plugins/channelrx/demodadsb/adsbdemodreport.h
+++ b/plugins/channelrx/demodadsb/adsbdemodreport.h
@ -23,7 +23,6 @@
 #include <QByteArray>
 #include <QDateTime>

-#include "dsp/dsptypes.h"
 #include "util/message.h"
 #include "adsbdemodstats.h"

--- a/plugins/channelrx/demodais/aisdemodsink.h
+++ b/plugins/channelrx/demodais/aisdemodsink.h
@ -26,10 +26,8 @@
 #include "dsp/phasediscri.h"
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
-#include "dsp/firfilter.h"
 #include "dsp/gaussian.h"
 #include "util/movingaverage.h"
-#include "util/doublebufferfifo.h"
 #include "util/messagequeue.h"
 #include "util/crc.h"

--- a/plugins/channelrx/demodam/amdemodgui.h
+++ b/plugins/channelrx/demodam/amdemodgui.h
@ -24,7 +24,6 @@

 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
 #include "amdemodsettings.h"
--- a/plugins/channelrx/demodam/amdemodsettings.h
+++ b/plugins/channelrx/demodam/amdemodsettings.h
@ -21,6 +21,7 @@
 #ifndef PLUGINS_CHANNELRX_DEMODAM_AMDEMODSETTINGS_H_
 #define PLUGINS_CHANNELRX_DEMODAM_AMDEMODSETTINGS_H_

+#include "dsp/dsptypes.h"
 #include <QByteArray>

 class Serializable;
--- a/plugins/channelrx/demodatv/atvdemod.cpp
+++ b/plugins/channelrx/demodatv/atvdemod.cpp
@ -26,6 +26,7 @@
 #include "device/deviceapi.h"

 #include "atvdemod.h"
+#include "dsp/dspcommands.h"

 MESSAGE_CLASS_DEFINITION(ATVDemod::MsgConfigureATVDemod, Message)

--- a/plugins/channelrx/demodatv/atvdemod.h
+++ b/plugins/channelrx/demodatv/atvdemod.h
@ -27,8 +27,6 @@

 #include "dsp/basebandsamplesink.h"
 #include "channel/channelapi.h"
-#include "dsp/devicesamplesource.h"
-#include "dsp/dspcommands.h"
 #include "util/message.h"

 #include "atvdemodbaseband.h"
--- a/plugins/channelrx/demodatv/atvdemodgui.cpp
+++ b/plugins/channelrx/demodatv/atvdemodgui.cpp
@ -24,6 +24,7 @@
 #include "atvdemodgui.h"

 #include "device/deviceuiset.h"
+#include "dsp/dspcommands.h"
 #include "dsp/scopevis.h"
 #include "dsp/glscopesettings.h"
 #include "gui/basicchannelsettingsdialog.h"
--- a/plugins/channelrx/demodatv/atvdemodsink.h
+++ b/plugins/channelrx/demodatv/atvdemodsink.h
@ -25,9 +25,7 @@

 #include "dsp/channelsamplesink.h"
 #include "dsp/nco.h"
-#include "dsp/interpolator.h"
 #include "dsp/fftfilt.h"
-#include "dsp/agc.h"
 #include "dsp/phaselock.h"
 #include "dsp/recursivefilters.h"
 #include "dsp/phasediscri.h"
--- a/plugins/channelrx/demodbfm/bfmdemodsink.h
+++ b/plugins/channelrx/demodbfm/bfmdemodsink.h
@ -27,7 +27,6 @@
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
 #include "dsp/firfilter.h"
-#include "dsp/movingaverage.h"
 #include "dsp/fftfilt.h"
 #include "dsp/phaselock.h"
 #include "dsp/filterrc.h"
--- a/plugins/channelrx/demodchirpchat/chirpchatdemodsink.h
+++ b/plugins/channelrx/demodchirpchat/chirpchatdemodsink.h
@ -25,7 +25,6 @@
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
 #include "dsp/fftwindow.h"
-#include "util/message.h"
 #include "util/movingaverage.h"

 #include "chirpchatdemodsettings.h"
--- a/plugins/channelrx/demoddab/dabdemodgui.cpp
+++ b/plugins/channelrx/demoddab/dabdemodgui.cpp
@ -40,7 +40,6 @@
 #include "maincore.h"

 #include "dabdemod.h"
-#include "dabdemodsink.h"

 // Table column indexes
 #define PROGRAMS_COL_NAME            0
--- a/plugins/channelrx/demoddab/dabdemodgui.h
+++ b/plugins/channelrx/demoddab/dabdemodgui.h
@ -25,7 +25,6 @@

 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
 #include "dabdemodsettings.h"
--- a/plugins/channelrx/demoddab/dabdemodsettings.h
+++ b/plugins/channelrx/demoddab/dabdemodsettings.h
@ -22,6 +22,9 @@
 #define INCLUDE_DABDEMODSETTINGS_H

 #include <QByteArray>
+#include <QString>
+
+#include "dsp/dsptypes.h"

 class Serializable;

--- a/plugins/channelrx/demoddatv/datvconstellation.h
+++ b/plugins/channelrx/demoddatv/datvconstellation.h
@ -23,6 +23,7 @@

 #include <vector>

+#include "leansdr/dvb.h"
 #include "leansdr/framework.h"
 #include "gui/tvscreen.h"

--- a/plugins/channelrx/demoddatv/datvdemod.cpp
+++ b/plugins/channelrx/demoddatv/datvdemod.cpp
@ -30,6 +30,7 @@
 #include "SWGChannelReport.h"

 #include "device/deviceapi.h"
+#include "dsp/dspcommands.h"
 #include "settings/serializable.h"

 #include "datvdemod.h"
--- a/plugins/channelrx/demoddatv/datvdemod.h
+++ b/plugins/channelrx/demoddatv/datvdemod.h
@ -29,8 +29,6 @@ class DeviceAPI;

 #include "channel/channelapi.h"
 #include "dsp/basebandsamplesink.h"
-#include "dsp/devicesamplesource.h"
-#include "dsp/dspcommands.h"
 #include "util/message.h"

 #include "datvdemodbaseband.h"
--- a/plugins/channelrx/demoddatv/datvdemodgui.h
+++ b/plugins/channelrx/demoddatv/datvdemodgui.h
@ -25,7 +25,6 @@

 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "settings/rollupstate.h"

 #include "datvdemod.h"
--- a/plugins/channelrx/demoddatv/datvdemodsink.h
+++ b/plugins/channelrx/demoddatv/datvdemodsink.h
@ -43,8 +43,6 @@
 #include "dsp/fftfilt.h"
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
-#include "dsp/movingaverage.h"
-#include "dsp/agc.h"
 #include "dsp/interpolator.h"
 #include "audio/audiofifo.h"
 #include "util/messagequeue.h"
--- a/plugins/channelrx/demoddatv/datvdvbs2constellation.h
+++ b/plugins/channelrx/demoddatv/datvdvbs2constellation.h
@ -24,6 +24,7 @@
 #include <vector>

 #include "leansdr/framework.h"
+#include "leansdr/sdr.h"
 #include "gui/tvscreen.h"

 namespace leansdr {
--- a/plugins/channelrx/demoddsc/dscdemod.h
+++ b/plugins/channelrx/demoddsc/dscdemod.h
@ -36,7 +36,6 @@
 #include "dsp/basebandsamplesink.h"
 #include "channel/channelapi.h"
 #include "util/message.h"
-#include "util/navtex.h"

 #include "dscdemodbaseband.h"
 #include "dscdemodsettings.h"
--- a/plugins/channelrx/demoddsc/dscdemodgui.h
+++ b/plugins/channelrx/demoddsc/dscdemodgui.h
@ -21,7 +21,6 @@

 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/aprsfi.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
--- a/plugins/channelrx/demodfreedv/freedvdemod.h
+++ b/plugins/channelrx/demodfreedv/freedvdemod.h
@ -30,7 +30,6 @@
 #include "dsp/spectrumvis.h"
 #include "channel/channelapi.h"
 #include "util/message.h"
-#include "util/doublebufferfifo.h"

 #include "freedvdemodbaseband.h"

--- a/plugins/channelrx/demodfreedv/freedvdemodgui.h
+++ b/plugins/channelrx/demodfreedv/freedvdemodgui.h
@ -25,7 +25,6 @@

 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
 #include "freedvdemodsettings.h"
--- a/plugins/channelrx/demodfreedv/freedvdemodsettings.h
+++ b/plugins/channelrx/demodfreedv/freedvdemodsettings.h
@ -25,6 +25,8 @@
 #include <QString>
 #include <stdint.h>

+#include "dsp/dsptypes.h"
+
 class Serializable;

 struct FreeDVDemodSettings
--- a/plugins/channelrx/demodft8/ft8demodgui.h
+++ b/plugins/channelrx/demodft8/ft8demodgui.h
@ -24,7 +24,6 @@

 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "util/ft8message.h"
 #include "settings/rollupstate.h"
--- a/plugins/channelrx/demodft8/ft8demodsink.h
+++ b/plugins/channelrx/demodft8/ft8demodsink.h
@ -25,7 +25,6 @@
 #include "dsp/interpolator.h"
 #include "dsp/fftfilt.h"
 #include "dsp/agc.h"
-#include "util/doublebufferfifo.h"

 #include "ft8demodsettings.h"

--- a/plugins/channelrx/demodils/ilsdemodgui.h
+++ b/plugins/channelrx/demodils/ilsdemodgui.h
@ -20,7 +20,6 @@

 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
 #include "ilsdemod.h"
--- a/plugins/channelrx/demodils/ilsdemodsettings.h
+++ b/plugins/channelrx/demodils/ilsdemodsettings.h
@ -23,6 +23,7 @@

 #include <QByteArray>

+#include "dsp/dsptypes.h"
 #include "util/baudot.h"

 class Serializable;
--- a/plugins/channelrx/demodils/ilsdemodsink.h
+++ b/plugins/channelrx/demodils/ilsdemodsink.h
@ -32,7 +32,6 @@
 #include "dsp/morsedemod.h"
 #include "audio/audiofifo.h"
 #include "util/movingaverage.h"
-#include "util/movingmaximum.h"
 #include "util/doublebufferfifo.h"
 #include "util/messagequeue.h"

--- a/plugins/channelrx/demodm17/m17demodfilters.h
+++ b/plugins/channelrx/demodm17/m17demodfilters.h
@ -24,7 +24,6 @@
 #define NXZEROS 134

 #include "dsp/iirfilter.h"
-#include "export.h"

 /**
 * This is a 2 pole lowpass Chebyshev (recursive) filter at fc=0.075 using coefficients found in table 20-1 of
--- a/plugins/channelrx/demodm17/m17demodgui.h
+++ b/plugins/channelrx/demodm17/m17demodgui.h
@ -26,9 +26,7 @@
 #include <QDateTime>

 #include "channel/channelgui.h"
-#include "dsp/dsptypes.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"

--- a/plugins/channelrx/demodm17/m17demodsettings.h
+++ b/plugins/channelrx/demodm17/m17demodsettings.h
@ -24,7 +24,7 @@
 #include <QByteArray>
 #include <QString>

-#include <dsp/dsptypes.h>
+#include "dsp/dsptypes.h"

 class Serializable;

--- a/plugins/channelrx/demodm17/m17demodsink.h
+++ b/plugins/channelrx/demodm17/m17demodsink.h
@ -24,9 +24,6 @@
 #include "dsp/phasediscri.h"
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
-#include "dsp/firfilter.h"
-#include "dsp/afsquelch.h"
-#include "dsp/afsquelch.h"
 #include "audio/audiofifo.h"
 #include "util/movingaverage.h"
 #include "util/doublebufferfifo.h"
--- a/plugins/channelrx/demodnavtex/navtexdemodgui.h
+++ b/plugins/channelrx/demodnavtex/navtexdemodgui.h
@ -21,7 +21,6 @@

 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
 #include "navtexdemod.h"
--- a/plugins/channelrx/demodnavtex/navtexdemodsettings.h
+++ b/plugins/channelrx/demodnavtex/navtexdemodsettings.h
@ -23,6 +23,8 @@

 #include <QByteArray>

+#include "dsp/dsptypes.h"
+
 class Serializable;

 // Number of columns in the table
--- a/plugins/channelrx/demodnfm/nfmdemodgui.h
+++ b/plugins/channelrx/demodnfm/nfmdemodgui.h
@ -23,7 +23,6 @@
 #include "channel/channelgui.h"
 #include "dsp/dsptypes.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"

--- a/plugins/channelrx/demodnfm/nfmdemodsettings.h
+++ b/plugins/channelrx/demodnfm/nfmdemodsettings.h
@ -23,6 +23,8 @@

 #include <stdint.h>

+#include "dsp/dsptypes.h"
+
 class Serializable;

 struct NFMDemodSettings
--- a/plugins/channelrx/demodnfm/nfmdemodsink.h
+++ b/plugins/channelrx/demodnfm/nfmdemodsink.h
@ -28,7 +28,6 @@
 #include "dsp/fftfilt.h"
 #include "dsp/firfilter.h"
 #include "dsp/afsquelch.h"
-#include "dsp/agc.h"
 #include "dsp/ctcssdetector.h"
 #include "dsp/dcscodes.h"
 #include "util/movingaverage.h"
--- a/plugins/channelrx/demodpacket/packetdemodgui.h
+++ b/plugins/channelrx/demodpacket/packetdemodgui.h
@ -31,7 +31,6 @@

 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
 #include "packetdemodsettings.h"
--- a/plugins/channelrx/demodpacket/packetdemodsettings.h
+++ b/plugins/channelrx/demodpacket/packetdemodsettings.h
@ -24,6 +24,8 @@
 #include <QByteArray>
 #include <QHash>

+#include "dsp/dsptypes.h"
+
 class Serializable;

 // Number of columns in the table
--- a/plugins/channelrx/demodpacket/packetdemodsink.h
+++ b/plugins/channelrx/demodpacket/packetdemodsink.h
@ -28,7 +28,6 @@
 #include "dsp/interpolator.h"
 #include "dsp/firfilter.h"
 #include "util/movingaverage.h"
-#include "util/doublebufferfifo.h"
 #include "util/messagequeue.h"
 #include "util/crc.h"

--- a/plugins/channelrx/demodradiosonde/radiosondedemodsink.h
+++ b/plugins/channelrx/demodradiosonde/radiosondedemodsink.h
@ -29,7 +29,6 @@
 #include "dsp/firfilter.h"
 #include "dsp/gaussian.h"
 #include "util/movingaverage.h"
-#include "util/doublebufferfifo.h"
 #include "util/messagequeue.h"
 #include "util/crc.h"

--- a/plugins/channelrx/demodrtty/rttydemodgui.h
+++ b/plugins/channelrx/demodrtty/rttydemodgui.h
@ -21,7 +21,6 @@

 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
 #include "rttydemod.h"
--- a/plugins/channelrx/demodrtty/rttydemodsettings.h
+++ b/plugins/channelrx/demodrtty/rttydemodsettings.h
@ -23,6 +23,7 @@

 #include <QByteArray>

+#include "dsp/dsptypes.h"
 #include "util/baudot.h"

 class Serializable;
--- a/plugins/channelrx/demodrtty/rttydemodsink.cpp
+++ b/plugins/channelrx/demodrtty/rttydemodsink.cpp
@ -21,6 +21,7 @@
 #include <complex.h>

 #include "dsp/dspengine.h"
+#include "dsp/fftfactory.h"
 #include "dsp/scopevis.h"
 #include "util/db.h"

--- a/plugins/channelrx/demodrtty/rttydemodsink.h
+++ b/plugins/channelrx/demodrtty/rttydemodsink.h
@ -25,11 +25,9 @@
 #include "dsp/interpolator.h"
 #include "dsp/firfilter.h"
 #include "dsp/raisedcosine.h"
-#include "dsp/fftfactory.h"
 #include "dsp/fftengine.h"
 #include "util/movingaverage.h"
 #include "util/movingmaximum.h"
-#include "util/doublebufferfifo.h"
 #include "util/messagequeue.h"

 #include "rttydemodsettings.h"
--- a/plugins/channelrx/demodssb/ssbdemodgui.h
+++ b/plugins/channelrx/demodssb/ssbdemodgui.h
@ -24,7 +24,6 @@

 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "gui/fftnrdialog.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
--- a/plugins/channelrx/demodvor/vordemodgui.h
+++ b/plugins/channelrx/demodvor/vordemodgui.h
@ -21,7 +21,6 @@

 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
 #include "vordemodsettings.h"
--- a/plugins/channelrx/demodvor/vordemodsettings.h
+++ b/plugins/channelrx/demodvor/vordemodsettings.h
@ -24,6 +24,8 @@
 #include <QByteArray>
 #include <QHash>

+#include "dsp/dsptypes.h"
+
 class Serializable;

 struct VORDemodSettings
--- a/plugins/channelrx/demodwfm/wfmdemodsettings.h
+++ b/plugins/channelrx/demodwfm/wfmdemodsettings.h
@ -23,6 +23,8 @@

 #include "dsp/dsptypes.h"

+#include "dsp/dsptypes.h"
+
 class Serializable;

 struct WFMDemodSettings
--- a/plugins/channelrx/demodwfm/wfmdemodsink.h
+++ b/plugins/channelrx/demodwfm/wfmdemodsink.h
@ -23,12 +23,10 @@
 #include "dsp/channelsamplesink.h"
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
-#include "dsp/firfilter.h"
 #include "util/movingaverage.h"
 #include "dsp/fftfilt.h"
 #include "dsp/phasediscri.h"
 #include "audio/audiofifo.h"
-#include "util/message.h"

 #include "wfmdemodsettings.h"

--- a/plugins/channelrx/freqscanner/freqscannersink.cpp
+++ b/plugins/channelrx/freqscanner/freqscannersink.cpp
@ -20,6 +20,7 @@
 #include <complex.h>

 #include "dsp/dspengine.h"
+#include "dsp/fftfactory.h"
 #include "util/db.h"

 #include "freqscanner.h"
--- a/plugins/channelrx/freqscanner/freqscannersink.h
+++ b/plugins/channelrx/freqscanner/freqscannersink.h
@ -25,7 +25,6 @@
 #include "dsp/channelsamplesink.h"
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
-#include "dsp/fftfactory.h"
 #include "dsp/fftengine.h"
 #include "dsp/fftwindow.h"
 #include "util/fixedaverage2d.h"
--- a/plugins/channelrx/freqtracker/freqtrackergui.h
+++ b/plugins/channelrx/freqtracker/freqtrackergui.h
@ -25,7 +25,6 @@

 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"

--- a/plugins/channelrx/freqtracker/freqtrackersink.h
+++ b/plugins/channelrx/freqtracker/freqtrackersink.h
@ -26,12 +26,8 @@
 #include "dsp/ncof.h"
 #include "dsp/interpolator.h"
 #include "util/movingaverage.h"
-#include "dsp/agc.h"
-#include "dsp/firfilter.h"
 #include "dsp/phaselockcomplex.h"
 #include "dsp/freqlockcomplex.h"
-#include "util/message.h"
-#include "util/doublebufferfifo.h"

 #include "freqtrackersettings.h"

--- a/plugins/channelrx/heatmap/heatmapgui.cpp
+++ b/plugins/channelrx/heatmap/heatmapgui.cpp
@ -36,6 +36,7 @@
 #include "plugin/pluginapi.h"
 #include "util/astronomy.h"
 #include "util/csv.h"
+#include "util/colormap.h"
 #include "util/db.h"
 #include "util/units.h"
 #include "gui/basicchannelsettingsdialog.h"
--- a/plugins/channelrx/heatmap/heatmapgui.h
+++ b/plugins/channelrx/heatmap/heatmapgui.h
@ -30,7 +30,6 @@
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
 #include "util/messagequeue.h"
-#include "util/colormap.h"
 #include "settings/rollupstate.h"

 #include "heatmapsettings.h"
--- a/plugins/channelrx/heatmap/heatmapsink.h
+++ b/plugins/channelrx/heatmap/heatmapsink.h
@ -24,15 +24,10 @@
 #include <QMutex>

 #include "dsp/channelsamplesink.h"
-#include "dsp/phasediscri.h"
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
-#include "dsp/firfilter.h"
-#include "dsp/gaussian.h"
 #include "util/movingaverage.h"
-#include "util/doublebufferfifo.h"
 #include "util/messagequeue.h"
-#include "util/crc.h"

 #include "heatmapsettings.h"

--- a/plugins/channelrx/localsink/localsinkworker.h
+++ b/plugins/channelrx/localsink/localsinkworker.h
@ -26,7 +26,6 @@
 #include <QMutex>
 #include <QWaitCondition>

-#include "dsp/dsptypes.h"
 #include "util/message.h"
 #include "util/messagequeue.h"

--- a/plugins/channelrx/noisefigure/noisefigure.cpp
+++ b/plugins/channelrx/noisefigure/noisefigure.cpp
@ -35,6 +35,7 @@

 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
+#include "settings/serializable.h"
 #include "util/interpolation.h"
 #include "channel/channelwebapiutils.h"

--- a/plugins/channelrx/noisefigure/noisefigurebaseband.h
+++ b/plugins/channelrx/noisefigure/noisefigurebaseband.h
@ -24,7 +24,6 @@
 #include <QRecursiveMutex>

 #include "dsp/samplesinkfifo.h"
-#include "dsp/scopevis.h"
 #include "util/message.h"
 #include "util/messagequeue.h"

--- a/plugins/channelrx/noisefigure/noisefiguresink.cpp
+++ b/plugins/channelrx/noisefigure/noisefiguresink.cpp
@ -21,6 +21,7 @@

 #include "dsp/dspengine.h"

+#include "dsp/fftfactory.h"
 #include "noisefigure.h"
 #include "noisefiguresink.h"

--- a/plugins/channelrx/noisefigure/noisefiguresink.h
+++ b/plugins/channelrx/noisefigure/noisefiguresink.h
@ -23,7 +23,6 @@
 #include <QVector>

 #include "dsp/channelsamplesink.h"
-#include "dsp/fftfactory.h"
 #include "dsp/fftengine.h"
 #include "util/movingaverage.h"
 #include "util/messagequeue.h"
--- a/plugins/channelrx/radioastronomy/radioastronomy.cpp
+++ b/plugins/channelrx/radioastronomy/radioastronomy.cpp
@ -37,6 +37,7 @@
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
 #include "channel/channelwebapiutils.h"
+#include "settings/serializable.h"
 #include "util/astronomy.h"
 #include "maincore.h"

--- a/plugins/channelrx/radioastronomy/radioastronomybaseband.h
+++ b/plugins/channelrx/radioastronomy/radioastronomybaseband.h
@ -23,7 +23,6 @@
 #include <QRecursiveMutex>

 #include "dsp/samplesinkfifo.h"
-#include "dsp/scopevis.h"
 #include "util/message.h"
 #include "util/messagequeue.h"

--- a/plugins/channelrx/radioastronomy/radioastronomysettings.h
+++ b/plugins/channelrx/radioastronomy/radioastronomysettings.h
@ -23,8 +23,6 @@
 #include <QString>
 #include <QDateTime>

-#include "dsp/dsptypes.h"
-
 class Serializable;

 // Number of columns in the tables
--- a/plugins/channelrx/radioclock/radioclocksink.h
+++ b/plugins/channelrx/radioclock/radioclocksink.h
@ -27,12 +27,7 @@
 #include "dsp/phasediscri.h"
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
-#include "dsp/firfilter.h"
-#include "dsp/fftfactory.h"
-#include "dsp/fftengine.h"
-#include "dsp/fftwindow.h"
 #include "util/movingaverage.h"
-#include "util/doublebufferfifo.h"
 #include "util/messagequeue.h"

 #include "radioclocksettings.h"
--- a/plugins/channelrx/remotetcpsink/remotetcpsinksink.h
+++ b/plugins/channelrx/remotetcpsink/remotetcpsinksink.h
@ -28,7 +28,6 @@
 #include "dsp/channelsamplesink.h"
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
-#include "channel/remotedatablock.h"
 #include "util/messagequeue.h"

 #include "remotetcpsinksettings.h"
--- a/plugins/channeltx/filesource/filesource.cpp
+++ b/plugins/channeltx/filesource/filesource.cpp
@ -39,6 +39,7 @@
 #include "maincore.h"

 #include "filesourcebaseband.h"
+#include "filesourcereport.h"

 MESSAGE_CLASS_DEFINITION(FileSource::MsgConfigureFileSource, Message)
 MESSAGE_CLASS_DEFINITION(FileSource::MsgConfigureFileSourceWork, Message)
--- a/plugins/channeltx/filesource/filesource.h
+++ b/plugins/channeltx/filesource/filesource.h
@ -36,9 +36,7 @@
 #include "dsp/basebandsamplesource.h"
 #include "channel/channelapi.h"
 #include "util/message.h"
-#include "util/movingaverage.h"
 #include "filesourcesettings.h"
-#include "filesourcereport.h"

 class QNetworkAccessManager;
 class QNetworkReply;
--- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsource.h
+++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsource.h
@ -27,11 +27,9 @@

 #include "dsp/channelsamplesource.h"
 #include "dsp/nco.h"
-#include "dsp/ncof.h"
 #include "dsp/interpolator.h"
 #include "dsp/firfilter.h"
 #include "dsp/raisedcosine.h"
-#include "dsp/fmpreemphasis.h"
 #include "util/lfsr.h"
 #include "util/movingaverage.h"
 #include "util/message.h"
--- a/plugins/channeltx/modais/aismodsource.h
+++ b/plugins/channeltx/modais/aismodsource.h
@ -28,9 +28,7 @@

 #include "dsp/channelsamplesource.h"
 #include "dsp/nco.h"
-#include "dsp/ncof.h"
 #include "dsp/interpolator.h"
-#include "dsp/firfilter.h"
 #include "dsp/gaussian.h"
 #include "util/movingaverage.h"

--- a/plugins/channeltx/moddatv/datvmodsource.h
+++ b/plugins/channeltx/moddatv/datvmodsource.h
@ -32,8 +32,6 @@
 #include "dsp/interpolator.h"
 #include "dsp/rootraisedcosine.h"
 #include "util/movingaverage.h"
-#include "dsp/fftfilt.h"
-#include "util/message.h"

 #include "datvmodsettings.h"

--- a/plugins/channeltx/modfreedv/freedvmod.h
+++ b/plugins/channeltx/modfreedv/freedvmod.h
@ -28,7 +28,6 @@
 #include <QNetworkRequest>

 #include "dsp/basebandsamplesource.h"
-#include "dsp/basebandsamplesink.h"
 #include "dsp/spectrumvis.h"
 #include "channel/channelapi.h"
 #include "util/message.h"
--- a/plugins/channeltx/modfreedv/freedvmodsource.h
+++ b/plugins/channeltx/modfreedv/freedvmodsource.h
@ -26,7 +26,6 @@
 #include <fstream>

 #include "dsp/channelsamplesource.h"
-#include "dsp/nco.h"
 #include "dsp/ncof.h"
 #include "dsp/interpolator.h"
 #include "dsp/fftfilt.h"
--- a/plugins/channeltx/modm17/m17modprocessor.h
+++ b/plugins/channeltx/modm17/m17modprocessor.h
@ -26,7 +26,6 @@
 #include <QByteArray>

 #include "M17Modulator.h"
-#include "dsp/dsptypes.h"
 #include "util/message.h"
 #include "util/messagequeue.h"
 #include "m17modfifo.h"
--- a/plugins/channeltx/modnfm/nfmmodsettings.h
+++ b/plugins/channeltx/modnfm/nfmmodsettings.h
@ -24,6 +24,7 @@
 #include <QByteArray>

 #include "dsp/cwkeyersettings.h"
+#include "dsp/dsptypes.h"

 class Serializable;

--- a/plugins/channeltx/modnfm/nfmmodsource.cpp
+++ b/plugins/channeltx/modnfm/nfmmodsource.cpp
@ -19,6 +19,7 @@
 #include <QDebug>

 #include "dsp/datafifo.h"
+#include "dsp/misc.h"
 #include "util/messagequeue.h"
 #include "maincore.h"

--- a/plugins/channeltx/modpacket/packetmodsource.h
+++ b/plugins/channeltx/modpacket/packetmodsource.h
@ -28,7 +28,6 @@

 #include "dsp/channelsamplesource.h"
 #include "dsp/nco.h"
-#include "dsp/ncof.h"
 #include "dsp/interpolator.h"
 #include "dsp/firfilter.h"
 #include "dsp/raisedcosine.h"
--- a/plugins/channeltx/modpsk31/psk31modsource.h
+++ b/plugins/channeltx/modpsk31/psk31modsource.h
@ -25,7 +25,6 @@

 #include "dsp/channelsamplesource.h"
 #include "dsp/nco.h"
-#include "dsp/ncof.h"
 #include "dsp/interpolator.h"
 #include "dsp/firfilter.h"
 #include "dsp/raisedcosine.h"
--- a/plugins/channeltx/modrtty/rttymodsource.h
+++ b/plugins/channeltx/modrtty/rttymodsource.h
@ -25,7 +25,6 @@

 #include "dsp/channelsamplesource.h"
 #include "dsp/nco.h"
-#include "dsp/ncof.h"
 #include "dsp/interpolator.h"
 #include "dsp/firfilter.h"
 #include "dsp/raisedcosine.h"
--- a/plugins/channeltx/modssb/ssbmod.h
+++ b/plugins/channeltx/modssb/ssbmod.h
@ -30,7 +30,6 @@
 #include "dsp/basebandsamplesource.h"
 #include "dsp/spectrumvis.h"
 #include "channel/channelapi.h"
-#include "dsp/basebandsamplesink.h"
 #include "util/message.h"

 #include "ssbmodsettings.h"
--- a/plugins/channeltx/modssb/ssbmodsettings.h
+++ b/plugins/channeltx/modssb/ssbmodsettings.h
@ -26,6 +26,7 @@
 #include <stdint.h>

 #include "dsp/cwkeyersettings.h"
+#include "dsp/dsptypes.h"

 class Serializable;

--- a/plugins/channeltx/modwfm/wfmmodsettings.h
+++ b/plugins/channeltx/modwfm/wfmmodsettings.h
@ -24,6 +24,7 @@
 #include <QByteArray>

 #include "dsp/cwkeyersettings.h"
+#include "dsp/dsptypes.h"

 class Serializable;

--- a/plugins/channeltx/udpsource/udpsource.h
+++ b/plugins/channeltx/udpsource/udpsource.h
@ -26,7 +26,6 @@
 #include "dsp/basebandsamplesource.h"
 #include "dsp/spectrumvis.h"
 #include "channel/channelapi.h"
-#include "dsp/basebandsamplesink.h"
 #include "util/message.h"

 #include "udpsourcesettings.h"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daniele Forsi	954748f452	Temporarily disable building DATV plugins for MacOS CI This is a temporary workaround to make CI succeed until the plugins code is modified to be compatible with a newer version of ffmpeg.	2024-04-26 23:04:12 +02:00
Daniele Forsi	6f107cd915	Fix CI for Mac OS Build ffmpeg as external project to work around missing includes: /Users/runner/work/sdrangel/sdrangel/plugins/channelrx/demoddatv/datvideorender.cpp:282:46: error: no member named 'channels' in 'AVCodecContext' (and similar)	2024-04-26 22:57:41 +02:00
Edouard Griffiths	5e321e3ead	Merge pull request #2068 from dforsi/feature/map-feature Feature/map feature	2024-04-25 00:23:12 +02:00
Daniele Forsi	991ccddb66	Close any open dialog when sdrangel quits	2024-04-23 20:23:07 +02:00
Daniele Forsi	b4ec43e4aa	Raise the Beacon, IBP Beacons an Radio Time dialogs Make the dialogs visible again if they are open but are hidden behind the main window or another application's window.	2024-04-22 23:05:04 +02:00
Daniele Forsi	f4b2dfc0a9	Revert "Prevent the dialogs to be hidden behind the main window" This reverts commit `f72574d1ad`.	2024-04-22 22:42:00 +02:00
Daniele Forsi	f72574d1ad	Prevent the dialogs to be hidden behind the main window This also menas that when the main window is closed, the dialogs get closed automatically, and not only when the map window is closed.	2024-04-22 22:39:19 +02:00
Daniele Forsi	230c461204	Update the IPB beacons table only when the dialog is visible	2024-04-22 22:39:19 +02:00
Edouard Griffiths	dac9b9a5b3	Merge pull request #2080 from dforsi/fix/cmakefiles Fix typos in CMakeLists	2024-04-22 19:30:24 +02:00
Daniele Forsi	90e917f666	Fix typos in CMakeLists s/FFMEG/FFMPEG/	2024-04-21 21:41:42 +02:00
Edouard Griffiths	4d43e53272	Merge pull request #2076 from dforsi/fix/includes Fix/includes	2024-04-21 11:15:46 +02:00
Daniele Forsi	fd830a0153	Fix build of DAB demodulation plugin	2024-04-20 22:00:16 +02:00
Edouard Griffiths	ba4c8a42fc	Merge pull request #2075 from dforsi/fix/warnings Fix "More '%' conversions than data arguments"	2024-04-20 20:28:34 +02:00
Daniele Forsi	004811d83d	Make all include directives identical Fixes the 5 includes that are different from the majority: grep -Ehr "#include .+export" --include=*.h \| sort \| uniq -c 769 #include "export.h" 5 #include "../../exports/export.h"	2024-04-20 19:19:21 +02:00
Daniele Forsi	fe84c20aff	Make all include directives identical Fixes the 5 includes that are different from the majority: grep -Ehr "#include .+dsptypes" --include=*.h \| sort \| uniq -c 110 #include "dsp/dsptypes.h" 1 #include <dsp/dsptypes.h> 4 #include "dsptypes.h"	2024-04-20 19:19:11 +02:00
Daniele Forsi	570c1f6877	Remove unused includes and use more direct includes	2024-04-20 19:10:18 +02:00