Rework some python code, split shared code into separate files

resources/ui/carla_database.ui

@@ -45,7 +45,7 @@
         <string>Refresh</string>
        </property>
        <property name="icon">
-        <iconset resource="../../resources/resources.qrc">
+        <iconset resource="../resources.qrc">
          <normaloff>:/16x16/view-refresh.png</normaloff>:/16x16/view-refresh.png</iconset>
        </property>
       </widget>
@@ -61,6 +61,13 @@
       <enum>QFrame::Sunken</enum>
      </property>
      <layout class="QGridLayout" name="gridLayout">
+      <item row="5" column="2">
+       <widget class="QCheckBox" name="ch_gui">
+        <property name="text">
+         <string>With GUI Only</string>
+        </property>
+       </widget>
+      </item>
       <item row="2" column="0">
        <widget class="QCheckBox" name="ch_dssi">
         <property name="text">
@@ -89,13 +96,6 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="0">
-       <widget class="QCheckBox" name="ch_kits">
-        <property name="text">
-         <string>Sound Kits</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="0">
        <widget class="QCheckBox" name="ch_internal">
         <property name="text">
@@ -152,17 +152,38 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="2">
+      <item row="4" column="2">
        <widget class="QCheckBox" name="ch_stereo">
         <property name="text">
          <string>Stereo only</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="2">
-       <widget class="QCheckBox" name="ch_gui">
+      <item row="5" column="0">
+       <widget class="QCheckBox" name="ch_au">
         <property name="text">
-         <string>With GUI Only</string>
+         <string>AudioUnits</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2">
+       <widget class="QCheckBox" name="ch_rtsafe">
+        <property name="text">
+         <string>Real-time safe only</string>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="0">
+       <widget class="QCheckBox" name="ch_kits">
+        <property name="text">
+         <string>Sound Kits</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0">
+       <widget class="QCheckBox" name="ch_csound">
+        <property name="text">
+         <string>CSound modules</string>
         </property>
        </widget>
       </item>
@@ -289,6 +310,9 @@
        <property name="text">
         <string>(Number of Plugins go here)</string>
        </property>
+       <property name="textInteractionFlags">
+        <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+       </property>
       </widget>
      </item>
      <item>
@@ -310,7 +334,7 @@
         <string>&amp;Add Plugin</string>
        </property>
        <property name="icon">
-        <iconset resource="../../resources/resources.qrc">
+        <iconset resource="../resources.qrc">
          <normaloff>:/16x16/list-add.png</normaloff>:/16x16/list-add.png</iconset>
        </property>
       </widget>
@@ -327,7 +351,7 @@
   <tabstop>tableWidget</tabstop>
  </tabstops>
  <resources>
-  <include location="../../resources/resources.qrc"/>
+  <include location="../resources.qrc"/>
  </resources>
  <connections>
   <connection>

resources/ui/carla_refresh.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>610</width>
-    <height>308</height>
+    <width>609</width>
+    <height>349</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -71,6 +71,13 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QCheckBox" name="ch_au">
+            <property name="text">
+             <string>AudioUnits</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <widget class="Line" name="line_3">
             <property name="lineWidth">
@@ -84,6 +91,13 @@
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QCheckBox" name="ch_csound">
+            <property name="text">
+             <string>CSD</string>
+            </property>
+           </widget>
+          </item>
           <item>
            <widget class="QCheckBox" name="ch_gig">
             <property name="text">

source/discovery/carla-discovery.cpp

@@ -38,7 +38,12 @@
 # include <fluidsynth.h>
 #endif
 #ifdef WANT_LINUXSAMPLER
+// fix broken headers
+# define TMP__cplusplus __cplusplus
+# undef __cplusplus
 # include "linuxsampler/EngineFactory.h"
+# define __cplusplus TMP__cplusplus
+# undef TMP__cplusplus
 #endif
 
 #include <iostream>
@@ -1604,7 +1609,7 @@ int main(int argc, char* argv[])
     case PLUGIN_LADSPA:
     case PLUGIN_DSSI:
     case PLUGIN_VST:
-    case PLUGIN_VST3:
+    case PLUGIN_AU:
         openLib = true;
     default:
         break;
@@ -1661,9 +1666,14 @@ int main(int argc, char* argv[])
         do_lv2_check(filename, doInit);
         break;
     case PLUGIN_VST:
-    case PLUGIN_VST3:
         do_vst_check(handle, doInit);
         break;
+    case PLUGIN_AU:
+        //do_au_check(handle, doInit);
+        break;
+    case PLUGIN_CSOUND:
+        //do_csound_check(handle, doInit);
+        break;
     case PLUGIN_GIG:
         do_linuxsampler_check(filename, "gig", doInit);
         break;