VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-06-17 13:52:47 -04:00
Code Issues Projects Releases Wiki Activity

FileSink: REST API implementation

Browse Source
This commit is contained in:
f4exb 2020-08-07 08:00:49 +02:00
parent 5a22072153
commit 45698b1896
5 changed files with 85 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/channelrx/CMakeLists.txt
View File

@ -7,6 +7,7 @@ add_subdirectory(demodssb)
add_subdirectory(udpsink) add_subdirectory(udpsink)
add_subdirectory(demodwfm) add_subdirectory(demodwfm)
add_subdirectory(localsink) add_subdirectory(localsink)
add_subdirectory(filesink)
add_subdirectory(freqtracker) add_subdirectory(freqtracker)
if(LIBDSDCC_FOUND AND LIBMBE_FOUND) if(LIBDSDCC_FOUND AND LIBMBE_FOUND)

136
plugins/channelrx/filesink/filesink.cpp
View File

@ -334,8 +334,8 @@ int FileSink::webapiSettingsGet(
QString& errorMessage) QString& errorMessage)
{ {
(void) errorMessage; (void) errorMessage;
response.setSigMfFileSinkSettings(new SWGSDRangel::SWGSigMFFileSinkSettings()); response.setFileSinkSettings(new SWGSDRangel::SWGFileSinkSettings());
response.getSigMfFileSinkSettings()->init(); response.getFileSinkSettings()->init();
webapiFormatChannelSettings(response, m_settings); webapiFormatChannelSettings(response, m_settings);
return 200; return 200;
} }
@ -370,8 +370,8 @@ int FileSink::webapiReportGet(
QString& errorMessage) QString& errorMessage)
{ {
(void) errorMessage; (void) errorMessage;
response.setSigMfFileSinkReport(new SWGSDRangel::SWGSigMFFileSinkReport()); response.setFileSinkReport(new SWGSDRangel::SWGFileSinkReport());
response.getSigMfFileSinkReport()->init(); response.getFileSinkReport()->init();
webapiFormatChannelReport(response); webapiFormatChannelReport(response);
return 200; return 200;
} }
@ -381,13 +381,13 @@ int FileSink::webapiActionsPost(
SWGSDRangel::SWGChannelActions& query, SWGSDRangel::SWGChannelActions& query,
QString& errorMessage) QString& errorMessage)
{ {
SWGSDRangel::SWGSigMFFileSinkActions *swgSigMFFileSinkActions = query.getSigMfFileSinkActions(); SWGSDRangel::SWGFileSinkActions *swgFileSinkActions = query.getFileSinkActions();
if (swgSigMFFileSinkActions) if (swgFileSinkActions)
{ {
if (channelActionsKeys.contains("record")) if (channelActionsKeys.contains("record"))
{ {
bool record = swgSigMFFileSinkActions->getRecord() != 0; bool record = swgFileSinkActions->getRecord() != 0;
if (!m_settings.m_squelchRecordingEnable) if (!m_settings.m_squelchRecordingEnable)
{ {
@ -406,7 +406,7 @@ int FileSink::webapiActionsPost(
} }
else else
{ {
errorMessage = "Missing SigMFFileSinkActions in query"; errorMessage = "Missing FileSinkActions in query";
return 400; return 400;
} }
} }
@ -417,106 +417,106 @@ void FileSink::webapiUpdateChannelSettings(
SWGSDRangel::SWGChannelSettings& response) SWGSDRangel::SWGChannelSettings& response)
{ {
if (channelSettingsKeys.contains("inputFrequencyOffset")) { if (channelSettingsKeys.contains("inputFrequencyOffset")) {
settings.m_inputFrequencyOffset = response.getSigMfFileSinkSettings()->getInputFrequencyOffset(); settings.m_inputFrequencyOffset = response.getFileSinkSettings()->getInputFrequencyOffset();
} }
if (channelSettingsKeys.contains("fileRecordName")) { if (channelSettingsKeys.contains("fileRecordName")) {
settings.m_fileRecordName = *response.getSigMfFileSinkSettings()->getFileRecordName(); settings.m_fileRecordName = *response.getFileSinkSettings()->getFileRecordName();
} }
if (channelSettingsKeys.contains("rgbColor")) { if (channelSettingsKeys.contains("rgbColor")) {
settings.m_rgbColor = response.getSigMfFileSinkSettings()->getRgbColor(); settings.m_rgbColor = response.getFileSinkSettings()->getRgbColor();
} }
if (channelSettingsKeys.contains("title")) { if (channelSettingsKeys.contains("title")) {
settings.m_title = *response.getSigMfFileSinkSettings()->getTitle(); settings.m_title = *response.getFileSinkSettings()->getTitle();
} }
if (channelSettingsKeys.contains("log2Decim")) { if (channelSettingsKeys.contains("log2Decim")) {
settings.m_log2Decim = response.getSigMfFileSinkSettings()->getLog2Decim(); settings.m_log2Decim = response.getFileSinkSettings()->getLog2Decim();
} }
if (channelSettingsKeys.contains("spectrumSquelchMode")) { if (channelSettingsKeys.contains("spectrumSquelchMode")) {
settings.m_spectrumSquelchMode = response.getSigMfFileSinkSettings()->getSpectrumSquelchMode() != 0; settings.m_spectrumSquelchMode = response.getFileSinkSettings()->getSpectrumSquelchMode() != 0;
} }
if (channelSettingsKeys.contains("spectrumSquelch")) { if (channelSettingsKeys.contains("spectrumSquelch")) {
settings.m_spectrumSquelch = response.getSigMfFileSinkSettings()->getSpectrumSquelch(); settings.m_spectrumSquelch = response.getFileSinkSettings()->getSpectrumSquelch();
} }
if (channelSettingsKeys.contains("preRecordTime")) { if (channelSettingsKeys.contains("preRecordTime")) {
settings.m_preRecordTime = response.getSigMfFileSinkSettings()->getPreRecordTime(); settings.m_preRecordTime = response.getFileSinkSettings()->getPreRecordTime();
} }
if (channelSettingsKeys.contains("squelchPostRecordTime")) { if (channelSettingsKeys.contains("squelchPostRecordTime")) {
settings.m_squelchPostRecordTime = response.getSigMfFileSinkSettings()->getSquelchPostRecordTime(); settings.m_squelchPostRecordTime = response.getFileSinkSettings()->getSquelchPostRecordTime();
} }
if (channelSettingsKeys.contains("squelchRecordingEnable")) { if (channelSettingsKeys.contains("squelchRecordingEnable")) {
settings.m_squelchRecordingEnable = response.getSigMfFileSinkSettings()->getSquelchRecordingEnable() != 0; settings.m_squelchRecordingEnable = response.getFileSinkSettings()->getSquelchRecordingEnable() != 0;
} }
if (channelSettingsKeys.contains("streamIndex")) { if (channelSettingsKeys.contains("streamIndex")) {
settings.m_streamIndex = response.getSigMfFileSinkSettings()->getStreamIndex(); settings.m_streamIndex = response.getFileSinkSettings()->getStreamIndex();
} }
if (channelSettingsKeys.contains("useReverseAPI")) { if (channelSettingsKeys.contains("useReverseAPI")) {
settings.m_useReverseAPI = response.getSigMfFileSinkSettings()->getUseReverseApi() != 0; settings.m_useReverseAPI = response.getFileSinkSettings()->getUseReverseApi() != 0;
} }
if (channelSettingsKeys.contains("reverseAPIAddress")) { if (channelSettingsKeys.contains("reverseAPIAddress")) {
settings.m_reverseAPIAddress = *response.getSigMfFileSinkSettings()->getReverseApiAddress(); settings.m_reverseAPIAddress = *response.getFileSinkSettings()->getReverseApiAddress();
} }
if (channelSettingsKeys.contains("reverseAPIPort")) { if (channelSettingsKeys.contains("reverseAPIPort")) {
settings.m_reverseAPIPort = response.getSigMfFileSinkSettings()->getReverseApiPort(); settings.m_reverseAPIPort = response.getFileSinkSettings()->getReverseApiPort();
} }
if (channelSettingsKeys.contains("reverseAPIDeviceIndex")) { if (channelSettingsKeys.contains("reverseAPIDeviceIndex")) {
settings.m_reverseAPIDeviceIndex = response.getSigMfFileSinkSettings()->getReverseApiDeviceIndex(); settings.m_reverseAPIDeviceIndex = response.getFileSinkSettings()->getReverseApiDeviceIndex();
} }
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) { if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getSigMfFileSinkSettings()->getReverseApiChannelIndex(); settings.m_reverseAPIChannelIndex = response.getFileSinkSettings()->getReverseApiChannelIndex();
} }
if (channelSettingsKeys.contains("inputFrequencyOffset")) { if (channelSettingsKeys.contains("inputFrequencyOffset")) {
settings.m_reverseAPIChannelIndex = response.getSigMfFileSinkSettings()->getInputFrequencyOffset(); settings.m_reverseAPIChannelIndex = response.getFileSinkSettings()->getInputFrequencyOffset();
} }
} }
void FileSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const FileSinkSettings& settings) void FileSink::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const FileSinkSettings& settings)
{ {
response.getSigMfFileSinkSettings()->setInputFrequencyOffset(settings.m_inputFrequencyOffset); response.getFileSinkSettings()->setInputFrequencyOffset(settings.m_inputFrequencyOffset);
if (response.getSigMfFileSinkSettings()->getFileRecordName()) { if (response.getFileSinkSettings()->getFileRecordName()) {
*response.getSigMfFileSinkSettings()->getFileRecordName() = settings.m_fileRecordName; *response.getFileSinkSettings()->getFileRecordName() = settings.m_fileRecordName;
} else { } else {
response.getSigMfFileSinkSettings()->setFileRecordName(new QString(settings.m_fileRecordName)); response.getFileSinkSettings()->setFileRecordName(new QString(settings.m_fileRecordName));
} }
response.getSigMfFileSinkSettings()->setRgbColor(settings.m_rgbColor); response.getFileSinkSettings()->setRgbColor(settings.m_rgbColor);
if (response.getSigMfFileSinkSettings()->getTitle()) { if (response.getFileSinkSettings()->getTitle()) {
*response.getSigMfFileSinkSettings()->getTitle() = settings.m_title; *response.getFileSinkSettings()->getTitle() = settings.m_title;
} else { } else {
response.getSigMfFileSinkSettings()->setTitle(new QString(settings.m_title)); response.getFileSinkSettings()->setTitle(new QString(settings.m_title));
} }
response.getSigMfFileSinkSettings()->setLog2Decim(settings.m_log2Decim); response.getFileSinkSettings()->setLog2Decim(settings.m_log2Decim);
response.getSigMfFileSinkSettings()->setSpectrumSquelchMode(settings.m_spectrumSquelchMode ? 1 : 0); response.getFileSinkSettings()->setSpectrumSquelchMode(settings.m_spectrumSquelchMode ? 1 : 0);
response.getSigMfFileSinkSettings()->setSpectrumSquelch(settings.m_spectrumSquelch); response.getFileSinkSettings()->setSpectrumSquelch(settings.m_spectrumSquelch);
response.getSigMfFileSinkSettings()->setPreRecordTime(settings.m_preRecordTime); response.getFileSinkSettings()->setPreRecordTime(settings.m_preRecordTime);
response.getSigMfFileSinkSettings()->setSquelchPostRecordTime(settings.m_squelchPostRecordTime); response.getFileSinkSettings()->setSquelchPostRecordTime(settings.m_squelchPostRecordTime);
response.getSigMfFileSinkSettings()->setSquelchRecordingEnable(settings.m_squelchRecordingEnable ? 1 : 0); response.getFileSinkSettings()->setSquelchRecordingEnable(settings.m_squelchRecordingEnable ? 1 : 0);
response.getSigMfFileSinkSettings()->setStreamIndex(settings.m_streamIndex); response.getFileSinkSettings()->setStreamIndex(settings.m_streamIndex);
response.getSigMfFileSinkSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); response.getFileSinkSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0);
if (response.getSigMfFileSinkSettings()->getReverseApiAddress()) { if (response.getFileSinkSettings()->getReverseApiAddress()) {
*response.getSigMfFileSinkSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; *response.getFileSinkSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress;
} else { } else {
response.getSigMfFileSinkSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); response.getFileSinkSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress));
} }
response.getSigMfFileSinkSettings()->setReverseApiPort(settings.m_reverseAPIPort); response.getFileSinkSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getSigMfFileSinkSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); response.getFileSinkSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getSigMfFileSinkSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex); response.getFileSinkSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
} }
void FileSink::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response) void FileSink::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
{ {
response.getSigMfFileSinkReport()->setSpectrumSquelch(m_basebandSink->isSquelchOpen() ? 1 : 0); response.getFileSinkReport()->setSpectrumSquelch(m_basebandSink->isSquelchOpen() ? 1 : 0);
response.getSigMfFileSinkReport()->setSpectrumMax(m_basebandSink->getSpecMax()); response.getFileSinkReport()->setSpectrumMax(m_basebandSink->getSpecMax());
response.getSigMfFileSinkReport()->setSinkSampleRate(m_basebandSink->getSinkSampleRate()); response.getFileSinkReport()->setSinkSampleRate(m_basebandSink->getSinkSampleRate());
response.getSigMfFileSinkReport()->setRecordTimeMs(getMsCount()); response.getFileSinkReport()->setRecordTimeMs(getMsCount());
response.getSigMfFileSinkReport()->setRecordSize(getByteCount()); response.getFileSinkReport()->setRecordSize(getByteCount());
response.getSigMfFileSinkReport()->setRecording(m_basebandSink->isRecording() ? 1 : 0); response.getFileSinkReport()->setRecording(m_basebandSink->isRecording() ? 1 : 0);
response.getSigMfFileSinkReport()->setRecordCaptures(getNbTracks()); response.getFileSinkReport()->setRecordCaptures(getNbTracks());
response.getSigMfFileSinkReport()->setChannelSampleRate(m_basebandSink->getChannelSampleRate()); response.getFileSinkReport()->setChannelSampleRate(m_basebandSink->getChannelSampleRate());
} }
void FileSink::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const FileSinkSettings& settings, bool force) void FileSink::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const FileSinkSettings& settings, bool force)
@ -526,43 +526,43 @@ void FileSink::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, co
swgChannelSettings->setOriginatorChannelIndex(getIndexInDeviceSet()); swgChannelSettings->setOriginatorChannelIndex(getIndexInDeviceSet());
swgChannelSettings->setOriginatorDeviceSetIndex(getDeviceSetIndex()); swgChannelSettings->setOriginatorDeviceSetIndex(getDeviceSetIndex());
swgChannelSettings->setChannelType(new QString("FileSink")); swgChannelSettings->setChannelType(new QString("FileSink"));
swgChannelSettings->setSigMfFileSinkSettings(new SWGSDRangel::SWGSigMFFileSinkSettings()); swgChannelSettings->setFileSinkSettings(new SWGSDRangel::SWGFileSinkSettings());
SWGSDRangel::SWGSigMFFileSinkSettings *swgSigMFFileSinkSettings = swgChannelSettings->getSigMfFileSinkSettings(); SWGSDRangel::SWGFileSinkSettings *swgFileSinkSettings = swgChannelSettings->getFileSinkSettings();
// transfer data that has been modified. When force is on transfer all data except reverse API data // transfer data that has been modified. When force is on transfer all data except reverse API data
if (channelSettingsKeys.contains("inputFrequencyOffset")) { if (channelSettingsKeys.contains("inputFrequencyOffset")) {
swgSigMFFileSinkSettings->setInputFrequencyOffset(settings.m_inputFrequencyOffset); swgFileSinkSettings->setInputFrequencyOffset(settings.m_inputFrequencyOffset);
} }
if (channelSettingsKeys.contains("fileRecordName")) { if (channelSettingsKeys.contains("fileRecordName")) {
swgSigMFFileSinkSettings->setTitle(new QString(settings.m_fileRecordName)); swgFileSinkSettings->setTitle(new QString(settings.m_fileRecordName));
} }
if (channelSettingsKeys.contains("rgbColor") || force) { if (channelSettingsKeys.contains("rgbColor") || force) {
swgSigMFFileSinkSettings->setRgbColor(settings.m_rgbColor); swgFileSinkSettings->setRgbColor(settings.m_rgbColor);
} }
if (channelSettingsKeys.contains("title") || force) { if (channelSettingsKeys.contains("title") || force) {
swgSigMFFileSinkSettings->setTitle(new QString(settings.m_title)); swgFileSinkSettings->setTitle(new QString(settings.m_title));
} }
if (channelSettingsKeys.contains("log2Decim") || force) { if (channelSettingsKeys.contains("log2Decim") || force) {
swgSigMFFileSinkSettings->setLog2Decim(settings.m_log2Decim); swgFileSinkSettings->setLog2Decim(settings.m_log2Decim);
} }
if (channelSettingsKeys.contains("spectrumSquelchMode")) { if (channelSettingsKeys.contains("spectrumSquelchMode")) {
swgSigMFFileSinkSettings->setSpectrumSquelchMode(settings.m_spectrumSquelchMode ? 1 : 0); swgFileSinkSettings->setSpectrumSquelchMode(settings.m_spectrumSquelchMode ? 1 : 0);
} }
if (channelSettingsKeys.contains("spectrumSquelch")) { if (channelSettingsKeys.contains("spectrumSquelch")) {
swgSigMFFileSinkSettings->setSpectrumSquelch(settings.m_spectrumSquelch); swgFileSinkSettings->setSpectrumSquelch(settings.m_spectrumSquelch);
} }
if (channelSettingsKeys.contains("preRecordTime")) { if (channelSettingsKeys.contains("preRecordTime")) {
swgSigMFFileSinkSettings->setPreRecordTime(settings.m_preRecordTime); swgFileSinkSettings->setPreRecordTime(settings.m_preRecordTime);
} }
if (channelSettingsKeys.contains("squelchPostRecordTime")) { if (channelSettingsKeys.contains("squelchPostRecordTime")) {
swgSigMFFileSinkSettings->setSquelchPostRecordTime(settings.m_squelchPostRecordTime); swgFileSinkSettings->setSquelchPostRecordTime(settings.m_squelchPostRecordTime);
} }
if (channelSettingsKeys.contains("squelchRecordingEnable")) { if (channelSettingsKeys.contains("squelchRecordingEnable")) {
swgSigMFFileSinkSettings->setSquelchRecordingEnable(settings.m_squelchRecordingEnable ? 1 : 0); swgFileSinkSettings->setSquelchRecordingEnable(settings.m_squelchRecordingEnable ? 1 : 0);
} }
if (channelSettingsKeys.contains("streamIndex")) { if (channelSettingsKeys.contains("streamIndex")) {
swgSigMFFileSinkSettings->setStreamIndex(settings.m_streamIndex); swgFileSinkSettings->setStreamIndex(settings.m_streamIndex);
} }
QString channelSettingsURL = QString("http://%1:%2/sdrangel/deviceset/%3/channel/%4/settings") QString channelSettingsURL = QString("http://%1:%2/sdrangel/deviceset/%3/channel/%4/settings")

1
plugins/channelrx/filesink/filesinksink.cpp
View File

@ -18,7 +18,6 @@
#include <QDebug> #include <QDebug>
#include "dsp/dspcommands.h" #include "dsp/dspcommands.h"
#include "dsp/sigmffilerecord.h"
#include "dsp/spectrumvis.h" #include "dsp/spectrumvis.h"
#include "filesinkmessages.h" #include "filesinkmessages.h"

4
plugins/channelrx/filesink/filesinkwebapiadapter.cpp
View File

@ -31,8 +31,8 @@ int FileSinkWebAPIAdapter::webapiSettingsGet(
{ {
(void) errorMessage; (void) errorMessage;
(void) response; (void) response;
response.setSigMfFileSinkSettings(new SWGSDRangel::SWGSigMFFileSinkSettings()); response.setFileSinkSettings(new SWGSDRangel::SWGFileSinkSettings());
response.getSigMfFileSinkSettings()->init(); response.getFileSinkSettings()->init();
FileSink::webapiFormatChannelSettings(response, m_settings); FileSink::webapiFormatChannelSettings(response, m_settings);
return 200; return 200;

15
sdrbase/webapi/webapirequestmapper.cpp
View File

@ -64,6 +64,7 @@ const QMap<QString, QString> WebAPIRequestMapper::m_channelURIToSettingsKey = {
{"sdrangel.channel.demodatv", "ATVDemodSettings"}, {"sdrangel.channel.demodatv", "ATVDemodSettings"},
{"sdrangel.channel.demoddatv", "DATVDemodSettings"}, {"sdrangel.channel.demoddatv", "DATVDemodSettings"},
{"sdrangel.channel.dsddemod", "DSDDemodSettings"}, {"sdrangel.channel.dsddemod", "DSDDemodSettings"},
{"sdrangel.channel.filesink", "FileSinkSettings"},
{"sdrangel.channeltx.filesource", "FileSourceSettings"}, {"sdrangel.channeltx.filesource", "FileSourceSettings"},
{"sdrangel.channel.freedvdemod", "FreeDVDemodSettings"}, {"sdrangel.channel.freedvdemod", "FreeDVDemodSettings"},
{"sdrangel.channeltx.freedvmod", "FreeDVModSettings"}, {"sdrangel.channeltx.freedvmod", "FreeDVModSettings"},
@ -135,6 +136,7 @@ const QMap<QString, QString> WebAPIRequestMapper::m_channelTypeToSettingsKey = {
{"ChannelAnalyzer", "ChannelAnalyzerSettings"}, {"ChannelAnalyzer", "ChannelAnalyzerSettings"},
{"DATVDemod", "DATVDemodSettings"}, {"DATVDemod", "DATVDemodSettings"},
{"DSDDemod", "DSDDemodSettings"}, {"DSDDemod", "DSDDemodSettings"},
{"FileSink", "FileSinkSettings"},
{"FileSource", "FileSourceSettings"}, {"FileSource", "FileSourceSettings"},
{"FreeDVDemod", "FreeDVDemodSettings"}, {"FreeDVDemod", "FreeDVDemodSettings"},
{"FreeDVMod", "FreeDVModSettings"}, {"FreeDVMod", "FreeDVModSettings"},
@ -154,6 +156,7 @@ const QMap<QString, QString> WebAPIRequestMapper::m_channelTypeToSettingsKey = {
}; };
const QMap<QString, QString> WebAPIRequestMapper::m_channelTypeToActionsKey = { const QMap<QString, QString> WebAPIRequestMapper::m_channelTypeToActionsKey = {
{"FileSink", "FileSinkActions"},
{"FileSource", "FileSourceActions"} {"FileSource", "FileSourceActions"}
}; };
@ -3125,6 +3128,11 @@ bool WebAPIRequestMapper::getChannelSettings(
channelSettings->setDsdDemodSettings(new SWGSDRangel::SWGDSDDemodSettings()); channelSettings->setDsdDemodSettings(new SWGSDRangel::SWGDSDDemodSettings());
channelSettings->getDsdDemodSettings()->fromJsonObject(settingsJsonObject); channelSettings->getDsdDemodSettings()->fromJsonObject(settingsJsonObject);
} }
else if (channelSettingsKey == "FileSinkSettings")
{
channelSettings->setFileSinkSettings(new SWGSDRangel::SWGFileSinkSettings());
channelSettings->getFileSinkSettings()->fromJsonObject(settingsJsonObject);
}
else if (channelSettingsKey == "FileSourceSettings") else if (channelSettingsKey == "FileSourceSettings")
{ {
channelSettings->setFileSourceSettings(new SWGSDRangel::SWGFileSourceSettings()); channelSettings->setFileSourceSettings(new SWGSDRangel::SWGFileSourceSettings());
@ -3232,7 +3240,12 @@ bool WebAPIRequestMapper::getChannelActions(
QJsonObject actionsJsonObject = channelActionsJson[channelActionsKey].toObject(); QJsonObject actionsJsonObject = channelActionsJson[channelActionsKey].toObject();
channelActionsKeys = actionsJsonObject.keys(); channelActionsKeys = actionsJsonObject.keys();
if (channelActionsKey == "FileSourceActions") if (channelActionsKey == "FileSinkActions")
{
channelActions->setFileSinkActions(new SWGSDRangel::SWGFileSinkActions());
channelActions->getFileSinkActions()->fromJsonObject(actionsJsonObject);
}
else if (channelActionsKey == "FileSourceActions")
{ {
channelActions->setFileSourceActions(new SWGSDRangel::SWGFileSourceActions()); channelActions->setFileSourceActions(new SWGSDRangel::SWGFileSourceActions());
channelActions->getFileSourceActions()->fromJsonObject(actionsJsonObject); channelActions->getFileSourceActions()->fromJsonObject(actionsJsonObject);