mirror of https://github.com/f4exb/sdrangel.git
v7: rename vordemodsc files to vordemod files. Part of #1223
This commit is contained in:
parent
42980850ce
commit
7d450c6e42
|
@ -15,7 +15,7 @@ add_subdirectory(localsink)
|
||||||
add_subdirectory(filesink)
|
add_subdirectory(filesink)
|
||||||
add_subdirectory(freqtracker)
|
add_subdirectory(freqtracker)
|
||||||
add_subdirectory(demodchirpchat)
|
add_subdirectory(demodchirpchat)
|
||||||
add_subdirectory(demodvorsc)
|
add_subdirectory(demodvor)
|
||||||
add_subdirectory(demodpacket)
|
add_subdirectory(demodpacket)
|
||||||
add_subdirectory(demodais)
|
add_subdirectory(demodais)
|
||||||
add_subdirectory(demodpager)
|
add_subdirectory(demodpager)
|
||||||
|
|
|
@ -1,23 +1,23 @@
|
||||||
project(vorsc)
|
project(vor)
|
||||||
|
|
||||||
set(vorsc_SOURCES
|
set(vor_SOURCES
|
||||||
vordemodsc.cpp
|
vordemod.cpp
|
||||||
vordemodscsettings.cpp
|
vordemodsettings.cpp
|
||||||
vordemodscbaseband.cpp
|
vordemodbaseband.cpp
|
||||||
vordemodscsink.cpp
|
vordemodsink.cpp
|
||||||
vordemodscplugin.cpp
|
vordemodplugin.cpp
|
||||||
vordemodscwebapiadapter.cpp
|
vordemodwebapiadapter.cpp
|
||||||
vordemodscreport.cpp
|
vordemodreport.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
set(vorsc_HEADERS
|
set(vor_HEADERS
|
||||||
vordemodsc.h
|
vordemod.h
|
||||||
vordemodscsettings.h
|
vordemodsettings.h
|
||||||
vordemodscbaseband.h
|
vordemodbaseband.h
|
||||||
vordemodscsink.h
|
vordemodsink.h
|
||||||
vordemodscplugin.h
|
vordemodplugin.h
|
||||||
vordemodscwebapiadapter.h
|
vordemodwebapiadapter.h
|
||||||
vordemodscreport.h
|
vordemodreport.h
|
||||||
)
|
)
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
|
@ -25,29 +25,29 @@ include_directories(
|
||||||
)
|
)
|
||||||
|
|
||||||
if(NOT SERVER_MODE)
|
if(NOT SERVER_MODE)
|
||||||
set(vorsc_SOURCES
|
set(vor_SOURCES
|
||||||
${vorsc_SOURCES}
|
${vor_SOURCES}
|
||||||
vordemodscgui.cpp
|
vordemodgui.cpp
|
||||||
vordemodscgui.ui
|
vordemodgui.ui
|
||||||
)
|
)
|
||||||
set(vorsc_HEADERS
|
set(vor_HEADERS
|
||||||
${vorsc_HEADERS}
|
${vor_HEADERS}
|
||||||
vordemodscgui.h
|
vordemodgui.h
|
||||||
)
|
)
|
||||||
|
|
||||||
set(TARGET_NAME demodvorsc)
|
set(TARGET_NAME demodvor)
|
||||||
set(TARGET_LIB "Qt5::Widgets")
|
set(TARGET_LIB "Qt5::Widgets")
|
||||||
set(TARGET_LIB_GUI "sdrgui")
|
set(TARGET_LIB_GUI "sdrgui")
|
||||||
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
|
||||||
else()
|
else()
|
||||||
set(TARGET_NAME demodvorscsrv)
|
set(TARGET_NAME demodvorsrv)
|
||||||
set(TARGET_LIB "")
|
set(TARGET_LIB "")
|
||||||
set(TARGET_LIB_GUI "")
|
set(TARGET_LIB_GUI "")
|
||||||
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
set(INSTALL_FOLDER ${INSTALL_PLUGINSSRV_DIR})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_library(${TARGET_NAME} SHARED
|
add_library(${TARGET_NAME} SHARED
|
||||||
${vorsc_SOURCES}
|
${vor_SOURCES}
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME}
|
target_link_libraries(${TARGET_NAME}
|
|
@ -39,8 +39,8 @@
|
||||||
#include "util/db.h"
|
#include "util/db.h"
|
||||||
#include "maincore.h"
|
#include "maincore.h"
|
||||||
|
|
||||||
#include "vordemodscreport.h"
|
#include "vordemodreport.h"
|
||||||
#include "vordemodsc.h"
|
#include "vordemod.h"
|
||||||
|
|
||||||
MESSAGE_CLASS_DEFINITION(VORDemod::MsgConfigureVORDemod, Message)
|
MESSAGE_CLASS_DEFINITION(VORDemod::MsgConfigureVORDemod, Message)
|
||||||
|
|
|
@ -28,8 +28,8 @@
|
||||||
#include "channel/channelapi.h"
|
#include "channel/channelapi.h"
|
||||||
#include "util/message.h"
|
#include "util/message.h"
|
||||||
|
|
||||||
#include "vordemodscbaseband.h"
|
#include "vordemodbaseband.h"
|
||||||
#include "vordemodscsettings.h"
|
#include "vordemodsettings.h"
|
||||||
|
|
||||||
class QNetworkAccessManager;
|
class QNetworkAccessManager;
|
||||||
class QNetworkReply;
|
class QNetworkReply;
|
|
@ -22,8 +22,8 @@
|
||||||
#include "dsp/dspcommands.h"
|
#include "dsp/dspcommands.h"
|
||||||
#include "dsp/downchannelizer.h"
|
#include "dsp/downchannelizer.h"
|
||||||
|
|
||||||
#include "vordemodscbaseband.h"
|
#include "vordemodbaseband.h"
|
||||||
#include "vordemodscreport.h"
|
#include "vordemodreport.h"
|
||||||
|
|
||||||
MESSAGE_CLASS_DEFINITION(VORDemodBaseband::MsgConfigureVORDemodBaseband, Message)
|
MESSAGE_CLASS_DEFINITION(VORDemodBaseband::MsgConfigureVORDemodBaseband, Message)
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#include "util/message.h"
|
#include "util/message.h"
|
||||||
#include "util/messagequeue.h"
|
#include "util/messagequeue.h"
|
||||||
|
|
||||||
#include "vordemodscsink.h"
|
#include "vordemodsink.h"
|
||||||
|
|
||||||
class DownChannelizer;
|
class DownChannelizer;
|
||||||
|
|
|
@ -37,10 +37,10 @@
|
||||||
#include "channel/channelwebapiutils.h"
|
#include "channel/channelwebapiutils.h"
|
||||||
#include "maincore.h"
|
#include "maincore.h"
|
||||||
|
|
||||||
#include "ui_vordemodscgui.h"
|
#include "ui_vordemodgui.h"
|
||||||
#include "vordemodsc.h"
|
#include "vordemod.h"
|
||||||
#include "vordemodscreport.h"
|
#include "vordemodreport.h"
|
||||||
#include "vordemodscgui.h"
|
#include "vordemodgui.h"
|
||||||
|
|
||||||
VORDemodGUI* VORDemodGUI::create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel)
|
VORDemodGUI* VORDemodGUI::create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel)
|
||||||
{
|
{
|
|
@ -24,7 +24,7 @@
|
||||||
#include "dsp/movingaverage.h"
|
#include "dsp/movingaverage.h"
|
||||||
#include "util/messagequeue.h"
|
#include "util/messagequeue.h"
|
||||||
#include "settings/rollupstate.h"
|
#include "settings/rollupstate.h"
|
||||||
#include "vordemodscsettings.h"
|
#include "vordemodsettings.h"
|
||||||
|
|
||||||
class PluginAPI;
|
class PluginAPI;
|
||||||
class DeviceUISet;
|
class DeviceUISet;
|
|
@ -20,15 +20,15 @@
|
||||||
#include "plugin/pluginapi.h"
|
#include "plugin/pluginapi.h"
|
||||||
|
|
||||||
#ifndef SERVER_MODE
|
#ifndef SERVER_MODE
|
||||||
#include "vordemodscgui.h"
|
#include "vordemodgui.h"
|
||||||
#endif
|
#endif
|
||||||
#include "vordemodsc.h"
|
#include "vordemod.h"
|
||||||
#include "vordemodscwebapiadapter.h"
|
#include "vordemodwebapiadapter.h"
|
||||||
#include "vordemodscplugin.h"
|
#include "vordemodplugin.h"
|
||||||
|
|
||||||
const PluginDescriptor VORDemodPlugin::m_pluginDescriptor = {
|
const PluginDescriptor VORDemodPlugin::m_pluginDescriptor = {
|
||||||
VORDemod::m_channelId,
|
VORDemod::m_channelId,
|
||||||
QStringLiteral("VOR Single Channel Demodulator"),
|
QStringLiteral("VOR Demodulator"),
|
||||||
QStringLiteral("6.20.2"),
|
QStringLiteral("6.20.2"),
|
||||||
QStringLiteral("(c) Jon Beniston, M7RCE"),
|
QStringLiteral("(c) Jon Beniston, M7RCE"),
|
||||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
|
@ -15,7 +15,7 @@
|
||||||
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
|
||||||
///////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#include "vordemodscreport.h"
|
#include "vordemodreport.h"
|
||||||
|
|
||||||
MESSAGE_CLASS_DEFINITION(VORDemodReport::MsgReportRadial, Message)
|
MESSAGE_CLASS_DEFINITION(VORDemodReport::MsgReportRadial, Message)
|
||||||
MESSAGE_CLASS_DEFINITION(VORDemodReport::MsgReportIdent, Message)
|
MESSAGE_CLASS_DEFINITION(VORDemodReport::MsgReportIdent, Message)
|
|
@ -21,7 +21,7 @@
|
||||||
#include "dsp/dspengine.h"
|
#include "dsp/dspengine.h"
|
||||||
#include "util/simpleserializer.h"
|
#include "util/simpleserializer.h"
|
||||||
#include "settings/serializable.h"
|
#include "settings/serializable.h"
|
||||||
#include "vordemodscsettings.h"
|
#include "vordemodsettings.h"
|
||||||
|
|
||||||
VORDemodSettings::VORDemodSettings() :
|
VORDemodSettings::VORDemodSettings() :
|
||||||
m_channelMarker(nullptr),
|
m_channelMarker(nullptr),
|
|
@ -27,9 +27,9 @@
|
||||||
#include "util/morse.h"
|
#include "util/morse.h"
|
||||||
#include "util/units.h"
|
#include "util/units.h"
|
||||||
|
|
||||||
#include "vordemodscreport.h"
|
#include "vordemodreport.h"
|
||||||
#include "vordemodscsettings.h"
|
#include "vordemodsettings.h"
|
||||||
#include "vordemodscsink.h"
|
#include "vordemodsink.h"
|
||||||
|
|
||||||
VORDemodSCSink::VORDemodSCSink() :
|
VORDemodSCSink::VORDemodSCSink() :
|
||||||
m_channelFrequencyOffset(0),
|
m_channelFrequencyOffset(0),
|
|
@ -30,7 +30,7 @@
|
||||||
#include "util/doublebufferfifo.h"
|
#include "util/doublebufferfifo.h"
|
||||||
#include "util/messagequeue.h"
|
#include "util/messagequeue.h"
|
||||||
|
|
||||||
#include "vordemodscsettings.h"
|
#include "vordemodsettings.h"
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
|
@ -17,8 +17,8 @@
|
||||||
///////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#include "SWGChannelSettings.h"
|
#include "SWGChannelSettings.h"
|
||||||
#include "vordemodsc.h"
|
#include "vordemod.h"
|
||||||
#include "vordemodscwebapiadapter.h"
|
#include "vordemodwebapiadapter.h"
|
||||||
|
|
||||||
VORDemodSCWebAPIAdapter::VORDemodSCWebAPIAdapter()
|
VORDemodSCWebAPIAdapter::VORDemodSCWebAPIAdapter()
|
||||||
{}
|
{}
|
|
@ -20,7 +20,7 @@
|
||||||
#define INCLUDE_VORDEMODSC_WEBAPIADAPTER_H
|
#define INCLUDE_VORDEMODSC_WEBAPIADAPTER_H
|
||||||
|
|
||||||
#include "channel/channelwebapiadapter.h"
|
#include "channel/channelwebapiadapter.h"
|
||||||
#include "vordemodscsettings.h"
|
#include "vordemodsettings.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Standalone API adapter only for the settings
|
* Standalone API adapter only for the settings
|
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
const PluginDescriptor VORDemodMCPlugin::m_pluginDescriptor = {
|
const PluginDescriptor VORDemodMCPlugin::m_pluginDescriptor = {
|
||||||
VORDemodMC::m_channelId,
|
VORDemodMC::m_channelId,
|
||||||
QStringLiteral("VOR Demodulator"),
|
QStringLiteral("VOR Multi Channel Demodulator"),
|
||||||
QStringLiteral("6.20.2"),
|
QStringLiteral("6.20.2"),
|
||||||
QStringLiteral("(c) Jon Beniston, M7RCE"),
|
QStringLiteral("(c) Jon Beniston, M7RCE"),
|
||||||
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
QStringLiteral("https://github.com/f4exb/sdrangel"),
|
||||||
|
|
Loading…
Reference in New Issue