diff widgets/PluginPathConfigurator.h @ 1293:6dd15b5c14f9 plugin-path-config

Various logic fixes, and use new setter-class structures

--- a/widgets/PluginPathConfigurator.h	Fri May 25 13:39:08 2018 +0100
+++ b/widgets/PluginPathConfigurator.h	Fri May 25 16:05:51 2018 +0100
@@ -26,6 +26,8 @@
 class QComboBox;
 class QCheckBox;
 
+#include "plugin/PluginPathSetter.h"
+
 class PluginPathConfigurator : public QFrame
 {
     Q_OBJECT
@@ -34,23 +36,11 @@
     PluginPathConfigurator(QWidget *parent = 0);
     ~PluginPathConfigurator();
 
-    // Text used to identify a plugin type to the user.
-    // e.g. "LADSPA", "Vamp", or potentially transliterations thereof
-    typedef QString PluginTypeLabel;
-
-    struct PathConfig {
-        QStringList directories;
-        QString envVariable; // e.g. "LADSPA_PATH" etc
-        bool useEnvVariable; // true if env variable overrides directories list
-    };
-
-    typedef std::map<PluginTypeLabel, PathConfig> Paths;
-    
-    void setPaths(Paths paths);
-    Paths getPaths() const;
+    void setPaths(PluginPathSetter::Paths paths);
+    PluginPathSetter::Paths getPaths() const { return m_paths; }
 
 signals:
-    void pathsChanged(const Paths &paths);
+    void pathsChanged();
 
 private slots:
     void upClicked();
@@ -76,8 +66,8 @@
     QPushButton *m_reset;
     QCheckBox *m_envOverride;
 
-    Paths m_paths;
-    Paths m_originalPaths;
+    PluginPathSetter::Paths m_paths;
+    PluginPathSetter::Paths m_defaultPaths;
     
     void populate();
     void populateFor(QString type, int makeCurrent);