From b97a2ecffb3e1887a1fa3d17a5a89a6968bbca73 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 25 May 2016 02:33:50 +0200 Subject: [PATCH] Multi device support: Windows support --- plugins/samplesource/airspy/airspy.pro | 2 +- plugins/samplesource/bladerf/bladerf.pro | 2 +- plugins/samplesource/filesource/filesource.pro | 2 +- plugins/samplesource/hackrf/hackrf.pro | 2 +- plugins/samplesource/rtlsdr/rtlsdr.pro | 2 +- plugins/samplesource/sdrdaemon/sdrdaemon.pro | 2 +- sdrbase/sdrbase.pro | 5 +++++ 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/plugins/samplesource/airspy/airspy.pro b/plugins/samplesource/airspy/airspy.pro index a75e72bb1..475d012e9 100644 --- a/plugins/samplesource/airspy/airspy.pro +++ b/plugins/samplesource/airspy/airspy.pro @@ -7,7 +7,7 @@ TEMPLATE = lib CONFIG += plugin -QT += core gui widgets multimedia +QT += core gui widgets multimedia opengl TARGET = inputairspy diff --git a/plugins/samplesource/bladerf/bladerf.pro b/plugins/samplesource/bladerf/bladerf.pro index 29eade701..a9b81ffe4 100644 --- a/plugins/samplesource/bladerf/bladerf.pro +++ b/plugins/samplesource/bladerf/bladerf.pro @@ -7,7 +7,7 @@ TEMPLATE = lib CONFIG += plugin -QT += core gui widgets multimedia +QT += core gui widgets multimedia opengl TARGET = inputbladerf diff --git a/plugins/samplesource/filesource/filesource.pro b/plugins/samplesource/filesource/filesource.pro index c09b49f24..68a735c29 100644 --- a/plugins/samplesource/filesource/filesource.pro +++ b/plugins/samplesource/filesource/filesource.pro @@ -7,7 +7,7 @@ TEMPLATE = lib CONFIG += plugin -QT += core gui widgets multimedia +QT += core gui widgets multimedia opengl TARGET = inputfilesource INCLUDEPATH += $$PWD diff --git a/plugins/samplesource/hackrf/hackrf.pro b/plugins/samplesource/hackrf/hackrf.pro index 6841e47ed..fcf4e810e 100644 --- a/plugins/samplesource/hackrf/hackrf.pro +++ b/plugins/samplesource/hackrf/hackrf.pro @@ -7,7 +7,7 @@ TEMPLATE = lib CONFIG += plugin -QT += core gui widgets multimedia +QT += core gui widgets multimedia opengl TARGET = inputhackrf diff --git a/plugins/samplesource/rtlsdr/rtlsdr.pro b/plugins/samplesource/rtlsdr/rtlsdr.pro index 4d5211b5d..df781b2de 100644 --- a/plugins/samplesource/rtlsdr/rtlsdr.pro +++ b/plugins/samplesource/rtlsdr/rtlsdr.pro @@ -7,7 +7,7 @@ TEMPLATE = lib CONFIG += plugin -QT += core gui widgets multimedia +QT += core gui widgets multimedia opengl TARGET = inputrtlsdr diff --git a/plugins/samplesource/sdrdaemon/sdrdaemon.pro b/plugins/samplesource/sdrdaemon/sdrdaemon.pro index 9cbfbedbf..d90c39baf 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemon.pro +++ b/plugins/samplesource/sdrdaemon/sdrdaemon.pro @@ -7,7 +7,7 @@ TEMPLATE = lib CONFIG += plugin -QT += core gui widgets multimedia network +QT += core gui widgets multimedia network opengl TARGET = inputsdrdaemon diff --git a/sdrbase/sdrbase.pro b/sdrbase/sdrbase.pro index f568af84a..9af98ab89 100644 --- a/sdrbase/sdrbase.pro +++ b/sdrbase/sdrbase.pro @@ -30,6 +30,7 @@ SOURCES += mainwindow.cpp\ audio/audiodeviceinfo.cpp\ audio/audiofifo.cpp\ audio/audiooutput.cpp\ + device/deviceapi.cpp\ dsp/afsquelch.cpp\ dsp/agc.cpp\ dsp/channelizer.cpp\ @@ -77,6 +78,7 @@ SOURCES += mainwindow.cpp\ gui/audiodialog.cpp\ gui/presetitem.cpp\ gui/rollupwidget.cpp\ + gui/samplingdevicecontrol.cpp\ gui/scale.cpp\ gui/scaleengine.cpp\ gui/valuedial.cpp\ @@ -100,6 +102,7 @@ HEADERS += mainwindow.h\ audio/audiodeviceinfo.h\ audio/audiofifo.h\ audio/audiooutput.h\ + device/deviceapi.h\ dsp/afsquelch.h\ dsp/channelizer.h\ dsp/channelmarker.h\ @@ -153,6 +156,7 @@ HEADERS += mainwindow.h\ gui/pluginsdialog.h\ gui/presetitem.h\ gui/rollupwidget.h\ + gui/samplingdevicecontrol.h\ gui/scale.h\ gui/scaleengine.h\ gui/valuedial.h\ @@ -182,6 +186,7 @@ FORMS += mainwindow.ui\ gui/glscopegui.ui\ gui/aboutdialog.ui\ gui/pluginsdialog.ui\ + gui/samplingdevicecontrol.ui\ gui/glspectrumgui.ui\ mainwindow.ui