eliminated category and name from resource ID

src/framework/musesampler/internal/musesamplerresolver.cpp

@@ -162,7 +162,7 @@ AudioResourceMetaList MuseSamplerResolver::resolveResources() const
         }
 
         AudioResourceMeta meta;
-        meta.id = buildMuseInstrumentId(internalCategory, internalName, instrumentId).toStdString();
+        meta.id = std::to_string(instrumentId);
         meta.type = AudioResourceType::MuseSamplerSoundPack;
         meta.vendor = "MuseSounds";
         meta.attributes = {
@@ -307,7 +307,7 @@ std::vector<Instrument> MuseSamplerResolver::instruments() const
         JsonObject obj = doc.rootObject();
 
         Instrument instrument;
-        instrument.id = buildMuseInstrumentId(instrument.category, instrument.name, id);
+        instrument.id = String::number(id);
         instrument.soundId = String::fromUtf8(m_libHandler->getMpeSoundId(msInstrument));
         instrument.musicXmlId = String::fromUtf8(m_libHandler->getMusicXmlSoundId(msInstrument));
         instrument.name = obj.value("FriendlyName").toString();
@@ -336,13 +336,3 @@ void MuseSamplerResolver::loadSoundPresetAttributes(SoundPresetAttributes& attri
         }
     }
 }
-
-String MuseSamplerResolver::buildMuseInstrumentId(const String& category, const String& name, int uniqueId) const
-{
-    StringList list;
-    list.append(category);
-    list.append(name);
-    list.append(String::fromStdString(std::to_string(uniqueId)));
-
-    return list.join(u"\\");
-}

src/project/internal/projectaudiosettings.cpp

@@ -49,6 +49,22 @@ static const std::map<AudioResourceType, QString> RESOURCE_TYPE_MAP = {
     { AudioResourceType::MusePlugin, "muse_plugin" },
 };
 
+static void doCompatibilityConversions(AudioResourceMeta& meta)
+{
+    if (meta.type == AudioResourceType::MuseSamplerSoundPack) {
+        // MS 4.5: resource name and category have been excluded from ID
+        // Old format: category\\name\\uid
+        if (meta.id.find("\\") == std::string::npos) {
+            return;
+        }
+
+        const String& museUID = meta.attributeVal(u"museUID");
+        if (!museUID.empty()) {
+            meta.id = museUID.toStdString();
+        }
+    }
+}
+
 const AudioOutputParams& ProjectAudioSettings::masterAudioOutputParams() const
 {
     return m_masterOutputParams;
@@ -258,6 +274,8 @@ Ret ProjectAudioSettings::read(const engraving::MscReader& reader)
         AudioInputParams inParams = inputParamsFromJson(trackObject.value("in").toObject());
         AudioOutputParams outParams = outputParamsFromJson(trackObject.value("out").toObject());
 
+        doCompatibilityConversions(inParams.resourceMeta);
+
         m_trackInputParamsMap.emplace(id, std::move(inParams));
         m_trackOutputParamsMap.emplace(id, std::move(outParams));
     }