VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-26 01:39:05 -05:00
Code Issues Projects Releases Wiki Activity

Build ModWFM tx channel server plugin and apply corrections to other server plugins

Browse Source
This commit is contained in:
f4exb 2018-04-09 00:54:25 +02:00
parent b4d7a0a905
commit 83efddee9a
9 changed files with 69 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/channelrx/demodam/amdemodplugin.cpp
View File

@ -1,5 +1,4 @@
#include <QtPlugin>
#include <QAction>
#include "plugin/pluginapi.h"
#ifndef SERVER_MODE

12
plugins/channeltx/modam/ammodplugin.cpp
View File

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

4
plugins/channeltx/modnfm/nfmmodplugin.cpp
View File

@ -15,10 +15,12 @@
///////////////////////////////////////////////////////////////////////////////////
#include <QtPlugin>
#include <QAction>
#include "plugin/pluginapi.h"
#ifndef SERVER_MODE
#include "nfmmodgui.h"
#endif
#include "nfmmod.h"
#include "nfmmodplugin.h"
const PluginDescriptor NFMModPlugin::m_pluginDescriptor = {

12
plugins/channeltx/modwfm/wfmmodplugin.cpp
View File

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

2
pluginssrv/channelrx/demodam/CMakeLists.txt
View File

@ -37,6 +37,6 @@ target_link_libraries(demodamsrv
swagger
)
qt5_use_modules(demodamsrv Core Widgets)
qt5_use_modules(demodamsrv Core)
install(TARGETS demodamsrv DESTINATION lib/pluginssrv/channelrx)

1
pluginssrv/channeltx/CMakeLists.txt
View File

@ -2,3 +2,4 @@ project(mod)
add_subdirectory(modam)
add_subdirectory(modnfm)
add_subdirectory(modwfm)

2
pluginssrv/channeltx/modam/CMakeLists.txt
View File

@ -36,6 +36,6 @@ target_link_libraries(modamsrv
swagger
)
qt5_use_modules(modamsrv Core Widgets)
qt5_use_modules(modamsrv Core)
install(TARGETS modamsrv DESTINATION lib/pluginssrv/channeltx)

2
pluginssrv/channeltx/modnfm/CMakeLists.txt
View File

@ -28,13 +28,11 @@ add_definitions(-DQT_SHARED)
add_library(modnfmsrv SHARED
${modnfm_SOURCES}
${modnfm_HEADERS_MOC}
${modnfm_FORMS_HEADERS}
)
target_link_libraries(modnfmsrv
${QT_LIBRARIES}
sdrbase
sdrgui
swagger
)

41
pluginssrv/channeltx/modwfm/CMakeLists.txt Normal file
View File

@ -0,0 +1,41 @@
project(modwfm)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(PLUGIN_PREFIX "../../../plugins/channeltx/modwfm")
set(modwfm_SOURCES
${PLUGIN_PREFIX}/wfmmod.cpp
${PLUGIN_PREFIX}/wfmmodplugin.cpp
${PLUGIN_PREFIX}/wfmmodsettings.cpp
)
set(modwfm_HEADERS
${PLUGIN_PREFIX}/wfmmod.h
${PLUGIN_PREFIX}/wfmmodplugin.h
${PLUGIN_PREFIX}/wfmmodsettings.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(modwfmsrv SHARED
${modwfm_SOURCES}
${modwfm_HEADERS_MOC}
)
target_link_libraries(modwfmsrv
${QT_LIBRARIES}
sdrbase
swagger
)
qt5_use_modules(modwfmsrv Core)
install(TARGETS modwfmsrv DESTINATION lib/pluginssrv/channeltx)