# HG changeset patch
# User Chris Cannam
# Date 1527236738 -3600
# Node ID acb51ab8fb26cec61b780840bbddf1a51c65c7c6
# Parent  b03652cd338fea321e1d60187537944628ae52e3# Parent  da678ff18fb05e72ce80ab0e1023673944893242
Merge from default branch

diff -r da678ff18fb0 -r acb51ab8fb26 main/PreferencesDialog.cpp
--- a/main/PreferencesDialog.cpp	Thu May 24 17:30:02 2018 +0100
+++ b/main/PreferencesDialog.cpp	Fri May 25 09:25:38 2018 +0100
@@ -40,6 +40,8 @@
 #include "widgets/IconLoader.h"
 #include "widgets/ColourMapComboBox.h"
 #include "widgets/ColourComboBox.h"
+#include "widgets/PluginPathConfigurator.h"
+#include "widgets/WidgetScale.h"
 #include "base/Preferences.h"
 #include "base/ResourceFinder.h"
 #include "layer/ColourMapper.h"
@@ -276,7 +278,7 @@
     tempDirButton->setIcon(IconLoader().load("fileopen"));
     connect(tempDirButton, SIGNAL(clicked()),
             this, SLOT(tempDirButtonClicked()));
-    tempDirButton->setFixedSize(QSize(24, 24));
+    tempDirButton->setFixedSize(WidgetScale::scaleQSize(QSize(24, 24)));
 
     QCheckBox *showSplash = new QCheckBox;
     m_showSplash = prefs->getShowSplash();
@@ -576,7 +578,26 @@
     
     m_tabOrdering[AudioIOTab] = m_tabs->count();
     m_tabs->addTab(frame, tr("A&udio I/O"));
- 
+
+    // Plugins tab
+
+    PluginPathConfigurator *pathConfig = new PluginPathConfigurator(this);
+    QStringList path;
+    path << "/usr/lib/vamp";
+    path << "/usr/local/lib/vamp";
+    path << "/home/user/.vamp";
+    PluginPathConfigurator::Paths paths;
+    paths["Vamp"] = { path, "VAMP_PATH", true };
+    path.clear();
+    path << "/usr/lib/ladspa";
+    path << "/usr/local/lib/ladspa";
+    path << "/home/user/.ladspa";
+    paths["LADSPA"] = { path, "LADSPA_PATH", true };
+    pathConfig->setPaths(paths);
+    
+    m_tabOrdering[PluginTab] = m_tabs->count();
+    m_tabs->addTab(pathConfig, tr("&Plugins"));
+    
     // General tab
 
     frame = new QFrame;
diff -r da678ff18fb0 -r acb51ab8fb26 main/PreferencesDialog.h
--- a/main/PreferencesDialog.h	Thu May 24 17:30:02 2018 +0100
+++ b/main/PreferencesDialog.h	Fri May 25 09:25:38 2018 +0100
@@ -41,7 +41,8 @@
         AudioIOTab,
         AppearanceTab,
         AnalysisTab,
-        TemplateTab
+        TemplateTab,
+        PluginTab
     };
     void switchToTab(Tab tab);
 
diff -r da678ff18fb0 -r acb51ab8fb26 repoint-lock.json
--- a/repoint-lock.json	Thu May 24 17:30:02 2018 +0100
+++ b/repoint-lock.json	Fri May 25 09:25:38 2018 +0100
@@ -7,7 +7,7 @@
       "pin": "7d9b537b6a1e"
     },
     "svgui": {
-      "pin": "51e6125627fa"
+      "pin": "b5c71304286e"
     },
     "svapp": {
       "pin": "7da68349a0c5"
diff -r da678ff18fb0 -r acb51ab8fb26 repoint-project.json
--- a/repoint-project.json	Thu May 24 17:30:02 2018 +0100
+++ b/repoint-project.json	Fri May 25 09:25:38 2018 +0100
@@ -20,7 +20,8 @@
         },
         "svgui": {
             "vcs": "hg",
-            "service": "soundsoftware"
+            "service": "soundsoftware",
+            "branch": "plugin-path-config"
         },
         "svapp": {
             "vcs": "hg",
diff -r da678ff18fb0 -r acb51ab8fb26 sonic-visualiser.qrc
--- a/sonic-visualiser.qrc	Thu May 24 17:30:02 2018 +0100
+++ b/sonic-visualiser.qrc	Fri May 25 09:25:38 2018 +0100
@@ -37,6 +37,7 @@
     <file>icons/scalable/playselection.svg</file>
     <file>icons/scalable/playfollow.svg</file>
     <file>icons/scalable/play.svg</file>
+    <file>icons/scalable/plus.svg</file>
     <file>icons/scalable/record.svg</file>
     <file>icons/scalable/redo.svg</file>
     <file>icons/scalable/regions.svg</file>