Removed all obsolete references to devicesourceapi.h and devicesinkapi.h

plugins/channelrx/chanalyzer/chanalyzergui.cpp

@@ -18,7 +18,6 @@
 #include <QDockWidget>
 #include <QMainWindow>
 
-#include "device/devicesourceapi.h"
 #include "device/deviceuiset.h"
 #include "dsp/downchannelizer.h"
 #include "dsp/threadedbasebandsamplesink.h"

plugins/channelrx/demodam/amdemodgui.cpp

@@ -22,7 +22,6 @@
 #include "amdemodgui.h"
 #include "amdemodssbdialog.h"
 
-#include "device/devicesourceapi.h"
 #include "device/deviceuiset.h"
 #include "dsp/downchannelizer.h"
 #include "dsp/dspengine.h"

plugins/channelrx/demodatv/atvdemodgui.cpp

@@ -21,7 +21,6 @@
 
 #include "atvdemodgui.h"
 
-#include "device/devicesourceapi.h"
 #include "device/deviceuiset.h"
 #include "dsp/downchannelizer.h"
 

plugins/channelrx/demodbfm/bfmdemodgui.cpp

@@ -18,7 +18,6 @@
 
 #include "bfmdemodgui.h"
 
-#include <device/devicesourceapi.h>
 #include "device/deviceuiset.h"
 #include <dsp/downchannelizer.h>
 #include <QDockWidget>

plugins/channelrx/demoddatv/datvdemodgui.cpp

@@ -23,9 +23,7 @@
 
 #include "datvdemodgui.h"
 
-#include "device/devicesourceapi.h"
 #include "device/deviceuiset.h"
-#include "device/devicesourceapi.h"
 #include "dsp/downchannelizer.h"
 
 #include "dsp/threadedbasebandsamplesink.h"

plugins/channelrx/demoddsd/dsddemodgui.cpp

@@ -18,9 +18,8 @@
 
 #include "dsddemodgui.h"
 
-#include <device/devicesourceapi.h>
 #include "device/deviceuiset.h"
-#include <dsp/downchannelizer.h>
+#include "dsp/downchannelizer.h"
 
 #include "dsp/threadedbasebandsamplesink.h"
 #include "ui_dsddemodgui.h"

plugins/channelrx/demoddsd/dsddemodplugin.cpp

@@ -18,7 +18,6 @@
 
 #include "dsddemodplugin.h"
 
-#include <device/devicesourceapi.h>
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
 #ifndef SERVER_MODE

plugins/channelrx/demodfreedv/freedvdemodgui.cpp

@@ -19,7 +19,6 @@
 
 #include "freedvdemodgui.h"
 
-#include "device/devicesourceapi.h"
 #include "device/deviceuiset.h"
 
 #include "dsp/spectrumvis.h"

plugins/channelrx/demodfreedv/freedvplugin.cpp

@@ -17,7 +17,6 @@
 
 #include <QtPlugin>
 
-#include "device/devicesourceapi.h"
 #include "plugin/pluginapi.h"
 #ifndef SERVER_MODE
 #include "freedvdemodgui.h"

plugins/channelrx/demodlora/lorademodgui.cpp

@@ -1,5 +1,4 @@
 
-#include <device/devicesourceapi.h>
 #include "device/deviceuiset.h"
 #include <dsp/downchannelizer.h>
 #include <QDockWidget>

plugins/channelrx/demodnfm/nfmdemodgui.cpp

@@ -1,6 +1,5 @@
 #include "nfmdemodgui.h"
 
-#include <device/devicesourceapi.h>
 #include "device/deviceuiset.h"
 #include <QDockWidget>
 #include <QMainWindow>

plugins/channelrx/demodssb/ssbdemodgui.cpp

@@ -2,7 +2,6 @@
 
 #include "ssbdemodgui.h"
 
-#include <device/devicesourceapi.h>
 #include "device/deviceuiset.h"
 
 #include "ui_ssbdemodgui.h"

plugins/channelrx/demodssb/ssbplugin.cpp

@@ -1,6 +1,5 @@
 #include "ssbplugin.h"
 
-#include <device/devicesourceapi.h>
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
 #ifndef SERVER_MODE

plugins/channelrx/demodwfm/wfmdemodgui.cpp

@@ -1,8 +1,8 @@
 #include "wfmdemodgui.h"
 
-#include <device/devicesourceapi.h>
 #include "device/deviceuiset.h"
-#include <dsp/downchannelizer.h>
+#include "dsp/downchannelizer.h"
+
 #include <QDockWidget>
 #include <QMainWindow>
 #include <QDebug>

plugins/channelrx/freqtracker/freqtrackergui.cpp

@@ -21,7 +21,6 @@
 
 #include "freqtrackergui.h"
 
-#include "device/devicesourceapi.h"
 #include "device/deviceuiset.h"
 #include "dsp/downchannelizer.h"
 #include "dsp/dspengine.h"

plugins/channelrx/localsink/localsinkgui.cpp

@@ -17,7 +17,6 @@
 
 #include <QLocale>
 
-#include "device/devicesourceapi.h"
 #include "device/deviceuiset.h"
 #include "gui/basicchannelsettingsdialog.h"
 #include "dsp/hbfilterchainconverter.h"

plugins/channelrx/remotesink/remotesinkgui.cpp

@@ -17,7 +17,6 @@
 
 #include <QLocale>
 
-#include "device/devicesourceapi.h"
 #include "device/deviceuiset.h"
 #include "gui/basicchannelsettingsdialog.h"
 #include "dsp/hbfilterchainconverter.h"

plugins/channelrx/udpsink/udpsinkgui.cpp

@@ -16,7 +16,6 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////
 
-#include "device/devicesourceapi.h"
 #include "device/deviceuiset.h"
 #include "plugin/pluginapi.h"
 #include "dsp/spectrumvis.h"

plugins/channeltx/modam/ammodgui.cpp

@@ -21,7 +21,6 @@
 #include <QTime>
 #include <QDebug>
 
-#include "device/devicesinkapi.h"
 #include "device/deviceuiset.h"
 #include "dsp/upchannelizer.h"
 

plugins/channeltx/modatv/atvmodgui.cpp

@@ -24,7 +24,6 @@
 
 #include <cmath>
 
-#include "device/devicesinkapi.h"
 #include "device/deviceuiset.h"
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"

plugins/channeltx/modfreedv/freedvmodgui.cpp

@@ -23,7 +23,6 @@
 
 #include "freedvmodgui.h"
 
-#include "device/devicesinkapi.h"
 #include "device/deviceuiset.h"
 #include "dsp/spectrumvis.h"
 #include "plugin/pluginapi.h"

plugins/channeltx/modnfm/nfmmodgui.cpp

@@ -21,7 +21,6 @@
 #include <QTime>
 #include <QDebug>
 
-#include "device/devicesinkapi.h"
 #include "device/deviceuiset.h"
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"

plugins/channeltx/modssb/ssbmodgui.cpp

@@ -23,7 +23,6 @@
 
 #include "ssbmodgui.h"
 
-#include "device/devicesinkapi.h"
 #include "device/deviceuiset.h"
 #include "dsp/spectrumvis.h"
 #include "ui_ssbmodgui.h"

plugins/channeltx/modwfm/wfmmodgui.cpp

@@ -21,7 +21,6 @@
 #include <QTime>
 #include <QDebug>
 
-#include "device/devicesinkapi.h"
 #include "device/deviceuiset.h"
 #include "dsp/upchannelizer.h"
 #include "dsp/threadedbasebandsamplesource.h"

plugins/channeltx/udpsource/udpsourcegui.cpp

@@ -17,7 +17,6 @@
 
 #include "udpsourcegui.h"
 
-#include "device/devicesinkapi.h"
 #include "device/deviceuiset.h"
 #include "dsp/spectrumvis.h"
 #include "dsp/dspengine.h"

plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp

@@ -19,7 +19,6 @@
 #include <libbladeRF.h>
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-#include <device/devicesourceapi.h>
 
 #include "bladerf1outputplugin.h"
 

plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp

@@ -19,7 +19,6 @@
 #include <libbladeRF.h>
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-#include "device/devicesourceapi.h"
 
 #include "bladerf2outputplugin.h"
 

plugins/samplesink/filesink/filesinkplugin.cpp

@@ -19,7 +19,6 @@
 
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-#include "device/devicesinkapi.h"
 
 #ifdef SERVER_MODE
 #include "filesinkoutput.h"

plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp

@@ -18,7 +18,6 @@
 #include <QtPlugin>
 #include "libhackrf/hackrf.h"
 
-#include "device/devicesourceapi.h"
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
 

plugins/samplesink/limesdroutput/limesdroutputplugin.cpp

@@ -23,7 +23,6 @@
 #include "lime/LimeSuite.h"
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-#include "device/devicesinkapi.h"
 #include "limesdr/devicelimesdrparam.h"
 
 #ifdef SERVER_MODE

plugins/samplesink/remoteoutput/remoteoutputplugin.cpp

@@ -19,7 +19,6 @@
 
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-#include "device/devicesinkapi.h"
 
 #ifdef SERVER_MODE
 #include "remoteoutput.h"

plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp

@@ -19,7 +19,6 @@
 
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-#include "device/devicesourceapi.h"
 #include "soapysdr/devicesoapysdr.h"
 
 #include "soapysdroutputplugin.h"

plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp

@@ -23,7 +23,6 @@
 #include "xtrx_api.h"
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-#include "device/devicesinkapi.h"
 #include "xtrx/devicextrxparam.h"
 
 #ifdef SERVER_MODE

plugins/samplesource/airspy/airspyplugin.cpp

@@ -25,7 +25,6 @@
 #endif
 #include "airspyplugin.h"
 
-#include <device/devicesourceapi.h>
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
 

plugins/samplesource/airspyhf/airspyhfplugin.cpp

@@ -18,7 +18,6 @@
 #include <QtPlugin>
 #include <libairspyhf/airspyhf.h>
 
-#include <device/devicesourceapi.h>
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
 #include "airspyhfplugin.h"

plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp

@@ -21,7 +21,6 @@
 #include <libbladeRF.h>
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-#include <device/devicesourceapi.h>
 
 #ifdef SERVER_MODE
 #include "bladerf1input.h"

plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp

@@ -21,7 +21,6 @@
 #include <libbladeRF.h>
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-#include <device/devicesourceapi.h>
 
 #ifdef SERVER_MODE
 #include "bladerf2input.h"

plugins/samplesource/fcdpro/fcdproplugin.cpp

@@ -20,8 +20,6 @@
 #include "util/simpleserializer.h"
 #include "fcdproplugin.h"
 
-#include <device/devicesourceapi.h>
-
 #ifdef SERVER_MODE
 #include "fcdproinput.h"
 #else

plugins/samplesource/fcdproplus/fcdproplusplugin.cpp

@@ -20,8 +20,6 @@
 #include "util/simpleserializer.h"
 #include "fcdproplusplugin.h"
 
-#include <device/devicesourceapi.h>
-
 #ifdef SERVER_MODE
 #include "fcdproplusinput.h"
 #else

plugins/samplesource/filesource/filesourceplugin.cpp

@@ -19,7 +19,6 @@
 
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-#include <device/devicesourceapi.h>
 
 #ifdef SERVER_MODE
 #include "filesourceinput.h"

plugins/samplesource/hackrfinput/hackrfinputplugin.cpp

@@ -19,8 +19,6 @@
 #include <QtPlugin>
 #include "libhackrf/hackrf.h"
 
-#include <device/devicesourceapi.h>
-
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
 

plugins/samplesource/limesdrinput/limesdrinputplugin.cpp

@@ -23,7 +23,6 @@
 #include "lime/LimeSuite.h"
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-#include "device/devicesourceapi.h"
 
 #ifdef SERVER_MODE
 #include "limesdrinput.h"

plugins/samplesource/localinput/localinputplugin.cpp

@@ -19,7 +19,6 @@
 
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-#include "device/devicesourceapi.h"
 
 #ifdef SERVER_MODE
 #include "localinput.h"

plugins/samplesource/perseus/perseusplugin.cpp

@@ -18,11 +18,11 @@
 #include <QtPlugin>
 #include "perseus-sdr.h"
 
-#include <device/devicesourceapi.h>
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
 #include "perseus/deviceperseus.h"
 #include "perseusplugin.h"
+
 #ifdef SERVER_MODE
 #include "perseusinput.h"
 #else

plugins/samplesource/remoteinput/remoteinputplugin.cpp

@@ -19,7 +19,6 @@
 
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-#include "device/devicesourceapi.h"
 
 #ifdef SERVER_MODE
 #include "remoteinput.h"

plugins/samplesource/rtlsdr/rtlsdrplugin.cpp

@@ -3,7 +3,6 @@
 
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-#include <device/devicesourceapi.h>
 
 #ifdef SERVER_MODE
 #include "rtlsdrinput.h"

plugins/samplesource/sdrplay/sdrplayplugin.cpp

@@ -19,13 +19,13 @@
 #include <mirisdr.h>
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
+
 #ifdef SERVER_MODE
 #include "sdrplayinput.h"
 #else
 #include "sdrplaygui.h"
 #endif
 #include "sdrplayplugin.h"
-#include <device/devicesourceapi.h>
 
 const PluginDescriptor SDRPlayPlugin::m_pluginDescriptor = {
     QString("SDRPlay RSP1 Input"),

plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp

@@ -18,7 +18,6 @@
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-#include "device/devicesourceapi.h"
 #include "soapysdr/devicesoapysdr.h"
 
 #include "soapysdrinputplugin.h"

plugins/samplesource/testsource/testsourceplugin.cpp

@@ -19,7 +19,6 @@
 
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-#include <device/devicesourceapi.h>
 
 #ifdef SERVER_MODE
 #include "testsourceinput.h"

plugins/samplesource/xtrxinput/xtrxinputplugin.cpp

@@ -26,7 +26,6 @@
 #include "xtrx_api.h"
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-#include "device/devicesourceapi.h"
 
 #ifdef SERVER_MODE
 #include "xtrxinput.h"

sdrbase/device/deviceapi.cpp

@@ -17,8 +17,8 @@
 
 #include "plugin/plugininstancegui.h"
 #include "plugin/plugininterface.h"
-#include "device/devicesourceapi.h"
+#include "dsp/dspdevicesourceengine.h"
-#include "device/devicesinkapi.h"
+#include "dsp/dspdevicesinkengine.h"
 #include "dsp/dspengine.h"
 #include "dsp/devicesamplesource.h"
 #include "dsp/devicesamplesink.h"

sdrbase/plugin/pluginmanager.cpp

@@ -23,8 +23,6 @@
 #include <cstdio>
 
 #include <plugin/plugininstancegui.h>
-#include "device/devicesourceapi.h"
-#include "device/devicesinkapi.h"
 #include "device/deviceenumerator.h"
 #include "settings/preset.h"
 #include "util/message.h"

sdrgui/device/deviceuiset.cpp

@@ -24,8 +24,6 @@
 #include "gui/samplingdevicecontrol.h"
 #include "dsp/dspdevicesourceengine.h"
 #include "dsp/dspdevicesinkengine.h"
-#include "device/devicesourceapi.h"
-#include "device/devicesinkapi.h"
 #include "plugin/plugininstancegui.h"
 #include "plugin/pluginapi.h"
 #include "plugin/plugininterface.h"

sdrgui/device/deviceuiset.h

@@ -33,6 +33,8 @@ class DeviceAPI;
 class DSPDeviceSinkEngine;
 class ChannelMarker;
 class PluginAPI;
+class PluginInstanceGUI;
+class Preset;
 
 class SDRGUI_API DeviceUISet
 {

sdrsrv/device/deviceset.cpp

@@ -17,8 +17,6 @@
 
 #include "dsp/dspdevicesourceengine.h"
 #include "dsp/dspdevicesinkengine.h"
-#include "device/devicesourceapi.h"
-#include "device/devicesinkapi.h"
 #include "plugin/pluginapi.h"
 #include "plugin/plugininterface.h"
 #include "settings/preset.h"