v7: rename vordemod files to vordemodmc files. Part of #1223
|
@ -2,7 +2,7 @@ project(demod)
|
||||||
|
|
||||||
if (Qt5Quick_FOUND AND Qt5QuickWidgets_FOUND AND Qt5Positioning_FOUND)
|
if (Qt5Quick_FOUND AND Qt5QuickWidgets_FOUND AND Qt5Positioning_FOUND)
|
||||||
add_subdirectory(demodadsb)
|
add_subdirectory(demodadsb)
|
||||||
add_subdirectory(demodvor)
|
add_subdirectory(demodvormc)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_subdirectory(demodam)
|
add_subdirectory(demodam)
|
||||||
|
|
|
@ -1,23 +1,23 @@
|
||||||
project(vor)
|
project(vormc)
|
||||||
|
|
||||||
set(vor_SOURCES
|
set(vormc_SOURCES
|
||||||
vordemod.cpp
|
vordemodmc.cpp
|
||||||
vordemodsettings.cpp
|
vordemodmcsettings.cpp
|
||||||
vordemodbaseband.cpp
|
vordemodmcbaseband.cpp
|
||||||
vordemodsink.cpp
|
vordemodmcsink.cpp
|
||||||
vordemodplugin.cpp
|
vordemodmcplugin.cpp
|
||||||
vordemodwebapiadapter.cpp
|
vordemodmcwebapiadapter.cpp
|
||||||
vordemodreport.cpp
|
vordemodmcreport.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
set(vor_HEADERS
|
set(vormc_HEADERS
|
||||||
vordemod.h
|
vordemodmc.h
|
||||||
vordemodsettings.h
|
vordemodmcsettings.h
|
||||||
vordemodbaseband.h
|
vordemodmcbaseband.h
|
||||||
vordemodsink.h
|
vordemodmcsink.h
|
||||||
vordemodplugin.h
|
vordemodmcplugin.h
|
||||||
vordemodwebapiadapter.h
|
vordemodmcwebapiadapter.h
|
||||||
vordemodreport.h
|
vordemodmcreport.h
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -26,33 +26,33 @@ include_directories(
|
||||||
)
|
)
|
||||||
|
|
||||||
if(NOT SERVER_MODE)
|
if(NOT SERVER_MODE)
|
||||||
set(vor_SOURCES
|
set(vormc_SOURCES
|
||||||
${vor_SOURCES}
|
${vormc_SOURCES}
|
||||||
vordemodgui.cpp
|
vordemodmcgui.cpp
|
||||||
vordemodgui.ui
|
vordemodmcgui.ui
|
||||||
map.qrc
|
map.qrc
|
||||||
icons.qrc
|
icons.qrc
|
||||||
)
|
)
|
||||||
set(vor_HEADERS
|
set(vormc_HEADERS
|
||||||
${vor_HEADERS}
|
${vormc_HEADERS}
|
||||||
vordemodgui.h
|
vordemodmcgui.h
|
||||||
navaid.h
|
navaid.h
|
||||||
../demodadsb/csv.h
|
../demodadsb/csv.h
|
||||||
)
|
)
|
||||||
|
|
||||||
set(TARGET_NAME demodvor)
|
set(TARGET_NAME demodvormc)
|
||||||
set(TARGET_LIB "Qt5::Widgets" Qt5::Quick Qt5::QuickWidgets Qt5::Positioning)
|
set(TARGET_LIB "Qt5::Widgets" Qt5::Quick Qt5::QuickWidgets Qt5::Positioning)
|
||||||
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 demodvorsrv)
|
set(TARGET_NAME demodvormcsrv)
|
||||||
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
|
||||||
${vor_SOURCES}
|
${vormc_SOURCES}
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME}
|
target_link_libraries(${TARGET_NAME}
|
Przed Szerokość: | Wysokość: | Rozmiar: 547 B Po Szerokość: | Wysokość: | Rozmiar: 547 B |
Przed Szerokość: | Wysokość: | Rozmiar: 365 B Po Szerokość: | Wysokość: | Rozmiar: 365 B |
Przed Szerokość: | Wysokość: | Rozmiar: 652 B Po Szerokość: | Wysokość: | Rozmiar: 652 B |
Przed Szerokość: | Wysokość: | Rozmiar: 415 B Po Szerokość: | Wysokość: | Rozmiar: 415 B |
Przed Szerokość: | Wysokość: | Rozmiar: 847 B Po Szerokość: | Wysokość: | Rozmiar: 847 B |
Przed Szerokość: | Wysokość: | Rozmiar: 1.3 KiB Po Szerokość: | Wysokość: | Rozmiar: 1.3 KiB |
|
@ -16,7 +16,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 "vordemod.h"
|
#include "vordemodmc.h"
|
||||||
|
|
||||||
#include <QTime>
|
#include <QTime>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
|
@ -28,8 +28,8 @@
|
||||||
#include "channel/channelapi.h"
|
#include "channel/channelapi.h"
|
||||||
#include "util/message.h"
|
#include "util/message.h"
|
||||||
|
|
||||||
#include "vordemodbaseband.h"
|
#include "vordemodmcbaseband.h"
|
||||||
#include "vordemodsettings.h"
|
#include "vordemodmcsettings.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 "vordemodbaseband.h"
|
#include "vordemodmcbaseband.h"
|
||||||
#include "vordemodreport.h"
|
#include "vordemodmcreport.h"
|
||||||
|
|
||||||
MESSAGE_CLASS_DEFINITION(VORDemodMCBaseband::MsgConfigureVORDemodBaseband, Message)
|
MESSAGE_CLASS_DEFINITION(VORDemodMCBaseband::MsgConfigureVORDemodBaseband, Message)
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#include "util/message.h"
|
#include "util/message.h"
|
||||||
#include "util/messagequeue.h"
|
#include "util/messagequeue.h"
|
||||||
|
|
||||||
#include "vordemodsink.h"
|
#include "vordemodmcsink.h"
|
||||||
|
|
||||||
class DownChannelizer;
|
class DownChannelizer;
|
||||||
|
|
|
@ -27,12 +27,12 @@
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QAction>
|
#include <QAction>
|
||||||
|
|
||||||
#include "vordemodgui.h"
|
#include "vordemodmcgui.h"
|
||||||
|
|
||||||
#include "device/deviceuiset.h"
|
#include "device/deviceuiset.h"
|
||||||
#include "dsp/dspengine.h"
|
#include "dsp/dspengine.h"
|
||||||
#include "dsp/dspcommands.h"
|
#include "dsp/dspcommands.h"
|
||||||
#include "ui_vordemodgui.h"
|
#include "ui_vordemodmcgui.h"
|
||||||
#include "plugin/pluginapi.h"
|
#include "plugin/pluginapi.h"
|
||||||
#include "util/simpleserializer.h"
|
#include "util/simpleserializer.h"
|
||||||
#include "util/db.h"
|
#include "util/db.h"
|
||||||
|
@ -46,9 +46,9 @@
|
||||||
#include "channel/channelwebapiutils.h"
|
#include "channel/channelwebapiutils.h"
|
||||||
#include "maincore.h"
|
#include "maincore.h"
|
||||||
|
|
||||||
#include "vordemod.h"
|
#include "vordemodmc.h"
|
||||||
#include "vordemodreport.h"
|
#include "vordemodmcreport.h"
|
||||||
#include "vordemodsink.h"
|
#include "vordemodmcsink.h"
|
||||||
|
|
||||||
#define VOR_COL_NAME 0
|
#define VOR_COL_NAME 0
|
||||||
#define VOR_COL_FREQUENCY 1
|
#define VOR_COL_FREQUENCY 1
|
|
@ -38,7 +38,7 @@
|
||||||
#include "util/httpdownloadmanager.h"
|
#include "util/httpdownloadmanager.h"
|
||||||
#include "util/azel.h"
|
#include "util/azel.h"
|
||||||
#include "settings/rollupstate.h"
|
#include "settings/rollupstate.h"
|
||||||
#include "vordemodsettings.h"
|
#include "vordemodmcsettings.h"
|
||||||
#include "navaid.h"
|
#include "navaid.h"
|
||||||
|
|
||||||
class PluginAPI;
|
class PluginAPI;
|
|
@ -20,11 +20,11 @@
|
||||||
#include "plugin/pluginapi.h"
|
#include "plugin/pluginapi.h"
|
||||||
|
|
||||||
#ifndef SERVER_MODE
|
#ifndef SERVER_MODE
|
||||||
#include "vordemodgui.h"
|
#include "vordemodmcgui.h"
|
||||||
#endif
|
#endif
|
||||||
#include "vordemod.h"
|
#include "vordemodmc.h"
|
||||||
#include "vordemodwebapiadapter.h"
|
#include "vordemodmcwebapiadapter.h"
|
||||||
#include "vordemodplugin.h"
|
#include "vordemodmcplugin.h"
|
||||||
|
|
||||||
const PluginDescriptor VORDemodMCPlugin::m_pluginDescriptor = {
|
const PluginDescriptor VORDemodMCPlugin::m_pluginDescriptor = {
|
||||||
VORDemodMC::m_channelId,
|
VORDemodMC::m_channelId,
|
||||||
|
@ -88,5 +88,5 @@ ChannelGUI* VORDemodMCPlugin::createRxChannelGUI(DeviceUISet *deviceUISet, Baseb
|
||||||
|
|
||||||
ChannelWebAPIAdapter* VORDemodMCPlugin::createChannelWebAPIAdapter() const
|
ChannelWebAPIAdapter* VORDemodMCPlugin::createChannelWebAPIAdapter() const
|
||||||
{
|
{
|
||||||
return new VORDemodWebAPIAdapter();
|
return new VORDemodMCWebAPIAdapter();
|
||||||
}
|
}
|
|
@ -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 "vordemodreport.h"
|
#include "vordemodmcreport.h"
|
||||||
|
|
||||||
MESSAGE_CLASS_DEFINITION(VORDemodMCReport::MsgReportFreqOffset, Message)
|
MESSAGE_CLASS_DEFINITION(VORDemodMCReport::MsgReportFreqOffset, Message)
|
||||||
MESSAGE_CLASS_DEFINITION(VORDemodMCReport::MsgReportRadial, Message)
|
MESSAGE_CLASS_DEFINITION(VORDemodMCReport::MsgReportRadial, 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 "vordemodsettings.h"
|
#include "vordemodmcsettings.h"
|
||||||
|
|
||||||
VORDemodMCSettings::VORDemodMCSettings() :
|
VORDemodMCSettings::VORDemodMCSettings() :
|
||||||
m_channelMarker(nullptr),
|
m_channelMarker(nullptr),
|
|
@ -27,8 +27,8 @@
|
||||||
#include "util/morse.h"
|
#include "util/morse.h"
|
||||||
#include "util/units.h"
|
#include "util/units.h"
|
||||||
|
|
||||||
#include "vordemodsink.h"
|
#include "vordemodmcsink.h"
|
||||||
#include "vordemodreport.h"
|
#include "vordemodmcreport.h"
|
||||||
|
|
||||||
VORDemodMCSink::VORDemodMCSink(const VORDemodMCSettings& settings, int subChannel,
|
VORDemodMCSink::VORDemodMCSink(const VORDemodMCSettings& settings, int subChannel,
|
||||||
MessageQueue *messageQueueToGUI) :
|
MessageQueue *messageQueueToGUI) :
|
|
@ -30,7 +30,7 @@
|
||||||
#include "util/doublebufferfifo.h"
|
#include "util/doublebufferfifo.h"
|
||||||
#include "util/messagequeue.h"
|
#include "util/messagequeue.h"
|
||||||
|
|
||||||
#include "vordemodsettings.h"
|
#include "vordemodmcsettings.h"
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
|
@ -17,16 +17,16 @@
|
||||||
///////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#include "SWGChannelSettings.h"
|
#include "SWGChannelSettings.h"
|
||||||
#include "vordemod.h"
|
#include "vordemodmc.h"
|
||||||
#include "vordemodwebapiadapter.h"
|
#include "vordemodmcwebapiadapter.h"
|
||||||
|
|
||||||
VORDemodWebAPIAdapter::VORDemodWebAPIAdapter()
|
VORDemodMCWebAPIAdapter::VORDemodMCWebAPIAdapter()
|
||||||
{}
|
{}
|
||||||
|
|
||||||
VORDemodWebAPIAdapter::~VORDemodWebAPIAdapter()
|
VORDemodMCWebAPIAdapter::~VORDemodMCWebAPIAdapter()
|
||||||
{}
|
{}
|
||||||
|
|
||||||
int VORDemodWebAPIAdapter::webapiSettingsGet(
|
int VORDemodMCWebAPIAdapter::webapiSettingsGet(
|
||||||
SWGSDRangel::SWGChannelSettings& response,
|
SWGSDRangel::SWGChannelSettings& response,
|
||||||
QString& errorMessage)
|
QString& errorMessage)
|
||||||
{
|
{
|
||||||
|
@ -38,7 +38,7 @@ int VORDemodWebAPIAdapter::webapiSettingsGet(
|
||||||
return 200;
|
return 200;
|
||||||
}
|
}
|
||||||
|
|
||||||
int VORDemodWebAPIAdapter::webapiSettingsPutPatch(
|
int VORDemodMCWebAPIAdapter::webapiSettingsPutPatch(
|
||||||
bool force,
|
bool force,
|
||||||
const QStringList& channelSettingsKeys,
|
const QStringList& channelSettingsKeys,
|
||||||
SWGSDRangel::SWGChannelSettings& response,
|
SWGSDRangel::SWGChannelSettings& response,
|
|
@ -20,15 +20,15 @@
|
||||||
#define INCLUDE_VORDEMOD_WEBAPIADAPTER_H
|
#define INCLUDE_VORDEMOD_WEBAPIADAPTER_H
|
||||||
|
|
||||||
#include "channel/channelwebapiadapter.h"
|
#include "channel/channelwebapiadapter.h"
|
||||||
#include "vordemodsettings.h"
|
#include "vordemodmcsettings.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Standalone API adapter only for the settings
|
* Standalone API adapter only for the settings
|
||||||
*/
|
*/
|
||||||
class VORDemodWebAPIAdapter : public ChannelWebAPIAdapter {
|
class VORDemodMCWebAPIAdapter : public ChannelWebAPIAdapter {
|
||||||
public:
|
public:
|
||||||
VORDemodWebAPIAdapter();
|
VORDemodMCWebAPIAdapter();
|
||||||
virtual ~VORDemodWebAPIAdapter();
|
virtual ~VORDemodMCWebAPIAdapter();
|
||||||
|
|
||||||
virtual QByteArray serialize() const { return m_settings.serialize(); }
|
virtual QByteArray serialize() const { return m_settings.serialize(); }
|
||||||
virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
|
virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
|