Added upper bound check for MuseSampler's version

src/framework/musesampler/imusesamplerconfiguration.h

@@ -38,6 +38,7 @@ class IMuseSamplerConfiguration : MODULE_EXPORT_INTERFACE
     virtual mu::io::path_t libraryPath() const = 0;
 
     virtual std::string minimumSupportedVersion() const = 0;
+    virtual std::string maximumSupportedVersion() const = 0;
 };
 }
 

src/framework/musesampler/internal/musesamplerconfiguration.cpp

@@ -36,6 +36,7 @@ static const io::path_t DEFAULT_PATH("MuseSamplerCoreLib.dll");
 #endif
 
 static const std::string MINIMUM_SUPPORTED_VERSION = "0.2.2";
+static const std::string MAXIMUM_SUPPORTED_VERSION = "0.4.0";
 
 io::path_t MuseSamplerConfiguration::libraryPath() const
 {
@@ -50,3 +51,8 @@ std::string MuseSamplerConfiguration::minimumSupportedVersion() const
 {
     return MINIMUM_SUPPORTED_VERSION;
 }
+
+std::string MuseSamplerConfiguration::maximumSupportedVersion() const
+{
+    return MAXIMUM_SUPPORTED_VERSION;
+}

src/framework/musesampler/internal/musesamplerconfiguration.h

@@ -36,6 +36,7 @@ class MuseSamplerConfiguration : public IMuseSamplerConfiguration
     io::path_t libraryPath() const override;
 
     std::string minimumSupportedVersion() const override;
+    std::string maximumSupportedVersion() const override;
 };
 }
 

src/framework/musesampler/internal/musesamplerresolver.cpp

@@ -190,6 +190,11 @@ bool MuseSamplerResolver::isVersionSupported() const
         return false;
     }
 
+    return isVersionAboveMinSupported() && isVersionBelowMaxSupported();
+}
+
+bool MuseSamplerResolver::isVersionAboveMinSupported() const
+{
     bool ok = true;
     std::array<int, 3> minimumSupported = parseVersion(configuration()->minimumSupportedVersion(), ok);
     if (!ok) {
@@ -217,6 +222,35 @@ bool MuseSamplerResolver::isVersionSupported() const
     return false;
 }
 
+bool MuseSamplerResolver::isVersionBelowMaxSupported() const
+{
+    bool ok = true;
+    std::array<int, 3> maxSupported = parseVersion(configuration()->maximumSupportedVersion(), ok);
+    if (!ok) {
+        return false;
+    }
+
+    int currentMajorNum = m_libHandler->getVersionMajor();
+    int currentMinorNum = m_libHandler->getVersionMinor();
+    int currentRevisionNum = m_libHandler->getVersionRevision();
+
+    if (currentMajorNum < maxSupported.at(0)) {
+        return true;
+    } else if (currentMajorNum == maxSupported.at(0)) {
+        if (currentMinorNum < maxSupported.at(1)) {
+            return true;
+        } else if (currentMinorNum == maxSupported.at(1)) {
+            if (currentRevisionNum < maxSupported.at(2)) {
+                return true;
+            } else if (currentRevisionNum == maxSupported.at(2)) {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
 String MuseSamplerResolver::buildMuseInstrumentId(const String& category, const String& name, int uniqueId) const
 {
     StringList list;

src/framework/musesampler/internal/musesamplerresolver.h

@@ -50,6 +50,8 @@ class MuseSamplerResolver : public audio::synth::ISynthResolver::IResolver, publ
 private:
     bool checkLibrary() const;
     bool isVersionSupported() const;
+    bool isVersionAboveMinSupported() const;
+    bool isVersionBelowMaxSupported() const;
 
     String buildMuseInstrumentId(const String& category, const String& name, int uniqueId) const;