Server: plugins: completed GUI cleanup

2017-12-29 00:33:37 +01:00 · 2017-12-29 00:33:37 +01:00 · a5ce09f19c
parent d854e4ea3f
commit a5ce09f19c
13 changed files with 49 additions and 26 deletions
--- 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"

--- a/plugins/samplesink/filesink/filesinkplugin.cpp
+++ b/plugins/samplesink/filesink/filesinkplugin.cpp
@ -15,12 +15,16 @@
 ///////////////////////////////////////////////////////////////////////////////////

 #include <QtPlugin>
-#include <QAction>
+
 #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)
 {
--- a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp
+++ b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp
@ -15,7 +15,6 @@
 ///////////////////////////////////////////////////////////////////////////////////

 #include <QtPlugin>
-#include <QAction>

 #include <regex>
 #include <string>
@ -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 = {
--- 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"

--- a/plugins/samplesource/filesource/filesourceplugin.cpp
+++ b/plugins/samplesource/filesource/filesourceplugin.cpp
@ -15,14 +15,18 @@
 ///////////////////////////////////////////////////////////////////////////////////

 #include <QtPlugin>
-#include <QAction>
+
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-
-#include "filesourcegui.h"
-#include "filesourceplugin.h"
 #include <device/devicesourceapi.h>

+#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)
 {
--- a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp
+++ b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp
@ -14,10 +14,7 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////

-#include "limesdrinputplugin.h"
-
 #include <QtPlugin>
-#include <QAction>

 #include <regex>
 #include <string>
@ -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"),
--- 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"
--- a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
@ -1,13 +1,16 @@
 #include <QtPlugin>
-#include <QAction>
 #include <rtl-sdr.h>
+
 #include "plugin/pluginapi.h"
 #include "util/simpleserializer.h"
-#include "rtlsdrplugin.h"
-
 #include <device/devicesourceapi.h>

+#ifdef SERVER_MODE
+#include "rtlsdrinput.h"
+#else
 #include "rtlsdrgui.h"
+#endif
+#include "rtlsdrplugin.h"

 const PluginDescriptor RTLSDRPlugin::m_pluginDescriptor = {
 	QString("RTL-SDR Input"),
--- 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
 )

--- 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
 )
--- 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
 )

--- 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
 )
--- 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)