From 34e74678aa6bfd93848c4e361d0be56f1965b497 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Mon, 25 Sep 2017 22:45:39 +0200
Subject: [PATCH] Don't show bridge plugins if experimental flag is off

---
 resources/ui/carla_database.ui | 120 ++++++++++++++++++++-------------
 source/carla_backend.py        |   1 +
 source/carla_database.py       |  15 +++++
 source/carla_host.py           |   5 ++
 source/carla_settings.py       |   9 +--
 5 files changed, 100 insertions(+), 50 deletions(-)

diff --git a/resources/ui/carla_database.ui b/resources/ui/carla_database.ui
index 8860ba4d6..e3e9e01e1 100644
--- a/resources/ui/carla_database.ui
+++ b/resources/ui/carla_database.ui
@@ -61,129 +61,157 @@
       <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="1">
-       <widget class="QCheckBox" name="ch_effects">
+      <item row="2" column="4">
+       <widget class="QCheckBox" name="ch_bridged">
         <property name="text">
-         <string>Effects</string>
+         <string>Bridged</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="2">
-       <widget class="QCheckBox" name="ch_bridged_wine">
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="ch_ladspa">
         <property name="text">
-         <string>Bridged (Wine)</string>
+         <string>LADSPA</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="ch_internal">
+      <item row="2" column="1">
+       <widget class="QCheckBox" name="ch_instruments">
         <property name="text">
-         <string>Internal</string>
+         <string>Instruments</string>
         </property>
        </widget>
       </item>
-      <item row="6" column="0">
+      <item row="7" column="0">
        <widget class="QCheckBox" name="ch_au">
         <property name="text">
          <string>AU</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="ch_ladspa">
+      <item row="3" column="1">
+       <widget class="QCheckBox" name="ch_midi">
         <property name="text">
-         <string>LADSPA</string>
+         <string>MIDI Plugins</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="2">
-       <widget class="QCheckBox" name="ch_stereo">
+      <item row="4" column="0">
+       <widget class="QCheckBox" name="ch_lv2">
         <property name="text">
-         <string>Stereo only</string>
+         <string>LV2</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="1">
-       <widget class="QCheckBox" name="ch_other">
+      <item row="1" column="4">
+       <widget class="QCheckBox" name="ch_native">
         <property name="text">
-         <string>Other/Misc</string>
+         <string>Native</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
-       <widget class="QCheckBox" name="ch_lv2">
+      <item row="3" column="4">
+       <widget class="QCheckBox" name="ch_bridged_wine">
         <property name="text">
-         <string>LV2</string>
+         <string>Bridged (Wine)</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QCheckBox" name="ch_instruments">
+      <item row="3" column="3">
+       <widget class="QCheckBox" name="ch_gui">
         <property name="text">
-         <string>Instruments</string>
+         <string>With GUI Only</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="2">
-       <widget class="QCheckBox" name="ch_bridged">
+      <item row="2" column="3">
+       <widget class="QCheckBox" name="ch_stereo">
         <property name="text">
-         <string>Bridged</string>
+         <string>Stereo only</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="2">
+      <item row="1" column="3">
        <widget class="QCheckBox" name="ch_rtsafe">
         <property name="text">
          <string>Real-time safe only</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QCheckBox" name="ch_dssi">
+      <item row="5" column="0">
+       <widget class="QCheckBox" name="ch_vst">
         <property name="text">
-         <string>DSSI</string>
+         <string>VST</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="2">
-       <widget class="QCheckBox" name="ch_native">
+      <item row="3" column="0">
+       <widget class="QCheckBox" name="ch_dssi">
         <property name="text">
-         <string>Native</string>
+         <string>DSSI</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1">
-       <widget class="QCheckBox" name="ch_midi">
+      <item row="4" column="1">
+       <widget class="QCheckBox" name="ch_other">
         <property name="text">
-         <string>MIDI Plugins</string>
+         <string>Other/Misc</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="0">
-       <widget class="QCheckBox" name="ch_vst">
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="ch_internal">
         <property name="text">
-         <string>VST</string>
+         <string>Internal</string>
         </property>
        </widget>
       </item>
-      <item row="7" column="0">
+      <item row="8" column="0">
        <widget class="QCheckBox" name="ch_kits">
         <property name="text">
          <string>Sound Kits</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="0">
+      <item row="6" column="0">
        <widget class="QCheckBox" name="ch_vst3">
         <property name="text">
          <string>VST3</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="2">
-       <widget class="QCheckBox" name="ch_gui">
+      <item row="1" column="1">
+       <widget class="QCheckBox" name="ch_effects">
         <property name="text">
-         <string>With GUI Only</string>
+         <string>Effects</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="l_format">
+        <property name="text">
+         <string>Plugin format</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLabel" name="l_category">
+        <property name="text">
+         <string>Category</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QLabel" name="l_reqs">
+        <property name="text">
+         <string>Requirements</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="4">
+       <widget class="QLabel" name="l_arch">
+        <property name="text">
+         <string>Architecture</string>
         </property>
        </widget>
       </item>
diff --git a/source/carla_backend.py b/source/carla_backend.py
index 616e390b3..564f25657 100644
--- a/source/carla_backend.py
+++ b/source/carla_backend.py
@@ -1231,6 +1231,7 @@ class CarlaHostMeta(object):
         self.audioDriverForced = None
 
         # settings
+        self.experimental        = False
         self.forceStereo         = False
         self.preferPluginBridges = False
         self.preferUIBridges     = False
diff --git a/source/carla_database.py b/source/carla_database.py
index 3f72a11ca..f08380683 100755
--- a/source/carla_database.py
+++ b/source/carla_database.py
@@ -1283,6 +1283,21 @@ class PluginDatabaseW(QDialog):
 
         self.loadSettings()
 
+        # ----------------------------------------------------------------------------------------------------
+        # Disable bridges (experimental for now)
+
+        if not host.experimental:
+            self.ui.ch_native.setChecked(True)
+            self.ui.ch_native.setEnabled(False)
+            self.ui.ch_native.setVisible(False)
+            self.ui.ch_bridged.setChecked(False)
+            self.ui.ch_bridged.setEnabled(False)
+            self.ui.ch_bridged.setVisible(False)
+            self.ui.ch_bridged_wine.setChecked(False)
+            self.ui.ch_bridged_wine.setEnabled(False)
+            self.ui.ch_bridged_wine.setVisible(False)
+            self.ui.l_arch.setVisible(False)
+
         # ----------------------------------------------------------------------------------------------------
         # Set-up connections
 
diff --git a/source/carla_host.py b/source/carla_host.py
index acc0b5e79..bd7abe25c 100644
--- a/source/carla_host.py
+++ b/source/carla_host.py
@@ -2478,6 +2478,11 @@ def loadHostSettings(host):
     settings = QSettings("falkTX", "Carla2")
 
     # bool values
+    try:
+        host.experimental = settings.value(CARLA_KEY_MAIN_EXPERIMENTAL, CARLA_DEFAULT_MAIN_EXPERIMENTAL, type=bool)
+    except:
+        host.experimental = CARLA_DEFAULT_MAIN_EXPERIMENTAL
+
     try:
         host.manageUIs = settings.value(CARLA_KEY_MAIN_MANAGE_UIS, CARLA_DEFAULT_MAIN_MANAGE_UIS, type=bool)
     except:
diff --git a/source/carla_settings.py b/source/carla_settings.py
index 10b52cf6e..e08f40c71 100755
--- a/source/carla_settings.py
+++ b/source/carla_settings.py
@@ -371,10 +371,9 @@ class CarlaSettingsW(QDialog):
         # ----------------------------------------------------------------------------------------------------
         # Main
 
-        experimental = settings.value(CARLA_KEY_MAIN_EXPERIMENTAL, CARLA_DEFAULT_MAIN_EXPERIMENTAL, type=bool)
-        self.ui.ch_main_experimental.setChecked(experimental)
+        self.ui.ch_main_experimental.setChecked(self.host.experimental)
 
-        if not experimental:
+        if not self.host.experimental:
             self.ui.lw_page.hideRow(self.TAB_INDEX_EXPERIMENTAL)
 
         # ----------------------------------------------------------------------------------------------------
@@ -524,7 +523,9 @@ class CarlaSettingsW(QDialog):
         # ----------------------------------------------------------------------------------------------------
         # Main
 
-        settings.setValue(CARLA_KEY_MAIN_EXPERIMENTAL, self.ui.ch_main_experimental.isChecked())
+        self.host.experimental = self.ui.ch_main_experimental.isChecked()
+
+        settings.setValue(CARLA_KEY_MAIN_EXPERIMENTAL, self.host.experimental)
 
         # ----------------------------------------------------------------------------------------------------
         # Engine