AM demod: implemented server plugin. Corrections to NFM demod server plugin

plugins/channelrx/demodam/amdemodplugin.cpp

@@ -2,13 +2,15 @@
 #include <QAction>
 #include "plugin/pluginapi.h"
 
+#ifndef SERVER_MODE
 #include "amdemodgui.h"
+#endif
 #include "amdemod.h"
 #include "amdemodplugin.h"
 
 const PluginDescriptor AMDemodPlugin::m_pluginDescriptor = {
 	QString("AM Demodulator"),
-	QString("3.14.0"),
+	QString("3.14.2"),
 	QString("(c) Edouard Griffiths, F4EXB"),
 	QString("https://github.com/f4exb/sdrangel"),
 	true,
@@ -34,10 +36,19 @@ void AMDemodPlugin::initPlugin(PluginAPI* pluginAPI)
 	m_pluginAPI->registerRxChannel(AMDemod::m_channelIdURI, AMDemod::m_channelId, this);
 }
 
+#ifdef SERVER_MODE
+PluginInstanceGUI* AMDemodPlugin::createRxChannelGUI(
+        DeviceUISet *deviceUISet __attribute__((unused)),
+        BasebandSampleSink *rxChannel __attribute__((unused)))
+{
+    return 0;
+}
+#else
 PluginInstanceGUI* AMDemodPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel)
 {
 	return AMDemodGUI::create(m_pluginAPI, deviceUISet, rxChannel);
 }
+#endif
 
 BasebandSampleSink* AMDemodPlugin::createRxChannelBS(DeviceSourceAPI *deviceAPI)
 {

plugins/channelrx/demodnfm/nfmdemod.cpp

@@ -34,7 +34,6 @@
 #include "dsp/dspcommands.h"
 #include "device/devicesourceapi.h"
 
-#include "nfmdemodgui.h"
 #include "nfmdemod.h"
 
 MESSAGE_CLASS_DEFINITION(NFMDemod::MsgConfigureNFMDemod, Message)

plugins/channelrx/demodnfm/nfmplugin.cpp

@@ -2,7 +2,9 @@
 #include "plugin/pluginapi.h"
 
 #include "nfmplugin.h"
+#ifndef SERVER_MODE
 #include "nfmdemodgui.h"
+#endif
 #include "nfmdemod.h"
 
 const PluginDescriptor NFMPlugin::m_pluginDescriptor = {

pluginssrv/channelrx/CMakeLists.txt

@@ -1,3 +1,4 @@
 project(demod)
 
+add_subdirectory(demodam)
 add_subdirectory(demodnfm)

pluginssrv/channelrx/demodam/CMakeLists.txt

@@ -0,0 +1,42 @@
+project(am)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(PLUGIN_PREFIX "../../../plugins/channelrx/demodam")
+
+set(am_SOURCES
+	${PLUGIN_PREFIX}/amdemod.cpp
+	${PLUGIN_PREFIX}/amdemodsettings.cpp
+	${PLUGIN_PREFIX}/amdemodplugin.cpp
+)
+
+set(am_HEADERS
+	${PLUGIN_PREFIX}/amdemod.h
+	${PLUGIN_PREFIX}/amdemodsettings.h
+	${PLUGIN_PREFIX}/amdemodplugin.h
+)
+
+include_directories(
+	.
+	${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client	
+)
+
+#include(${QT_USE_FILE})
+add_definitions(${QT_DEFINITIONS})
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_SHARED)
+
+add_library(demodamsrv SHARED
+	${am_SOURCES}
+	${am_HEADERS_MOC}
+)
+
+target_link_libraries(demodamsrv
+	${QT_LIBRARIES}
+	sdrbase
+	swagger
+)
+
+qt5_use_modules(demodamsrv Core Widgets)
+
+install(TARGETS demodamsrv DESTINATION lib/pluginssrv/channelrx)

pluginssrv/channelrx/demodnfm/CMakeLists.txt

@@ -29,13 +29,11 @@ add_definitions(-DQT_SHARED)
 add_library(demodnfmsrv SHARED
 	${nfm_SOURCES}
 	${nfm_HEADERS_MOC}
-	${nfm_FORMS_HEADERS}
 )
 
 target_link_libraries(demodnfmsrv
 	${QT_LIBRARIES}
 	sdrbase
-	sdrgui
 	swagger
 )