From 9f39a1ab66f3c7b02fb8cb2c8fc01c27fffeffe0 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 24 Nov 2021 06:34:34 +0100 Subject: [PATCH] Removed ordering of channels and features in presets. Fixes #1051 --- sdrbase/device/deviceset.cpp | 9 --------- sdrbase/feature/featureset.cpp | 2 -- 2 files changed, 11 deletions(-) diff --git a/sdrbase/device/deviceset.cpp b/sdrbase/device/deviceset.cpp index e667963e4..9f0d26e8b 100644 --- a/sdrbase/device/deviceset.cpp +++ b/sdrbase/device/deviceset.cpp @@ -216,9 +216,6 @@ void DeviceSet::saveRxChannelSettings(Preset *preset) { if (preset->isSourcePreset()) { - // sort by increasing delta frequency and type - std::sort(m_channelInstanceRegistrations.begin(), m_channelInstanceRegistrations.end(), compareChannels); - for (int i = 0; i < m_channelInstanceRegistrations.count(); i++) { qDebug("DeviceSet::saveChannelSettings: channel [%s] saved", qPrintable(m_channelInstanceRegistrations[i]->getURI())); @@ -317,9 +314,6 @@ void DeviceSet::saveTxChannelSettings(Preset *preset) { if (preset->isSinkPreset()) { - // sort by increasing delta frequency and type - std::sort(m_channelInstanceRegistrations.begin(), m_channelInstanceRegistrations.end(), compareChannels); - for (int i = 0; i < m_channelInstanceRegistrations.count(); i++) { qDebug("DeviceSet::saveTxChannelSettings: channel [%s] saved", qPrintable(m_channelInstanceRegistrations[i]->getURI())); @@ -420,9 +414,6 @@ void DeviceSet::saveMIMOChannelSettings(Preset *preset) { if (preset->isMIMOPreset()) { - // sort by increasing delta frequency and type - std::sort(m_channelInstanceRegistrations.begin(), m_channelInstanceRegistrations.end(), compareChannels); - for (int i = 0; i < m_channelInstanceRegistrations.count(); i++) { qDebug("DeviceSet::saveMIMOChannelSettings: channel [%s] saved", qPrintable(m_channelInstanceRegistrations[i]->getURI())); diff --git a/sdrbase/feature/featureset.cpp b/sdrbase/feature/featureset.cpp index 636f24d1f..d80f42498 100644 --- a/sdrbase/feature/featureset.cpp +++ b/sdrbase/feature/featureset.cpp @@ -179,8 +179,6 @@ void FeatureSet::loadFeatureSetSettings(const FeatureSetPreset *preset, PluginAP void FeatureSet::saveFeatureSetSettings(FeatureSetPreset *preset) { - std::sort(m_featureInstanceRegistrations.begin(), m_featureInstanceRegistrations.end(), compareFeatures); - for (int i = 0; i < m_featureInstanceRegistrations.count(); i++) { qDebug("FeatureSet::saveFeatureSetSettings: saving feature [%s]", qPrintable(m_featureInstanceRegistrations[i]->getURI()));