BladeRF output server plugins: removed QWidget dependency

This commit is contained in:
f4exb 2018-04-15 19:18:21 +02:00
parent 4df9aa93ab
commit 36c3c71c73
3 changed files with 16 additions and 3 deletions

View File

@ -29,7 +29,6 @@
#include "bladerf/devicebladerfshared.h" #include "bladerf/devicebladerfshared.h"
#include "bladerfoutput.h" #include "bladerfoutput.h"
#include "bladerfoutputgui.h"
#include "bladerfoutputthread.h" #include "bladerfoutputthread.h"
MESSAGE_CLASS_DEFINITION(BladerfOutput::MsgConfigureBladerf, Message) MESSAGE_CLASS_DEFINITION(BladerfOutput::MsgConfigureBladerf, Message)

View File

@ -15,14 +15,18 @@
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#include <QtPlugin> #include <QtPlugin>
#include <QAction>
#include <libbladeRF.h> #include <libbladeRF.h>
#include "plugin/pluginapi.h" #include "plugin/pluginapi.h"
#include "util/simpleserializer.h" #include "util/simpleserializer.h"
#include <device/devicesourceapi.h> #include <device/devicesourceapi.h>
#include "bladerfoutputplugin.h" #include "bladerfoutputplugin.h"
#ifdef SERVER_MODE
#include "bladerfoutput.h"
#else
#include "bladerfoutputgui.h" #include "bladerfoutputgui.h"
#endif
const PluginDescriptor BladerfOutputPlugin::m_pluginDescriptor = { const PluginDescriptor BladerfOutputPlugin::m_pluginDescriptor = {
QString("BladeRF Output"), QString("BladeRF Output"),
@ -81,6 +85,15 @@ PluginInterface::SamplingDevices BladerfOutputPlugin::enumSampleSinks()
return result; 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( PluginInstanceGUI* BladerfOutputPlugin::createSampleSinkPluginInstanceGUI(
const QString& sinkId, const QString& sinkId,
QWidget **widget, QWidget **widget,
@ -97,6 +110,7 @@ PluginInstanceGUI* BladerfOutputPlugin::createSampleSinkPluginInstanceGUI(
return 0; return 0;
} }
} }
#endif
DeviceSampleSink* BladerfOutputPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI) DeviceSampleSink* BladerfOutputPlugin::createSampleSinkPluginInstanceOutput(const QString& sinkId, DeviceSinkAPI *deviceAPI)
{ {

View File

@ -63,6 +63,6 @@ target_link_libraries(outputbladerfsrv
) )
endif (BUILD_DEBIAN) endif (BUILD_DEBIAN)
qt5_use_modules(outputbladerfsrv Core Widgets) qt5_use_modules(outputbladerfsrv Core)
install(TARGETS outputbladerfsrv DESTINATION lib/pluginssrv/samplesink) install(TARGETS outputbladerfsrv DESTINATION lib/pluginssrv/samplesink)