Added server plugins for ATV, SSB modulators and UDP sink

plugins/channeltx/modatv/atvmodplugin.cpp

@@ -15,10 +15,11 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include <QtPlugin>
-#include <QAction>
 #include "plugin/pluginapi.h"
 
+#ifndef SERVER_MODE
 #include "atvmodgui.h"
+#endif
 #include "atvmod.h"
 #include "atvmodplugin.h"
 
@@ -50,10 +51,19 @@ void ATVModPlugin::initPlugin(PluginAPI* pluginAPI)
     m_pluginAPI->registerTxChannel(ATVMod::m_channelIdURI, ATVMod::m_channelId, this);
 }
 
+#ifdef SERVER_MODE
+PluginInstanceGUI* ATVModPlugin::createTxChannelGUI(
+        DeviceUISet *deviceUISet __attribute__((unused)),
+        BasebandSampleSource *txChannel __attribute__((unused)))
+{
+    return 0;
+}
+#else
 PluginInstanceGUI* ATVModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel)
 {
     return ATVModGUI::create(m_pluginAPI, deviceUISet, txChannel);
 }
+#endif
 
 BasebandSampleSource* ATVModPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI)
 {

plugins/channeltx/modssb/ssbmodplugin.cpp

@@ -15,10 +15,11 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include <QtPlugin>
-#include <QAction>
 #include "plugin/pluginapi.h"
 
+#ifndef SERVER_MODE
 #include "ssbmodgui.h"
+#endif
 #include "ssbmod.h"
 #include "ssbmodplugin.h"
 
@@ -50,10 +51,19 @@ void SSBModPlugin::initPlugin(PluginAPI* pluginAPI)
     m_pluginAPI->registerTxChannel(SSBMod::m_channelIdURI, SSBMod::m_channelId, this);
 }
 
+#ifdef SERVER_MODE
+PluginInstanceGUI* SSBModPlugin::createTxChannelGUI(
+        DeviceUISet *deviceUISet __attribute__((unused)),
+        BasebandSampleSource *txChannel __attribute__((unused)))
+{
+    return 0;
+}
+#else
 PluginInstanceGUI* SSBModPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel)
 {
     return SSBModGUI::create(m_pluginAPI, deviceUISet, txChannel);
 }
+#endif
 
 BasebandSampleSource* SSBModPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI)
 {

plugins/channeltx/udpsink/udpsinkplugin.cpp

@@ -20,11 +20,14 @@
 #include <QtPlugin>
 #include "plugin/pluginapi.h"
 
+#ifndef SERVER_MODE
 #include "udpsinkgui.h"
+#endif
+#include "udpsink.h"
 
 const PluginDescriptor UDPSinkPlugin::m_pluginDescriptor = {
 	QString("UDP Channel Sink"),
-	QString("3.12.0"),
+	QString("3.14.2"),
 	QString("(c) Edouard Griffiths, F4EXB"),
 	QString("https://github.com/f4exb/sdrangel"),
 	true,
@@ -50,10 +53,19 @@ void UDPSinkPlugin::initPlugin(PluginAPI* pluginAPI)
     m_pluginAPI->registerTxChannel(UDPSink::m_channelIdURI, UDPSink::m_channelId, this);
 }
 
+#ifdef SERVER_MODE
+PluginInstanceGUI* UDPSinkPlugin::createTxChannelGUI(
+        DeviceUISet *deviceUISet __attribute__((unused)),
+        BasebandSampleSource *txChannel __attribute__((unused)))
+{
+    return 0;
+}
+#else
 PluginInstanceGUI* UDPSinkPlugin::createTxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSource *txChannel)
 {
     return UDPSinkGUI::create(m_pluginAPI, deviceUISet, txChannel);
 }
+#endif
 
 BasebandSampleSource* UDPSinkPlugin::createTxChannelBS(DeviceSinkAPI *deviceAPI)
 {

pluginssrv/channeltx/CMakeLists.txt

@@ -1,5 +1,8 @@
 project(mod)
 
 add_subdirectory(modam)
+add_subdirectory(modatv)
 add_subdirectory(modnfm)
+add_subdirectory(modssb)
 add_subdirectory(modwfm)
+add_subdirectory(udpsink)

pluginssrv/channeltx/modatv/CMakeLists.txt

@@ -0,0 +1,45 @@
+project(modatv)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(PLUGIN_PREFIX "../../../plugins/channeltx/modatv")
+
+set(modatv_SOURCES
+	${PLUGIN_PREFIX}/atvmod.cpp
+	${PLUGIN_PREFIX}/atvmodplugin.cpp
+	${PLUGIN_PREFIX}/atvmodsettings.cpp
+)
+
+set(modatv_HEADERS
+	${PLUGIN_PREFIX}/atvmod.h
+	${PLUGIN_PREFIX}/atvmodplugin.h
+	${PLUGIN_PREFIX}/atvmodsettings.h
+)
+
+# OpenCV variables defined in /usr/share/OpenCV/OpenCVConfig.cmake (Ubuntu)
+
+include_directories(
+	.
+	${OpenCV_INCLUDE_DIRS}
+	${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client	
+)
+
+add_definitions(${QT_DEFINITIONS})
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_SHARED)
+
+add_library(modatvsrv SHARED
+	${modatv_SOURCES}
+	${modatv_HEADERS_MOC}
+)
+
+target_link_libraries(modatvsrv
+    ${OpenCV_LIBS}
+	${QT_LIBRARIES}
+	sdrbase
+	swagger
+)
+
+qt5_use_modules(modatvsrv Core)
+
+install(TARGETS modatvsrv DESTINATION lib/pluginssrv/channeltx)

pluginssrv/channeltx/modssb/CMakeLists.txt

@@ -0,0 +1,41 @@
+project(modssb)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(PLUGIN_PREFIX "../../../plugins/channeltx/modssb")
+
+set(modssb_SOURCES
+    ${PLUGIN_PREFIX}/ssbmod.cpp
+    ${PLUGIN_PREFIX}/ssbmodplugin.cpp
+    ${PLUGIN_PREFIX}/ssbmodsettings.cpp
+)
+
+set(modssb_HEADERS
+    ${PLUGIN_PREFIX}/ssbmod.h
+    ${PLUGIN_PREFIX}/ssbmodplugin.h
+    ${PLUGIN_PREFIX}/ssbmodsettings.h
+)
+
+include_directories(
+    .
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client    
+)
+
+add_definitions(${QT_DEFINITIONS})
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_SHARED)
+
+add_library(modssbsrv SHARED
+    ${modssb_SOURCES}
+    ${modssb_HEADERS_MOC}
+)
+
+target_link_libraries(modssbsrv
+    ${QT_LIBRARIES}
+    sdrbase
+	swagger    
+)
+
+qt5_use_modules(modssbsrv Core)
+
+install(TARGETS modssbsrv DESTINATION lib/pluginssrv/channeltx)

pluginssrv/channeltx/udpsink/CMakeLists.txt

@@ -0,0 +1,45 @@
+project(udpsink)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(PLUGIN_PREFIX "../../../plugins/channeltx/udpsink")
+
+set(udpsink_SOURCES
+	${PLUGIN_PREFIX}/udpsink.cpp
+	${PLUGIN_PREFIX}/udpsinkplugin.cpp
+	${PLUGIN_PREFIX}/udpsinkudphandler.cpp
+	${PLUGIN_PREFIX}/udpsinkmsg.cpp
+	${PLUGIN_PREFIX}/udpsinksettings.cpp
+)
+
+set(udpsink_HEADERS
+	${PLUGIN_PREFIX}/udpsink.h
+	${PLUGIN_PREFIX}/udpsinkplugin.h
+	${PLUGIN_PREFIX}/udpsinkudphandler.h
+	${PLUGIN_PREFIX}/udpsinkmsg.h
+	${PLUGIN_PREFIX}/udpsinksettings.h
+)
+
+include_directories(
+	.
+	${CMAKE_CURRENT_BINARY_DIR}
+	${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
+)
+
+add_definitions(${QT_DEFINITIONS})
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_SHARED)
+
+add_library(modudpsinksrv SHARED
+	${udpsink_SOURCES}
+	${udpsink_HEADERS_MOC}
+)
+
+target_link_libraries(modudpsinksrv
+	${QT_LIBRARIES}
+	sdrbase
+	swagger
+)
+
+qt5_use_modules(modudpsinksrv Core Network)
+
+install(TARGETS modudpsinksrv DESTINATION lib/pluginssrv/channeltx)