Mercurial > hg > sonic-visualiser

changeset 2506:64d605b087f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Fri, 17 Apr 2020 17:46:44 +0100
parents c12b8c696aba (diff) a0e5f45fa844 (current diff)
children abc461fda024
files repoint-lock.json
diffstat 3 files changed, 19 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGELOG	Wed Apr 15 16:32:10 2020 +0100
+++ b/CHANGELOG	Fri Apr 17 17:46:44 2020 +0100
@@ -395,7 +395,7 @@
  - Update code to build against Qt5
 
 
-Changes in Sonic Visualiser 2.0.1 ( Mar 2013) since the previous release 2.0:
+Changes in Sonic Visualiser 2.0.1 (07 Mar 2013) since the previous release 2.0:
 
  - Fix incorrect samplerate in reading m4a files on OS/X
 
--- a/main/main.cpp	Wed Apr 15 16:32:10 2020 +0100
+++ b/main/main.cpp	Fri Apr 17 17:46:44 2020 +0100
@@ -365,11 +365,24 @@
     settings.endGroup();
 
     settings.beginGroup("RDF");
-    if (!settings.contains("rdf-indices")) {
-        QStringList list;
-        list << "http://www.vamp-plugins.org/rdf/plugins/index.txt";
-        settings.setValue("rdf-indices", list);
+    QStringList list;
+    bool absent = !(settings.contains("rdf-indices"));
+    QString plugIndex("http://www.vamp-plugins.org/rdf/plugins/index.txt");
+    QString packsIndex("http://www.vamp-plugins.org/rdf/packs/index.txt");
+    if (absent) {
+        list << plugIndex;
+        list << packsIndex;
+    } else {
+        list = settings.value("rdf-indices").toStringList();
+        if (!settings.contains("rdf-indices-refreshed-for-4.1")) {
+            // Packs introduced
+            if (!list.contains(packsIndex)) {
+                list << packsIndex;
+            }
+            settings.setValue("rdf-indices-refreshed-for-4.1", true);
+        }
     }
+    settings.setValue("rdf-indices", list);
     settings.endGroup();
 
     PluginPathSetter::initialiseEnvironmentVariables();
--- a/repoint-lock.json	Wed Apr 15 16:32:10 2020 +0100
+++ b/repoint-lock.json	Fri Apr 17 17:46:44 2020 +0100
@@ -4,7 +4,7 @@
       "pin": "74c5b0bfa108"
     },
     "svcore": {
-      "pin": "627a7d7ada45"
+      "pin": "3ec563af0a4f"
     },
     "svgui": {
       "pin": "7eb595837eaa"