diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp index d3dab32f9..561842d4c 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp @@ -245,7 +245,6 @@ void SDRdaemonSinkGui::displaySettings() QString s1 = QString::number(m_settings.m_nbFECBlocks, 'f', 0); ui->nominalNbBlocksText->setText(tr("%1/%2").arg(s0).arg(s1)); - ui->serverType->setCurrentIndex((int) m_settings.m_serverType); ui->deviceIndex->setText(tr("%1").arg(m_settings.m_deviceIndex)); ui->channelIndex->setText(tr("%1").arg(m_settings.m_channelIndex)); ui->apiAddress->setText(m_settings.m_apiAddress); @@ -333,17 +332,6 @@ void SDRdaemonSinkGui::on_nbFECBlocks_valueChanged(int value) sendSettings(); } -void SDRdaemonSinkGui::on_serverType_currentIndexChanged(int index) -{ - m_settings.m_serverType = (SDRdaemonSinkSettings::ServerType) index; - sendSettings(); - - QString typeCode = m_settings.m_serverType == SDRdaemonSinkSettings::ServerAngel ? "sdrangel" : "sdrdaemon"; - QString infoURL = QString("http://%1:%2/%3").arg(m_settings.m_apiAddress).arg(m_settings.m_apiPort).arg(typeCode); - m_networkRequest.setUrl(QUrl(infoURL)); - m_networkManager->get(m_networkRequest); -} - void SDRdaemonSinkGui::on_deviceIndex_returnPressed() { bool dataOk; @@ -377,8 +365,7 @@ void SDRdaemonSinkGui::on_apiAddress_returnPressed() m_settings.m_apiAddress = ui->apiAddress->text(); sendSettings(); - QString typeCode = m_settings.m_serverType == SDRdaemonSinkSettings::ServerAngel ? "sdrangel" : "sdrdaemon"; - QString infoURL = QString("http://%1:%2/%3").arg(m_settings.m_apiAddress).arg(m_settings.m_apiPort).arg(typeCode); + QString infoURL = QString("http://%1:%2/sdrangel").arg(m_settings.m_apiAddress).arg(m_settings.m_apiPort); m_networkRequest.setUrl(QUrl(infoURL)); m_networkManager->get(m_networkRequest); } @@ -396,8 +383,7 @@ void SDRdaemonSinkGui::on_apiPort_returnPressed() sendSettings(); - QString typeCode = m_settings.m_serverType == SDRdaemonSinkSettings::ServerAngel ? "sdrangel" : "sdrdaemon"; - QString infoURL = QString("http://%1:%2/%3").arg(m_settings.m_apiAddress).arg(m_settings.m_apiPort).arg(typeCode); + QString infoURL = QString("http://%1:%2/sdrangel").arg(m_settings.m_apiAddress).arg(m_settings.m_apiPort); m_networkRequest.setUrl(QUrl(infoURL)); m_networkManager->get(m_networkRequest); } @@ -436,8 +422,7 @@ void SDRdaemonSinkGui::on_apiApplyButton_clicked(bool checked __attribute__((unu sendSettings(); - QString typeCode = m_settings.m_serverType == SDRdaemonSinkSettings::ServerAngel ? "sdrangel" : "sdrdaemon"; - QString infoURL = QString("http://%1:%2/%3").arg(m_settings.m_apiAddress).arg(m_settings.m_apiPort).arg(typeCode); + QString infoURL = QString("http://%1:%2/sdrangel").arg(m_settings.m_apiAddress).arg(m_settings.m_apiPort); m_networkRequest.setUrl(QUrl(infoURL)); m_networkManager->get(m_networkRequest); } @@ -518,20 +503,11 @@ void SDRdaemonSinkGui::tick() { QString reportURL; - if (m_settings.m_serverType == SDRdaemonSinkSettings::ServerAngel) { - reportURL = QString("http://%1:%2/sdrangel/deviceset/%3/channel/%4/report") - .arg(m_settings.m_apiAddress) - .arg(m_settings.m_apiPort) - .arg(m_settings.m_deviceIndex) - .arg(m_settings.m_channelIndex); - } - else - { - reportURL = QString("http://%1:%2/sdrdaemon/channel/report") - .arg(m_settings.m_apiAddress) - .arg(m_settings.m_apiPort); - } - + reportURL = QString("http://%1:%2/sdrangel/deviceset/%3/channel/%4/report") + .arg(m_settings.m_apiAddress) + .arg(m_settings.m_apiPort) + .arg(m_settings.m_deviceIndex) + .arg(m_settings.m_channelIndex); m_networkRequest.setUrl(QUrl(reportURL)); m_networkManager->get(m_networkRequest); diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h index a0d43facc..2e719c52f 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h @@ -145,7 +145,6 @@ private slots: void on_sampleRate_changed(quint64 value); void on_txDelay_valueChanged(int value); void on_nbFECBlocks_valueChanged(int value); - void on_serverType_currentIndexChanged(int index); void on_deviceIndex_returnPressed(); void on_channelIndex_returnPressed(); void on_apiAddress_returnPressed(); diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.ui b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.ui index 5a325b782..145378676 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.ui +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.ui @@ -7,7 +7,7 @@ 0 0 360 - 300 + 270 @@ -19,7 +19,7 @@ 360 - 300 + 270 @@ -295,6 +295,58 @@ + + + + Dev + + + + + + + + 40 + 16777215 + + + + Device index (for SDRangel server) + + + 00 + + + 0 + + + + + + + Ch + + + + + + + + 40 + 16777215 + + + + Channel index (for SDRangel) + + + 00 + + + 0 + + + @@ -520,92 +572,6 @@ - - - - - - Remote server type - - - - Angel - - - - - Daemon - - - - - - - - Device - - - - - - - - 40 - 16777215 - - - - Device index (for SDRangel server) - - - 00 - - - 0 - - - - - - - Channel - - - - - - - - 40 - 16777215 - - - - Channel index (for SDRangel) - - - 00 - - - 0 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp index 2b913dc1b..d30838339 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp @@ -14,6 +14,7 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// +#include #include #include #include @@ -52,9 +53,13 @@ SDRdaemonSinkOutput::SDRdaemonSinkOutput(DeviceSinkAPI *deviceAPI) : m_masterTimer(deviceAPI->getMasterTimer()), m_tickCount(0), m_tickMultiplier(20), + m_lastRemoteSampleCount(0), m_lastSampleCount(0), + m_lastRemoteTimestampUs(0), m_lastTimestampUs(0), + m_lastRemoteTimestampRateCorrection(0), m_lastTimestampRateCorrection(0), + m_nbRemoteSamplesSinceRateCorrection(0), m_nbSamplesSinceRateCorrection(0), m_chunkSizeCorrection(0) { @@ -271,7 +276,7 @@ void SDRdaemonSinkOutput::applySettings(const SDRdaemonSinkSettings& settings, b m_sdrDaemonSinkThread->setSamplerate(settings.m_sampleRate); } - m_tickMultiplier = (20*NbSamplesForRateCorrection) / (2*settings.m_sampleRate); // two times per sample filling period + m_tickMultiplier = (21*NbSamplesForRateCorrection) / (2*settings.m_sampleRate); // two times per sample filling period plus small extension m_tickMultiplier = m_tickMultiplier < 20 ? 20 : m_tickMultiplier; // not below half a second forwardChange = true; @@ -396,12 +401,6 @@ int SDRdaemonSinkOutput::webapiSettingsPutPatch( if (deviceSettingsKeys.contains("dataPort")) { settings.m_dataPort = response.getSdrDaemonSinkSettings()->getDataPort(); } - if (deviceSettingsKeys.contains("serverType")) { - int serverType = response.getSdrDaemonSinkSettings()->getServerType(); - settings.m_serverType = serverType < 0 ? SDRdaemonSinkSettings::ServerAngel - : serverType > 1 ? SDRdaemonSinkSettings::ServerAngel - : (SDRdaemonSinkSettings::ServerType) serverType; - } if (deviceSettingsKeys.contains("deviceIndex")) { settings.m_deviceIndex = response.getSdrDaemonSinkSettings()->getDeviceIndex(); } @@ -442,15 +441,15 @@ void SDRdaemonSinkOutput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSetti response.getSdrDaemonSinkSettings()->setApiPort(settings.m_apiPort); response.getSdrDaemonSinkSettings()->setDataAddress(new QString(settings.m_dataAddress)); response.getSdrDaemonSinkSettings()->setDataPort(settings.m_dataPort); - response.getSdrDaemonSinkSettings()->setServerType((int) settings.m_serverType); response.getSdrDaemonSinkSettings()->setDeviceIndex(settings.m_deviceIndex); response.getSdrDaemonSinkSettings()->setChannelIndex(settings.m_channelIndex); } void SDRdaemonSinkOutput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response) { + struct timeval tv; response.getSdrDaemonSinkReport()->setBufferRwBalance(m_sampleSourceFifo.getRWBalance()); - response.getSdrDaemonSinkReport()->setSampleCount(m_sdrDaemonSinkThread ? (int) m_sdrDaemonSinkThread->getSamplesCount() : 0); + response.getSdrDaemonSinkReport()->setSampleCount(m_sdrDaemonSinkThread ? (int) m_sdrDaemonSinkThread->getSamplesCount(tv) : 0); } void SDRdaemonSinkOutput::tick() @@ -507,7 +506,9 @@ void SDRdaemonSinkOutput::networkManagerFinished(QNetworkReply *reply) void SDRdaemonSinkOutput::analyzeApiReply(const QJsonObject& jsonObject) { - QString infoLine; + if (!m_sdrDaemonSinkThread) { + return; + } if (jsonObject.contains("SDRDaemonChannelSourceReport")) { @@ -516,10 +517,20 @@ void SDRdaemonSinkOutput::analyzeApiReply(const QJsonObject& jsonObject) queueSize = queueSize == 0 ? 10 : queueSize; int queueLength = report["queueLength"].toInt(); int queueLengthPercent = (queueLength*100)/queueSize; - uint64_t timestampUs = report["tvSec"].toInt()*1000000ULL + report["tvUSec"].toInt(); + uint64_t remoteTimestampUs = report["tvSec"].toInt()*1000000ULL + report["tvUSec"].toInt(); + + uint32_t remoteSampleCountDelta, remoteSampleCount; + remoteSampleCount = report["samplesCount"].toInt(); + + if (remoteSampleCount < m_lastRemoteSampleCount) { + remoteSampleCountDelta = (0xFFFFFFFFU - m_lastRemoteSampleCount) + remoteSampleCount + 1; + } else { + remoteSampleCountDelta = remoteSampleCount - m_lastRemoteSampleCount; + } uint32_t sampleCountDelta, sampleCount; - sampleCount = report["samplesCount"].toInt(); + struct timeval tv; + sampleCount = m_sdrDaemonSinkThread->getSamplesCount(tv); if (sampleCount < m_lastSampleCount) { sampleCountDelta = (0xFFFFFFFFU - m_lastSampleCount) + sampleCount + 1; @@ -527,40 +538,49 @@ void SDRdaemonSinkOutput::analyzeApiReply(const QJsonObject& jsonObject) sampleCountDelta = sampleCount - m_lastSampleCount; } - if (m_lastTimestampRateCorrection == 0) { + uint64_t timestampUs = tv.tv_sec*1000000ULL + tv.tv_usec; + + if (m_lastRemoteTimestampRateCorrection == 0) + { + m_lastRemoteTimestampRateCorrection = remoteTimestampUs; m_lastTimestampRateCorrection = timestampUs; } else { + m_nbRemoteSamplesSinceRateCorrection += remoteSampleCountDelta; m_nbSamplesSinceRateCorrection += sampleCountDelta; - qDebug("SDRdaemonSinkOutput::analyzeApiReply: queueLengthPercent: %d sampleCount: %u m_nbSamplesSinceRateCorrection: %u", + qDebug("SDRdaemonSinkOutput::analyzeApiReply: queueLengthPercent: %d m_nbSamplesSinceRateCorrection: %u", queueLengthPercent, - sampleCount, - m_nbSamplesSinceRateCorrection); + m_nbRemoteSamplesSinceRateCorrection); - if ((m_nbSamplesSinceRateCorrection > NbSamplesForRateCorrection) && ((queueLengthPercent > 60) || (queueLengthPercent < 40))) + if (m_nbRemoteSamplesSinceRateCorrection > NbSamplesForRateCorrection) { - sampleRateCorrection(queueLength, queueSize, timestampUs - m_lastTimestampRateCorrection); + sampleRateCorrection(remoteTimestampUs - m_lastRemoteTimestampRateCorrection, + timestampUs - m_lastTimestampRateCorrection, + m_nbRemoteSamplesSinceRateCorrection, + m_nbSamplesSinceRateCorrection); + m_lastRemoteTimestampRateCorrection = remoteTimestampUs; m_lastTimestampRateCorrection = timestampUs; + m_nbRemoteSamplesSinceRateCorrection = 0; m_nbSamplesSinceRateCorrection = 0; } } + m_lastRemoteSampleCount = remoteSampleCount; m_lastSampleCount = sampleCount; - m_lastTimestampUs = timestampUs; + m_lastRemoteTimestampUs = remoteTimestampUs; // TODO: remove + m_lastTimestampUs = timestampUs; // TODO: remove } } -void SDRdaemonSinkOutput::sampleRateCorrection(int queueLength, int queueSize, int64_t timeDeltaUs) +void SDRdaemonSinkOutput::sampleRateCorrection(double remoteTimeDeltaUs, double timeDeltaUs, uint32_t remoteSampleCount, uint32_t sampleCount) { - int nbBlocksDiff = queueLength - (queueSize/2); - int nbSamplesDiff = nbBlocksDiff * 127 * 127; - float sampleCorr = (nbSamplesDiff * 50000.0) / timeDeltaUs; // correction for ~50ms chunks (50000 us) - int chunkCorr = -roundf(sampleCorr); - m_chunkSizeCorrection += chunkCorr; + double deltaSR = (remoteSampleCount/remoteTimeDeltaUs) - (sampleCount/timeDeltaUs); + double chunkCorr = 50000 * deltaSR; // for 50ms chunk intervals (50000us) + m_chunkSizeCorrection += roundf(chunkCorr); - qDebug("SDRdaemonSinkOutput::sampleRateCorrection: %d (%d) samples", m_chunkSizeCorrection, chunkCorr); + qDebug("SDRdaemonSinkOutput::sampleRateCorrection: %d (%f) samples", m_chunkSizeCorrection, chunkCorr); MsgConfigureSDRdaemonSinkChunkCorrection* message = MsgConfigureSDRdaemonSinkChunkCorrection::create(m_chunkSizeCorrection); getInputMessageQueue()->push(message); diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.h b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.h index 7dec4c616..6dc29df94 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.h +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.h @@ -178,9 +178,13 @@ private: QNetworkAccessManager *m_networkManager; QNetworkRequest m_networkRequest; + uint32_t m_lastRemoteSampleCount; uint32_t m_lastSampleCount; + uint64_t m_lastRemoteTimestampUs; uint64_t m_lastTimestampUs; + uint64_t m_lastRemoteTimestampRateCorrection; uint64_t m_lastTimestampRateCorrection; + uint32_t m_nbRemoteSamplesSinceRateCorrection; uint32_t m_nbSamplesSinceRateCorrection; int m_chunkSizeCorrection; static const uint32_t NbSamplesForRateCorrection; @@ -190,7 +194,7 @@ private: void webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response); void analyzeApiReply(const QJsonObject& jsonObject); - void sampleRateCorrection(int queueLength, int queueSize, int64_t timeDeltaUs); + void sampleRateCorrection(double remoteTimeDeltaUs, double timeDeltaUs, uint32_t remoteSampleCount, uint32_t sampleCount); private slots: void tick(); diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinksettings.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinksettings.cpp index ad28bdfb0..7cc5d4548 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinksettings.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinksettings.cpp @@ -32,7 +32,6 @@ void SDRdaemonSinkSettings::resetToDefaults() m_apiPort = 9091; m_dataAddress = "127.0.0.1"; m_dataPort = 9090; - m_serverType = ServerAngel; m_deviceIndex = 0; m_channelIndex = 0; } @@ -49,7 +48,6 @@ QByteArray SDRdaemonSinkSettings::serialize() const s.writeU32(6, m_apiPort); s.writeString(7, m_dataAddress); s.writeU32(8, m_dataPort); - s.writeS32(9, (int) m_serverType); s.writeU32(10, m_deviceIndex); s.writeU32(11, m_channelIndex); @@ -69,7 +67,6 @@ bool SDRdaemonSinkSettings::deserialize(const QByteArray& data) if (d.getVersion() == 1) { quint32 uintval; - int intval; d.readU64(1, &m_centerFrequency, 435000*1000); d.readU32(2, &m_sampleRate, 48000); @@ -81,14 +78,6 @@ bool SDRdaemonSinkSettings::deserialize(const QByteArray& data) d.readString(7, &m_dataAddress, "127.0.0.1"); d.readU32(8, &uintval, 9090); m_dataPort = uintval % (1<<16); - d.readS32(9, &intval, 0); - - if ((intval < 0) || (intval > 1)) { - m_serverType = ServerAngel; - } else { - m_serverType = (ServerType) intval; - } - d.readU32(10, &m_deviceIndex, 0); d.readU32(11, &m_channelIndex, 0); diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinksettings.h b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinksettings.h index 4c9d4d9e7..88176fdec 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinksettings.h +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinksettings.h @@ -20,12 +20,6 @@ #include struct SDRdaemonSinkSettings { - - typedef enum { - ServerAngel = 0, - ServerDaemon - } ServerType; - quint64 m_centerFrequency; quint32 m_sampleRate; float m_txDelay; @@ -34,7 +28,6 @@ struct SDRdaemonSinkSettings { quint16 m_apiPort; QString m_dataAddress; quint16 m_dataPort; - ServerType m_serverType; quint32 m_deviceIndex; quint32 m_channelIndex; diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkthread.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkthread.cpp index be7bda63d..9c9d01816 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkthread.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkthread.cpp @@ -14,6 +14,7 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// +#include #include #include #include @@ -136,3 +137,9 @@ void SDRdaemonSinkThread::tick() m_udpSinkFEC.write(beginRead, m_samplesChunkSize); } } + +uint32_t SDRdaemonSinkThread::getSamplesCount(struct timeval& tv) const +{ + gettimeofday(&tv, 0); + return m_samplesCount; +} diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkthread.h b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkthread.h index 349615fd1..f84b5f8a8 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkthread.h +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkthread.h @@ -17,15 +17,16 @@ #ifndef INCLUDE_SDRDAEMONSINKTHREAD_H #define INCLUDE_SDRDAEMONSINKTHREAD_H +#include +#include +#include +#include + #include #include #include #include #include -#include -#include -#include -#include #include "dsp/inthalfbandfilter.h" #include "dsp/interpolators.h" @@ -35,6 +36,7 @@ #define SDRDAEMONSINK_THROTTLE_MS 50 class SampleSourceFifo; +struct timeval; class SDRdaemonSinkThread : public QThread { Q_OBJECT @@ -54,7 +56,7 @@ public: bool isRunning() const { return m_running; } - uint32_t getSamplesCount() const { return m_samplesCount; } + uint32_t getSamplesCount(struct timeval& tv) const; void setSamplesCount(int samplesCount) { m_samplesCount = samplesCount; } void setChunkCorrection(int chunkCorrection) { m_chunkCorrection = chunkCorrection; } diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 5db2c3181..621e6e325 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -3368,9 +3368,6 @@ margin-bottom: 20px; "dataPort" : { "type" : "integer" }, - "serverType" : { - "type" : "integer" - }, "deviceIndex" : { "type" : "integer" }, @@ -28719,7 +28716,7 @@ except ApiException as e:
- Generated 2018-09-02T19:22:42.257+02:00 + Generated 2018-09-04T08:40:33.765+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/SDRDaemonSink.yaml b/sdrbase/resources/webapi/doc/swagger/include/SDRDaemonSink.yaml index a70b54e3f..c9ee31515 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SDRDaemonSink.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SDRDaemonSink.yaml @@ -20,11 +20,11 @@ SDRdaemonSinkSettings: type: string dataPort: type: integer - serverType: - type: integer deviceIndex: + device: remote SDRangel instance deviceset index type: integer channelIndex: + device: remote SDRangel instance channel index type: integer SDRdaemonSinkReport: diff --git a/swagger/sdrangel/api/swagger/include/SDRDaemonSink.yaml b/swagger/sdrangel/api/swagger/include/SDRDaemonSink.yaml index a70b54e3f..c9ee31515 100644 --- a/swagger/sdrangel/api/swagger/include/SDRDaemonSink.yaml +++ b/swagger/sdrangel/api/swagger/include/SDRDaemonSink.yaml @@ -20,11 +20,11 @@ SDRdaemonSinkSettings: type: string dataPort: type: integer - serverType: - type: integer deviceIndex: + device: remote SDRangel instance deviceset index type: integer channelIndex: + device: remote SDRangel instance channel index type: integer SDRdaemonSinkReport: diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 5db2c3181..621e6e325 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -3368,9 +3368,6 @@ margin-bottom: 20px; "dataPort" : { "type" : "integer" }, - "serverType" : { - "type" : "integer" - }, "deviceIndex" : { "type" : "integer" }, @@ -28719,7 +28716,7 @@ except ApiException as e:
- Generated 2018-09-02T19:22:42.257+02:00 + Generated 2018-09-04T08:40:33.765+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSinkSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSinkSettings.cpp index f818aab62..48b33a891 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSinkSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSinkSettings.cpp @@ -44,8 +44,6 @@ SWGSDRdaemonSinkSettings::SWGSDRdaemonSinkSettings() { m_data_address_isSet = false; data_port = 0; m_data_port_isSet = false; - server_type = 0; - m_server_type_isSet = false; device_index = 0; m_device_index_isSet = false; channel_index = 0; @@ -74,8 +72,6 @@ SWGSDRdaemonSinkSettings::init() { m_data_address_isSet = false; data_port = 0; m_data_port_isSet = false; - server_type = 0; - m_server_type_isSet = false; device_index = 0; m_device_index_isSet = false; channel_index = 0; @@ -98,7 +94,6 @@ SWGSDRdaemonSinkSettings::cleanup() { - } SWGSDRdaemonSinkSettings* @@ -128,8 +123,6 @@ SWGSDRdaemonSinkSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&data_port, pJson["dataPort"], "qint32", ""); - ::SWGSDRangel::setValue(&server_type, pJson["serverType"], "qint32", ""); - ::SWGSDRangel::setValue(&device_index, pJson["deviceIndex"], "qint32", ""); ::SWGSDRangel::setValue(&channel_index, pJson["channelIndex"], "qint32", ""); @@ -174,9 +167,6 @@ SWGSDRdaemonSinkSettings::asJsonObject() { if(m_data_port_isSet){ obj->insert("dataPort", QJsonValue(data_port)); } - if(m_server_type_isSet){ - obj->insert("serverType", QJsonValue(server_type)); - } if(m_device_index_isSet){ obj->insert("deviceIndex", QJsonValue(device_index)); } @@ -267,16 +257,6 @@ SWGSDRdaemonSinkSettings::setDataPort(qint32 data_port) { this->m_data_port_isSet = true; } -qint32 -SWGSDRdaemonSinkSettings::getServerType() { - return server_type; -} -void -SWGSDRdaemonSinkSettings::setServerType(qint32 server_type) { - this->server_type = server_type; - this->m_server_type_isSet = true; -} - qint32 SWGSDRdaemonSinkSettings::getDeviceIndex() { return device_index; @@ -310,7 +290,6 @@ SWGSDRdaemonSinkSettings::isSet(){ if(m_api_port_isSet){ isObjectUpdated = true; break;} if(data_address != nullptr && *data_address != QString("")){ isObjectUpdated = true; break;} if(m_data_port_isSet){ isObjectUpdated = true; break;} - if(m_server_type_isSet){ isObjectUpdated = true; break;} if(m_device_index_isSet){ isObjectUpdated = true; break;} if(m_channel_index_isSet){ isObjectUpdated = true; break;} }while(false); diff --git a/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSinkSettings.h b/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSinkSettings.h index 20f3f8a88..14a3198ad 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSinkSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSinkSettings.h @@ -66,9 +66,6 @@ public: qint32 getDataPort(); void setDataPort(qint32 data_port); - qint32 getServerType(); - void setServerType(qint32 server_type); - qint32 getDeviceIndex(); void setDeviceIndex(qint32 device_index); @@ -103,9 +100,6 @@ private: qint32 data_port; bool m_data_port_isSet; - qint32 server_type; - bool m_server_type_isSet; - qint32 device_index; bool m_device_index_isSet;