diff --git a/plugins/feature/simpleptt/simpleptt.cpp b/plugins/feature/simpleptt/simpleptt.cpp index fafaf85988..ebf61f63bd 100644 --- a/plugins/feature/simpleptt/simpleptt.cpp +++ b/plugins/feature/simpleptt/simpleptt.cpp @@ -107,7 +107,7 @@ void SimplePTT::start() m_state = StRunning; m_thread->start(); - SimplePTTWorker::MsgConfigureSimplePTTWorker *msg = SimplePTTWorker::MsgConfigureSimplePTTWorker::create(m_settings, true); + SimplePTTWorker::MsgConfigureSimplePTTWorker *msg = SimplePTTWorker::MsgConfigureSimplePTTWorker::create(m_settings, QList(), true); m_worker->getInputMessageQueue()->push(msg); m_running = true; @@ -135,7 +135,7 @@ bool SimplePTT::handleMessage(const Message& cmd) { MsgConfigureSimplePTT& cfg = (MsgConfigureSimplePTT&) cmd; qDebug() << "SimplePTT::handleMessage: MsgConfigureSimplePTT"; - applySettings(cfg.getSettings(), cfg.getForce()); + applySettings(cfg.getSettings(), cfg.getSettingsKeys(), cfg.getForce()); return true; } @@ -181,14 +181,14 @@ bool SimplePTT::deserialize(const QByteArray& data) { if (m_settings.deserialize(data)) { - MsgConfigureSimplePTT *msg = MsgConfigureSimplePTT::create(m_settings, true); + MsgConfigureSimplePTT *msg = MsgConfigureSimplePTT::create(m_settings, QList(), true); m_inputMessageQueue.push(msg); return true; } else { m_settings.resetToDefaults(); - MsgConfigureSimplePTT *msg = MsgConfigureSimplePTT::create(m_settings, true); + MsgConfigureSimplePTT *msg = MsgConfigureSimplePTT::create(m_settings, QList(), true); m_inputMessageQueue.push(msg); return false; } @@ -201,74 +201,33 @@ void SimplePTT::getAudioPeak(float& peak) } } -void SimplePTT::applySettings(const SimplePTTSettings& settings, bool force) +void SimplePTT::applySettings(const SimplePTTSettings& settings, const QList& settingsKeys, bool force) { - qDebug() << "SimplePTT::applySettings:" - << " m_title: " << settings.m_title - << " m_rgbColor: " << settings.m_rgbColor - << " m_rxDeviceSetIndex: " << settings.m_rxDeviceSetIndex - << " m_txDeviceSetIndex: " << settings.m_txDeviceSetIndex - << " m_rx2TxDelayMs: " << settings.m_rx2TxDelayMs - << " m_tx2RxDelayMs: " << settings.m_tx2RxDelayMs - << " m_vox: " << settings.m_vox - << " m_voxEnable: " << settings.m_voxEnable - << " m_audioDeviceName: " << settings.m_audioDeviceName - << " m_voxLevel: " << settings.m_voxLevel - << " m_voxHold: " << settings.m_voxHold - << " force: " << force; - - QList reverseAPIKeys; - - if ((m_settings.m_title != settings.m_title) || force) { - reverseAPIKeys.append("title"); - } - if ((m_settings.m_rgbColor != settings.m_rgbColor) || force) { - reverseAPIKeys.append("rgbColor"); - } - if ((m_settings.m_rxDeviceSetIndex != settings.m_rxDeviceSetIndex) || force) { - reverseAPIKeys.append("rxDeviceSetIndex"); - } - if ((m_settings.m_txDeviceSetIndex != settings.m_txDeviceSetIndex) || force) { - reverseAPIKeys.append("txDeviceSetIndex"); - } - if ((m_settings.m_rx2TxDelayMs != settings.m_rx2TxDelayMs) || force) { - reverseAPIKeys.append("rx2TxDelayMs"); - } - if ((m_settings.m_tx2RxDelayMs != settings.m_tx2RxDelayMs) || force) { - reverseAPIKeys.append("tx2RxDelayMs"); - } - if ((m_settings.m_vox != settings.m_vox) || force) { - reverseAPIKeys.append("vox"); - } - if ((m_settings.m_voxEnable != settings.m_voxEnable) || force) { - reverseAPIKeys.append("voxEnable"); - } - if ((m_settings.m_voxHold != settings.m_voxHold) || force) { - reverseAPIKeys.append("voxHold"); - } - if ((m_settings.m_voxLevel != settings.m_voxLevel) || force) { - reverseAPIKeys.append("voxLevel"); - } + qDebug() << "SimplePTT::applySettings:" << settings.getDebugString(settingsKeys, force) << " force: " << force; if (m_running) { SimplePTTWorker::MsgConfigureSimplePTTWorker *msg = SimplePTTWorker::MsgConfigureSimplePTTWorker::create( - settings, force + settings, settingsKeys, force ); m_worker->getInputMessageQueue()->push(msg); } - if (settings.m_useReverseAPI) + if (settingsKeys.contains("useReverseAPI")) { - bool fullUpdate = ((m_settings.m_useReverseAPI != settings.m_useReverseAPI) && settings.m_useReverseAPI) || - (m_settings.m_reverseAPIAddress != settings.m_reverseAPIAddress) || - (m_settings.m_reverseAPIPort != settings.m_reverseAPIPort) || - (m_settings.m_reverseAPIFeatureSetIndex != settings.m_reverseAPIFeatureSetIndex) || - (m_settings.m_reverseAPIFeatureIndex != settings.m_reverseAPIFeatureIndex); - webapiReverseSendSettings(reverseAPIKeys, settings, fullUpdate || force); + bool fullUpdate = (settingsKeys.contains("useReverseAPI") && settings.m_useReverseAPI) || + settingsKeys.contains("reverseAPIAddress") || + settingsKeys.contains("reverseAPIPort") || + settingsKeys.contains("reverseAPIFeatureSetIndex") || + settingsKeys.contains("m_reverseAPIFeatureIndex"); + webapiReverseSendSettings(settingsKeys, settings, fullUpdate || force); } - m_settings = settings; + if (force) { + m_settings = settings; + } else { + m_settings.applySettings(settingsKeys, settings); + } } int SimplePTT::webapiRun(bool run, @@ -303,13 +262,13 @@ int SimplePTT::webapiSettingsPutPatch( SimplePTTSettings settings = m_settings; webapiUpdateFeatureSettings(settings, featureSettingsKeys, response); - MsgConfigureSimplePTT *msg = MsgConfigureSimplePTT::create(settings, force); + MsgConfigureSimplePTT *msg = MsgConfigureSimplePTT::create(settings, featureSettingsKeys, force); m_inputMessageQueue.push(msg); qDebug("SimplePTT::webapiSettingsPutPatch: forward to GUI: %p", m_guiMessageQueue); if (m_guiMessageQueue) // forward to GUI if any { - MsgConfigureSimplePTT *msgToGUI = MsgConfigureSimplePTT::create(settings, force); + MsgConfigureSimplePTT *msgToGUI = MsgConfigureSimplePTT::create(settings, featureSettingsKeys, force); m_guiMessageQueue->push(msgToGUI); } @@ -488,7 +447,7 @@ void SimplePTT::webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& respons response.getSimplePttReport()->setRunningState(getState()); } -void SimplePTT::webapiReverseSendSettings(QList& channelSettingsKeys, const SimplePTTSettings& settings, bool force) +void SimplePTT::webapiReverseSendSettings(const QList& channelSettingsKeys, const SimplePTTSettings& settings, bool force) { SWGSDRangel::SWGFeatureSettings *swgFeatureSettings = new SWGSDRangel::SWGFeatureSettings(); // swgFeatureSettings->setOriginatorFeatureIndex(getIndexInDeviceSet()); diff --git a/plugins/feature/simpleptt/simpleptt.h b/plugins/feature/simpleptt/simpleptt.h index 223d7d32a4..fdb2b35d5a 100644 --- a/plugins/feature/simpleptt/simpleptt.h +++ b/plugins/feature/simpleptt/simpleptt.h @@ -45,19 +45,22 @@ class SimplePTT : public Feature public: const SimplePTTSettings& getSettings() const { return m_settings; } + const QList& getSettingsKeys() const { return m_settingsKeys; } bool getForce() const { return m_force; } - static MsgConfigureSimplePTT* create(const SimplePTTSettings& settings, bool force) { - return new MsgConfigureSimplePTT(settings, force); + static MsgConfigureSimplePTT* create(const SimplePTTSettings& settings, const QList& settingsKeys, bool force) { + return new MsgConfigureSimplePTT(settings, settingsKeys, force); } private: SimplePTTSettings m_settings; + QList m_settingsKeys; bool m_force; - MsgConfigureSimplePTT(const SimplePTTSettings& settings, bool force) : + MsgConfigureSimplePTT(const SimplePTTSettings& settings, const QList& settingsKeys, bool force) : Message(), m_settings(settings), + m_settingsKeys(settingsKeys), m_force(force) { } }; @@ -162,9 +165,9 @@ class SimplePTT : public Feature void start(); void stop(); - void applySettings(const SimplePTTSettings& settings, bool force = false); + void applySettings(const SimplePTTSettings& settings, const QList& settingsKeys, bool force = false); void webapiFormatFeatureReport(SWGSDRangel::SWGFeatureReport& response); - void webapiReverseSendSettings(QList& featureSettingsKeys, const SimplePTTSettings& settings, bool force); + void webapiReverseSendSettings(const QList& featureSettingsKeys, const SimplePTTSettings& settings, bool force); private slots: void networkManagerFinished(QNetworkReply *reply); diff --git a/plugins/feature/simpleptt/simplepttgui.cpp b/plugins/feature/simpleptt/simplepttgui.cpp index 41e144cd13..3de0d8cca9 100644 --- a/plugins/feature/simpleptt/simplepttgui.cpp +++ b/plugins/feature/simpleptt/simplepttgui.cpp @@ -76,7 +76,13 @@ bool SimplePTTGUI::handleMessage(const Message& message) { qDebug("SimplePTTGUI::handleMessage: SimplePTT::MsgConfigureSimplePTT"); const SimplePTT::MsgConfigureSimplePTT& cfg = (SimplePTT::MsgConfigureSimplePTT&) message; - m_settings = cfg.getSettings(); + + if (cfg.getForce()) { + m_settings = cfg.getSettings(); + } else { + m_settings.applySettings(cfg.getSettingsKeys(), cfg.getSettings()); + } + blockApplySettings(true); displaySettings(); blockApplySettings(false); @@ -194,6 +200,7 @@ SimplePTTGUI::~SimplePTTGUI() void SimplePTTGUI::setWorkspaceIndex(int index) { m_settings.m_workspaceIndex = index; + m_settingsKeys.append("workspaceIndex"); m_feature->setWorkspaceIndex(index); } @@ -291,6 +298,8 @@ void SimplePTTGUI::updateDeviceSetLists() qDebug("SimplePTTGUI::updateDeviceSetLists: device index changed: %d:%d", rxDeviceIndex, txDeviceIndex); m_settings.m_rxDeviceSetIndex = rxDeviceIndex; m_settings.m_txDeviceSetIndex = txDeviceIndex; + m_settingsKeys.append("rxDeviceSetIndex"); + m_settingsKeys.append("txDeviceSetIndex"); applySettings(); } @@ -324,6 +333,14 @@ void SimplePTTGUI::onMenuDialogCalled(const QPoint &p) setTitle(m_settings.m_title); setTitleColor(m_settings.m_rgbColor); + m_settingsKeys.append("title"); + m_settingsKeys.append("rgbColor"); + m_settingsKeys.append("useReverseAPI"); + m_settingsKeys.append("reverseAPIAddress"); + m_settingsKeys.append("reverseAPIPort"); + m_settingsKeys.append("reverseAPIFeatureSetIndex"); + m_settingsKeys.append("reverseAPIFeatureIndex"); + applySettings(); } @@ -357,6 +374,7 @@ void SimplePTTGUI::on_rxDevice_currentIndexChanged(int index) if (index >= 0) { m_settings.m_rxDeviceSetIndex = index; + m_settingsKeys.append("rxDeviceSetIndex"); applySettings(); } } @@ -366,6 +384,7 @@ void SimplePTTGUI::on_txDevice_currentIndexChanged(int index) if (index >= 0) { m_settings.m_txDeviceSetIndex = index; + m_settingsKeys.append("txDeviceSetIndex"); applySettings(); } @@ -374,12 +393,14 @@ void SimplePTTGUI::on_txDevice_currentIndexChanged(int index) void SimplePTTGUI::on_rxtxDelay_valueChanged(int value) { m_settings.m_rx2TxDelayMs = value; + m_settingsKeys.append("rx2TxDelayMs"); applySettings(); } void SimplePTTGUI::on_txrxDelay_valueChanged(int value) { m_settings.m_tx2RxDelayMs = value; + m_settingsKeys.append("tx2RxDelayMs"); applySettings(); } @@ -391,12 +412,14 @@ void SimplePTTGUI::on_ptt_toggled(bool checked) void SimplePTTGUI::on_vox_toggled(bool checked) { m_settings.m_vox = checked; + m_settingsKeys.append("vox"); applySettings(); } void SimplePTTGUI::on_voxEnable_clicked(bool checked) { m_settings.m_voxEnable = checked; + m_settingsKeys.append("voxEnable"); applySettings(); } @@ -404,12 +427,14 @@ void SimplePTTGUI::on_voxLevel_valueChanged(int value) { m_settings.m_voxLevel = value; ui->voxLevelText->setText(tr("%1").arg(m_settings.m_voxLevel)); + m_settingsKeys.append("voxLevel"); applySettings(); } void SimplePTTGUI::on_voxHold_valueChanged(int value) { m_settings.m_voxHold = value; + m_settingsKeys.append("voxHold"); applySettings(); } @@ -454,9 +479,11 @@ void SimplePTTGUI::applySettings(bool force) { if (m_doApplySettings) { - SimplePTT::MsgConfigureSimplePTT* message = SimplePTT::MsgConfigureSimplePTT::create( m_settings, force); + SimplePTT::MsgConfigureSimplePTT* message = SimplePTT::MsgConfigureSimplePTT::create( m_settings, m_settingsKeys, force); m_simplePTT->getInputMessageQueue()->push(message); } + + m_settingsKeys.clear(); } void SimplePTTGUI::applyPTT(bool tx) @@ -478,6 +505,7 @@ void SimplePTTGUI::audioSelect() if (audioSelect.m_selected) { m_settings.m_audioDeviceName = audioSelect.m_audioDeviceName; + m_settingsKeys.append("audioDeviceName"); applySettings(); } } diff --git a/plugins/feature/simpleptt/simplepttgui.h b/plugins/feature/simpleptt/simplepttgui.h index 9376983dc6..a2b6eaeef6 100644 --- a/plugins/feature/simpleptt/simplepttgui.h +++ b/plugins/feature/simpleptt/simplepttgui.h @@ -54,6 +54,7 @@ class SimplePTTGUI : public FeatureGUI { PluginAPI* m_pluginAPI; FeatureUISet* m_featureUISet; SimplePTTSettings m_settings; + QList m_settingsKeys; RollupState m_rollupState; bool m_doApplySettings; diff --git a/plugins/feature/simpleptt/simplepttsettings.cpp b/plugins/feature/simpleptt/simplepttsettings.cpp index efbafdbd8a..55ff4b61a7 100644 --- a/plugins/feature/simpleptt/simplepttsettings.cpp +++ b/plugins/feature/simpleptt/simplepttsettings.cpp @@ -140,3 +140,108 @@ bool SimplePTTSettings::deserialize(const QByteArray& data) return false; } } + +void SimplePTTSettings::applySettings(const QStringList& settingsKeys, const SimplePTTSettings& settings) +{ + if (settingsKeys.contains("title")) { + m_title = settings.m_title; + } + if (settingsKeys.contains("rgbColor")) { + m_rgbColor = settings.m_rgbColor; + } + if (settingsKeys.contains("rxDeviceSetIndex")) { + m_rxDeviceSetIndex = settings.m_rxDeviceSetIndex; + } + if (settingsKeys.contains("txDeviceSetIndex")) { + m_txDeviceSetIndex = settings.m_txDeviceSetIndex; + } + if (settingsKeys.contains("rx2TxDelayMs")) { + m_rx2TxDelayMs = settings.m_rx2TxDelayMs; + } + if (settingsKeys.contains("tx2RxDelayMs")) { + m_tx2RxDelayMs = settings.m_tx2RxDelayMs; + } + if (settingsKeys.contains("audioDeviceName")) { + m_audioDeviceName = settings.m_audioDeviceName; + } + if (settingsKeys.contains("voxLevel")) { + m_voxLevel = settings.m_voxLevel; + } + if (settingsKeys.contains("voxHold")) { + m_voxHold = settings.m_voxHold; + } + if (settingsKeys.contains("vox")) { + m_vox = settings.m_vox; + } + if (settingsKeys.contains("voxEnable")) { + m_voxEnable = settings.m_voxEnable; + } + if (settingsKeys.contains("useReverseAPI")) { + m_useReverseAPI = settings.m_useReverseAPI; + } + if (settingsKeys.contains("reverseAPIAddress")) { + m_reverseAPIAddress = settings.m_reverseAPIAddress; + } + if (settingsKeys.contains("reverseAPIPort")) { + m_reverseAPIPort = settings.m_reverseAPIPort; + } + if (settingsKeys.contains("reverseAPIFeatureSetIndex")) { + m_reverseAPIFeatureSetIndex = settings.m_reverseAPIFeatureSetIndex; + } + if (settingsKeys.contains("reverseAPIFeatureIndex")) { + m_reverseAPIFeatureIndex = settings.m_reverseAPIFeatureIndex; + } + if (settingsKeys.contains("workspaceIndex")) { + m_workspaceIndex = settings.m_workspaceIndex; + } +} + +QString SimplePTTSettings::getDebugString(const QStringList& settingsKeys, bool force) const +{ + std::ostringstream ostr; + + if (settingsKeys.contains("title") || force) { + ostr << " m_title: " << m_title.toStdString(); + } + if (settingsKeys.contains("rgbColor") || force) { + ostr << " m_rgbColor: " << m_rgbColor; + } + if (settingsKeys.contains("rxDeviceSetIndex") || force) { + ostr << " m_rxDeviceSetIndex: " << m_rxDeviceSetIndex; + } + if (settingsKeys.contains("txDeviceSetIndex") || force) { + ostr << " m_txDeviceSetIndex: " << m_txDeviceSetIndex; + } + if (settingsKeys.contains("rx2TxDelayMs") || force) { + ostr << " m_rx2TxDelayMs: " << m_rx2TxDelayMs; + } + if (settingsKeys.contains("tx2RxDelayMs") || force) { + ostr << " m_tx2RxDelayMs: " << m_tx2RxDelayMs; + } + if (settingsKeys.contains("audioDeviceName") || force) { + ostr << " m_audioDeviceName: " << m_audioDeviceName.toStdString(); + } + if (settingsKeys.contains("voxLevel") || force) { + ostr << " m_voxLevel: " << m_voxLevel; + } + if (settingsKeys.contains("useReverseAPI") || force) { + ostr << " m_useReverseAPI: " << m_useReverseAPI; + } + if (settingsKeys.contains("rgbColor") || force) { + ostr << " m_reverseAPIAddress: " << m_reverseAPIAddress.toStdString(); + } + if (settingsKeys.contains("reverseAPIPort") || force) { + ostr << " m_reverseAPIPort: " << m_reverseAPIPort; + } + if (settingsKeys.contains("reverseAPIFeatureSetIndex") || force) { + ostr << " m_reverseAPIFeatureSetIndex: " << m_reverseAPIFeatureSetIndex; + } + if (settingsKeys.contains("rgbColor") || force) { + ostr << " m_reverseAPIFeatureIndex: " << m_reverseAPIFeatureIndex; + } + if (settingsKeys.contains("workspaceIndex") || force) { + ostr << " m_workspaceIndex: " << m_workspaceIndex; + } + + return QString(ostr.str().c_str()); +} diff --git a/plugins/feature/simpleptt/simplepttsettings.h b/plugins/feature/simpleptt/simplepttsettings.h index 39c9a2fdb3..82acb101c4 100644 --- a/plugins/feature/simpleptt/simplepttsettings.h +++ b/plugins/feature/simpleptt/simplepttsettings.h @@ -50,6 +50,8 @@ struct SimplePTTSettings QByteArray serialize() const; bool deserialize(const QByteArray& data); void setRollupState(Serializable *rollupState) { m_rollupState = rollupState; } + void applySettings(const QStringList& settingsKeys, const SimplePTTSettings& settings); + QString getDebugString(const QStringList& settingsKeys, bool force=false) const; }; #endif // INCLUDE_FEATURE_SIMPLEPTTSETTINGS_H_ diff --git a/plugins/feature/simpleptt/simplepttworker.cpp b/plugins/feature/simpleptt/simplepttworker.cpp index f811a5ff81..6e86033029 100644 --- a/plugins/feature/simpleptt/simplepttworker.cpp +++ b/plugins/feature/simpleptt/simplepttworker.cpp @@ -94,7 +94,7 @@ bool SimplePTTWorker::handleMessage(const Message& cmd) MsgConfigureSimplePTTWorker& cfg = (MsgConfigureSimplePTTWorker&) cmd; qDebug() << "SimplePTTWorker::handleMessage: MsgConfigureSimplePTTWorker"; - applySettings(cfg.getSettings(), cfg.getForce()); + applySettings(cfg.getSettings(), cfg.getSettingsKeys(), cfg.getForce()); return true; } @@ -113,23 +113,11 @@ bool SimplePTTWorker::handleMessage(const Message& cmd) } } -void SimplePTTWorker::applySettings(const SimplePTTSettings& settings, bool force) +void SimplePTTWorker::applySettings(const SimplePTTSettings& settings, const QList& settingsKeys, bool force) { - qDebug() << "SimplePTTWorker::applySettings:" - << " m_title: " << settings.m_title - << " m_rgbColor: " << settings.m_rgbColor - << " m_rxDeviceSetIndex: " << settings.m_rxDeviceSetIndex - << " m_txDeviceSetIndex: " << settings.m_txDeviceSetIndex - << " m_rx2TxDelayMs: " << settings.m_rx2TxDelayMs - << " m_tx2RxDelayMs: " << settings.m_tx2RxDelayMs - << " m_vox: " << settings.m_vox - << " m_voxEnable: " << settings.m_voxEnable - << " m_audioDeviceName: " << settings.m_audioDeviceName - << " m_voxLevel: " << settings.m_voxLevel - << " m_voxHold: " << settings.m_voxHold - << " force: " << force; - - if ((settings.m_audioDeviceName != m_settings.m_audioDeviceName) || force) + qDebug() << "SimplePTTWorker::applySettings:" << settings.getDebugString(settingsKeys, force) << " force: " << force; + + if (settingsKeys.contains("audioDeviceName") || force) { QMutexLocker mlock(&m_mutex); AudioDeviceManager *audioDeviceManager = DSPEngine::instance()->getAudioDeviceManager(); @@ -141,7 +129,7 @@ void SimplePTTWorker::applySettings(const SimplePTTSettings& settings, bool forc m_voxState = false; } - if ((settings.m_vox != m_settings.m_vox) || force) + if (settingsKeys.contains("vox") || force) { QMutexLocker mlock(&m_mutex); m_voxHoldCount = 0; @@ -161,12 +149,16 @@ void SimplePTTWorker::applySettings(const SimplePTTSettings& settings, bool forc } } - if ((settings.m_voxLevel != m_settings.m_voxLevel) || force) - { + if (settingsKeys.contains("voxLevel") || force) { m_voxLevel = CalcDb::powerFromdB(settings.m_voxLevel); } - m_settings = settings; + if (force) { + m_settings = settings; + } else { + m_settings.applySettings(settingsKeys, settings); + } + } void SimplePTTWorker::sendPTT(bool tx) diff --git a/plugins/feature/simpleptt/simplepttworker.h b/plugins/feature/simpleptt/simplepttworker.h index 6ef325c094..2305c376c4 100644 --- a/plugins/feature/simpleptt/simplepttworker.h +++ b/plugins/feature/simpleptt/simplepttworker.h @@ -38,20 +38,23 @@ class SimplePTTWorker : public QObject public: const SimplePTTSettings& getSettings() const { return m_settings; } + const QList& getSettingsKeys() const { return m_settingsKeys; } bool getForce() const { return m_force; } - static MsgConfigureSimplePTTWorker* create(const SimplePTTSettings& settings, bool force) + static MsgConfigureSimplePTTWorker* create(const SimplePTTSettings& settings, const QList& settingsKeys, bool force) { - return new MsgConfigureSimplePTTWorker(settings, force); + return new MsgConfigureSimplePTTWorker(settings, settingsKeys, force); } private: SimplePTTSettings m_settings; + QList m_settingsKeys; bool m_force; - MsgConfigureSimplePTTWorker(const SimplePTTSettings& settings, bool force) : + MsgConfigureSimplePTTWorker(const SimplePTTSettings& settings, const QList& settingsKeys, bool force) : Message(), m_settings(settings), + m_settingsKeys(settingsKeys), m_force(force) { } }; @@ -107,7 +110,7 @@ class SimplePTTWorker : public QObject QRecursiveMutex m_mutex; bool handleMessage(const Message& cmd); - void applySettings(const SimplePTTSettings& settings, bool force = false); + void applySettings(const SimplePTTSettings& settings, const QList& settingsKeys, bool force = false); void sendPTT(bool tx); bool turnDevice(bool on);