From 1e37ea1e7e54831c6d72461f9b92fbc2e8ed9251 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 16 Jan 2016 23:31:29 +0100 Subject: [PATCH] Some minor changes needed for bridged AU plugins --- source/bridges-plugin/CarlaBridgePlugin.cpp | 5 +++++ source/carla_database.py | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/source/bridges-plugin/CarlaBridgePlugin.cpp b/source/bridges-plugin/CarlaBridgePlugin.cpp index 7f033defe..6be7396aa 100644 --- a/source/bridges-plugin/CarlaBridgePlugin.cpp +++ b/source/bridges-plugin/CarlaBridgePlugin.cpp @@ -36,6 +36,7 @@ # include "juce_gui_basics/juce_gui_basics.h" using juce::JUCEApplication; using juce::JUCEApplicationBase; +using juce::ScopedJuceInitialiser_GUI; using juce::Timer; #endif @@ -274,6 +275,10 @@ private: const CarlaEngine* fEngine; bool fUsingBridge; +#if defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN) + const ScopedJuceInitialiser_GUI kJuceInitialiser; +#endif + static void callback(void* ptr, EngineCallbackOpcode action, unsigned int pluginId, int value1, int value2, float value3, const char* valueStr) { carla_debug("CarlaBridgePlugin::callback(%p, %i:%s, %i, %i, %i, %f, \"%s\")", ptr, action, EngineCallbackOpcode2Str(action), pluginId, value1, value2, value3, valueStr); diff --git a/source/carla_database.py b/source/carla_database.py index c1813e6fd..3f72a11ca 100755 --- a/source/carla_database.py +++ b/source/carla_database.py @@ -209,7 +209,7 @@ def runCarlaDiscovery(itype, stype, filename, tool, isWine=False): if line == "carla-discovery::init::-----------": pinfo = deepcopy(PyPluginInfo) pinfo['type'] = itype - pinfo['filename'] = filename + pinfo['filename'] = filename if filename != ":all" else "" elif line == "carla-discovery::end::------------": if pinfo is not None: @@ -502,6 +502,8 @@ class SearchPluginsThread(QThread): if not self.fContinueChecking: return + self.fSomethingChanged = True + if self.fCheckLADSPA: checkValue = 0.0 if haveLRDF: @@ -1525,7 +1527,7 @@ class PluginDatabaseW(QDialog): if plugin['API'] != PLUGIN_QUERY_API_VERSION and ptype == self.tr("Internal"): return - if ptype in (self.tr("Internal"), "LV2", "AU", "GIG", "SF2", "SFZ"): + if ptype in (self.tr("Internal"), "LV2", "GIG", "SF2", "SFZ"): plugin['build'] = BINARY_NATIVE index = self.fLastTableIndex