From 36c3c71c73dac2cd14af5289e198cf03653418d5 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 15 Apr 2018 19:18:21 +0200 Subject: [PATCH] BladeRF output server plugins: removed QWidget dependency --- .../samplesink/bladerfoutput/bladerfoutput.cpp | 1 - .../bladerfoutput/bladerfoutputplugin.cpp | 16 +++++++++++++++- .../samplesink/bladerfoutput/CMakeLists.txt | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/plugins/samplesink/bladerfoutput/bladerfoutput.cpp b/plugins/samplesink/bladerfoutput/bladerfoutput.cpp index 670145da4..a695b67dc 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutput.cpp +++ b/plugins/samplesink/bladerfoutput/bladerfoutput.cpp @@ -29,7 +29,6 @@ #include "bladerf/devicebladerfshared.h" #include "bladerfoutput.h" -#include "bladerfoutputgui.h" #include "bladerfoutputthread.h" MESSAGE_CLASS_DEFINITION(BladerfOutput::MsgConfigureBladerf, Message) diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp b/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp index d606f2e05..cd861aea4 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp +++ b/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp @@ -15,14 +15,18 @@ /////////////////////////////////////////////////////////////////////////////////// #include -#include #include #include "plugin/pluginapi.h" #include "util/simpleserializer.h" #include #include "bladerfoutputplugin.h" + +#ifdef SERVER_MODE +#include "bladerfoutput.h" +#else #include "bladerfoutputgui.h" +#endif const PluginDescriptor BladerfOutputPlugin::m_pluginDescriptor = { QString("BladeRF Output"), @@ -81,6 +85,15 @@ PluginInterface::SamplingDevices BladerfOutputPlugin::enumSampleSinks() return result; } +#ifdef SERVER_MODE +PluginInstanceGUI* BladerfOutputPlugin::createSampleSinkPluginInstanceGUI( + const QString& sinkId __attribute__((unused)), + QWidget **widget __attribute__((unused)), + DeviceUISet *deviceUISet __attribute__((unused))) +{ + return 0; +} +#else PluginInstanceGUI* BladerfOutputPlugin::createSampleSinkPluginInstanceGUI( const QString& sinkId, QWidget **widget, @@ -97,6 +110,7 @@ PluginInstanceGUI* BladerfOutputPlugin::createSampleSinkPluginInstanceGUI( return 0; } } +#endif DeviceSampleSink* BladerfOutputPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI) { diff --git a/pluginssrv/samplesink/bladerfoutput/CMakeLists.txt b/pluginssrv/samplesink/bladerfoutput/CMakeLists.txt index 82a66e3dd..7c1365553 100644 --- a/pluginssrv/samplesink/bladerfoutput/CMakeLists.txt +++ b/pluginssrv/samplesink/bladerfoutput/CMakeLists.txt @@ -63,6 +63,6 @@ target_link_libraries(outputbladerfsrv ) endif (BUILD_DEBIAN) -qt5_use_modules(outputbladerfsrv Core Widgets) +qt5_use_modules(outputbladerfsrv Core) install(TARGETS outputbladerfsrv DESTINATION lib/pluginssrv/samplesink)