From a5ce09f19cee4e72ef4d9b721f27090314acc77e Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 29 Dec 2017 00:33:37 +0100 Subject: [PATCH] Server: plugins: completed GUI cleanup --- .../samplesink/filesink/filesinkoutput.cpp | 1 - .../samplesink/filesink/filesinkplugin.cpp | 18 +++++++++++++-- .../limesdroutput/limesdroutputplugin.cpp | 5 ++++- .../filesource/filesourceinput.cpp | 1 - .../filesource/filesourceplugin.cpp | 22 +++++++++++++++---- .../limesdrinput/limesdrinputplugin.cpp | 8 ++++--- plugins/samplesource/rtlsdr/rtlsdrinput.cpp | 1 - plugins/samplesource/rtlsdr/rtlsdrplugin.cpp | 9 +++++--- pluginssrv/samplesink/filesink/CMakeLists.txt | 1 - .../samplesink/limesdroutput/CMakeLists.txt | 3 --- .../samplesource/filesource/CMakeLists.txt | 1 - .../samplesource/limesdrinput/CMakeLists.txt | 3 --- pluginssrv/samplesource/rtlsdr/CMakeLists.txt | 2 -- 13 files changed, 49 insertions(+), 26 deletions(-) diff --git a/plugins/samplesink/filesink/filesinkoutput.cpp b/plugins/samplesink/filesink/filesinkoutput.cpp index 0680928eb..33f715607 100644 --- a/plugins/samplesink/filesink/filesinkoutput.cpp +++ b/plugins/samplesink/filesink/filesinkoutput.cpp @@ -28,7 +28,6 @@ #include "device/devicesinkapi.h" -#include "filesinkgui.h" #include "filesinkoutput.h" #include "filesinkthread.h" diff --git a/plugins/samplesink/filesink/filesinkplugin.cpp b/plugins/samplesink/filesink/filesinkplugin.cpp index 895b5eb11..1944c6bed 100644 --- a/plugins/samplesink/filesink/filesinkplugin.cpp +++ b/plugins/samplesink/filesink/filesinkplugin.cpp @@ -15,12 +15,16 @@ /////////////////////////////////////////////////////////////////////////////////// #include -#include + #include "plugin/pluginapi.h" #include "util/simpleserializer.h" - #include "device/devicesinkapi.h" + +#ifdef SERVER_MODE +#include "filesinkoutput.h" +#else #include "filesinkgui.h" +#endif #include "filesinkplugin.h" const PluginDescriptor FileSinkPlugin::m_pluginDescriptor = { @@ -68,6 +72,15 @@ PluginInterface::SamplingDevices FileSinkPlugin::enumSampleSinks() return result; } +#ifdef SERVER_MODE +PluginInstanceGUI* FileSinkPlugin::createSampleSinkPluginInstanceGUI( + const QString& sinkId __attribute((unused)), + QWidget **widget __attribute((unused)), + DeviceUISet *deviceUISet __attribute((unused))) +{ + return 0; +} +#else PluginInstanceGUI* FileSinkPlugin::createSampleSinkPluginInstanceGUI( const QString& sinkId, QWidget **widget, @@ -84,6 +97,7 @@ PluginInstanceGUI* FileSinkPlugin::createSampleSinkPluginInstanceGUI( return 0; } } +#endif DeviceSampleSink* FileSinkPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI) { diff --git a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp index f882189cc..f334a89ba 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp @@ -15,7 +15,6 @@ /////////////////////////////////////////////////////////////////////////////////// #include -#include #include #include @@ -26,7 +25,11 @@ #include "device/devicesinkapi.h" #include "limesdr/devicelimesdrparam.h" +#ifdef SERVER_MODE +#include "limesdroutput.h" +#else #include "limesdroutputgui.h" +#endif #include "limesdroutputplugin.h" const PluginDescriptor LimeSDROutputPlugin::m_pluginDescriptor = { diff --git a/plugins/samplesource/filesource/filesourceinput.cpp b/plugins/samplesource/filesource/filesourceinput.cpp index a587479e8..8a6b79b72 100644 --- a/plugins/samplesource/filesource/filesourceinput.cpp +++ b/plugins/samplesource/filesource/filesourceinput.cpp @@ -28,7 +28,6 @@ #include "dsp/filerecord.h" #include "device/devicesourceapi.h" -#include "filesourcegui.h" #include "filesourceinput.h" #include "filesourcethread.h" diff --git a/plugins/samplesource/filesource/filesourceplugin.cpp b/plugins/samplesource/filesource/filesourceplugin.cpp index 97eee6697..8154143f1 100644 --- a/plugins/samplesource/filesource/filesourceplugin.cpp +++ b/plugins/samplesource/filesource/filesourceplugin.cpp @@ -15,14 +15,18 @@ /////////////////////////////////////////////////////////////////////////////////// #include -#include + #include "plugin/pluginapi.h" #include "util/simpleserializer.h" - -#include "filesourcegui.h" -#include "filesourceplugin.h" #include +#ifdef SERVER_MODE +#include "filesourceinput.h" +#else +#include "filesourcegui.h" +#endif +#include "filesourceplugin.h" + const PluginDescriptor FileSourcePlugin::m_pluginDescriptor = { QString("File source input"), QString("3.9.0"), @@ -68,6 +72,15 @@ PluginInterface::SamplingDevices FileSourcePlugin::enumSampleSources() return result; } +#ifdef SERVER_MODE +PluginInstanceGUI* FileSourcePlugin::createSampleSourcePluginInstanceGUI( + const QString& sourceId __attribute__((unused)), + QWidget **widget __attribute__((unused)), + DeviceUISet *deviceUISet __attribute__((unused))) +{ + return 0; +} +#else PluginInstanceGUI* FileSourcePlugin::createSampleSourcePluginInstanceGUI( const QString& sourceId, QWidget **widget, @@ -84,6 +97,7 @@ PluginInstanceGUI* FileSourcePlugin::createSampleSourcePluginInstanceGUI( return 0; } } +#endif DeviceSampleSource *FileSourcePlugin::createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI) { diff --git a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp index 14af8b612..721afdc27 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp @@ -14,10 +14,7 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// -#include "limesdrinputplugin.h" - #include -#include #include #include @@ -27,7 +24,12 @@ #include "util/simpleserializer.h" #include "device/devicesourceapi.h" +#ifdef SERVER_MODE +#include "limesdrinput.h" +#else #include "limesdrinputgui.h" +#endif +#include "limesdrinputplugin.h" const PluginDescriptor LimeSDRInputPlugin::m_pluginDescriptor = { QString("LimeSDR Input"), diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp index c50774ef7..d85bddd35 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp @@ -26,7 +26,6 @@ #include "rtlsdrinput.h" #include "device/devicesourceapi.h" #include "rtlsdrthread.h" -#include "rtlsdrgui.h" #include "dsp/dspcommands.h" #include "dsp/dspengine.h" #include "dsp/filerecord.h" diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp index bc4d9fecb..ed1180d2f 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp @@ -1,13 +1,16 @@ #include -#include #include + #include "plugin/pluginapi.h" #include "util/simpleserializer.h" -#include "rtlsdrplugin.h" - #include +#ifdef SERVER_MODE +#include "rtlsdrinput.h" +#else #include "rtlsdrgui.h" +#endif +#include "rtlsdrplugin.h" const PluginDescriptor RTLSDRPlugin::m_pluginDescriptor = { QString("RTL-SDR Input"), diff --git a/pluginssrv/samplesink/filesink/CMakeLists.txt b/pluginssrv/samplesink/filesink/CMakeLists.txt index 196df430c..cfaf7ddfb 100644 --- a/pluginssrv/samplesink/filesink/CMakeLists.txt +++ b/pluginssrv/samplesink/filesink/CMakeLists.txt @@ -35,7 +35,6 @@ add_library(outputfilesinksrv SHARED target_link_libraries(outputfilesinksrv ${QT_LIBRARIES} sdrbase - sdrgui swagger ) diff --git a/pluginssrv/samplesink/limesdroutput/CMakeLists.txt b/pluginssrv/samplesink/limesdroutput/CMakeLists.txt index 6aa5af8a3..1fdde5e2a 100644 --- a/pluginssrv/samplesink/limesdroutput/CMakeLists.txt +++ b/pluginssrv/samplesink/limesdroutput/CMakeLists.txt @@ -51,7 +51,6 @@ add_definitions(-DQT_SHARED) add_library(outputlimesdrsrv SHARED ${limesdroutput_SOURCES} ${limesdroutput_HEADERS_MOC} - ${limesdroutput_FORMS_HEADERS} ) if (BUILD_DEBIAN) @@ -59,7 +58,6 @@ target_link_libraries(outputlimesdrsrv ${QT_LIBRARIES} limesuite sdrbase - sdrgui swagger limesdrdevice ) @@ -68,7 +66,6 @@ target_link_libraries(outputlimesdrsrv ${QT_LIBRARIES} ${LIMESUITE_LIBRARY} sdrbase - sdrgui swagger limesdrdevice ) diff --git a/pluginssrv/samplesource/filesource/CMakeLists.txt b/pluginssrv/samplesource/filesource/CMakeLists.txt index f344b3bbc..72c4f4250 100644 --- a/pluginssrv/samplesource/filesource/CMakeLists.txt +++ b/pluginssrv/samplesource/filesource/CMakeLists.txt @@ -36,7 +36,6 @@ add_library(inputfilesourcesrv SHARED target_link_libraries(inputfilesourcesrv ${QT_LIBRARIES} sdrbase - sdrgui swagger ) diff --git a/pluginssrv/samplesource/limesdrinput/CMakeLists.txt b/pluginssrv/samplesource/limesdrinput/CMakeLists.txt index 61cce9c83..b24dc0d4c 100644 --- a/pluginssrv/samplesource/limesdrinput/CMakeLists.txt +++ b/pluginssrv/samplesource/limesdrinput/CMakeLists.txt @@ -51,7 +51,6 @@ add_definitions(-DQT_SHARED) add_library(inputlimesdrsrv SHARED ${limesdrinput_SOURCES} ${limesdrinput_HEADERS_MOC} - ${limesdrinput_FORMS_HEADERS} ) if (BUILD_DEBIAN) @@ -59,7 +58,6 @@ target_link_libraries(inputlimesdrsrv ${QT_LIBRARIES} limesuite sdrbase - sdrgui swagger limesdrdevice ) @@ -68,7 +66,6 @@ target_link_libraries(inputlimesdrsrv ${QT_LIBRARIES} ${LIMESUITE_LIBRARY} sdrbase - sdrgui swagger limesdrdevice ) diff --git a/pluginssrv/samplesource/rtlsdr/CMakeLists.txt b/pluginssrv/samplesource/rtlsdr/CMakeLists.txt index 978ea375d..13462859b 100644 --- a/pluginssrv/samplesource/rtlsdr/CMakeLists.txt +++ b/pluginssrv/samplesource/rtlsdr/CMakeLists.txt @@ -49,7 +49,6 @@ target_link_libraries(inputrtlsdrsrv ${QT_LIBRARIES} rtlsdr sdrbase - sdrgui swagger ) else (BUILD_DEBIAN) @@ -57,7 +56,6 @@ target_link_libraries(inputrtlsdrsrv ${QT_LIBRARIES} ${LIBRTLSDR_LIBRARIES} sdrbase - sdrgui swagger ) endif (BUILD_DEBIAN)