VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-03-22 04:08:29 -04:00
Code Issues Projects Releases Wiki Activity

Server: plugins: completed GUI cleanup

Browse Source
This commit is contained in:
f4exb 2017-12-29 00:33:37 +01:00
parent d854e4ea3f
commit a5ce09f19c
13 changed files with 49 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/samplesink/filesink/filesinkoutput.cpp
View File

@ -28,7 +28,6 @@
#include "device/devicesinkapi.h"
#include "filesinkgui.h"
#include "filesinkoutput.h"
#include "filesinkthread.h"

18
plugins/samplesink/filesink/filesinkplugin.cpp
View File

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

5
plugins/samplesink/limesdroutput/limesdroutputplugin.cpp
View File

@ -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 = {

1
plugins/samplesource/filesource/filesourceinput.cpp
View File

@ -28,7 +28,6 @@
#include "dsp/filerecord.h"
#include "device/devicesourceapi.h"
#include "filesourcegui.h"
#include "filesourceinput.h"
#include "filesourcethread.h"

22
plugins/samplesource/filesource/filesourceplugin.cpp
View File

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

8
plugins/samplesource/limesdrinput/limesdrinputplugin.cpp
View File

@ -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"),

1
plugins/samplesource/rtlsdr/rtlsdrinput.cpp
View File

@ -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"

9
plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
View File

@ -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"),

1
pluginssrv/samplesink/filesink/CMakeLists.txt
View File

@ -35,7 +35,6 @@ add_library(outputfilesinksrv SHARED
target_link_libraries(outputfilesinksrv
${QT_LIBRARIES}
sdrbase
sdrgui
swagger
)

3
pluginssrv/samplesink/limesdroutput/CMakeLists.txt
View File

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

1
pluginssrv/samplesource/filesource/CMakeLists.txt
View File

@ -36,7 +36,6 @@ add_library(inputfilesourcesrv SHARED
target_link_libraries(inputfilesourcesrv
${QT_LIBRARIES}
sdrbase
sdrgui
swagger
)

3
pluginssrv/samplesource/limesdrinput/CMakeLists.txt
View File

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

2
pluginssrv/samplesource/rtlsdr/CMakeLists.txt
View File

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