Browse Source

Final details for scanning etc vst3 linux stuff

Closes #1094

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.2.0-RC1
falkTX 4 years ago
parent
commit
f6c9559067
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 18 additions and 16 deletions
  1. +3
    -0
      source/backend/CarlaStandalone.cpp
  2. +1
    -1
      source/backend/engine/CarlaEngine.cpp
  3. +7
    -6
      source/backend/utils/Information.cpp
  4. +7
    -9
      source/frontend/carla_database.py

+ 3
- 0
source/backend/CarlaStandalone.cpp View File

@@ -322,6 +322,9 @@ bool carla_engine_init(CarlaHostHandle handle, const char* driverName, const cha

#ifdef USING_JUCE
juce::initialiseJuce_GUI();
#if !(defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN))
juce::MessageManager::getInstance()->setCurrentThreadAsMessageThread();
#endif
#endif

CarlaHostStandalone& shandle((CarlaHostStandalone&)*handle);


+ 1
- 1
source/backend/engine/CarlaEngine.cpp View File

@@ -1199,7 +1199,7 @@ bool CarlaEngine::loadFile(const char* const filename)
return addPlugin(getBinaryTypeFromFile(filename), PLUGIN_VST2, filename, nullptr, nullptr, 0, nullptr);
#endif

#if defined(USING_JUCE) && (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN))
#ifdef USING_JUCE
if (extension == "vst3")
return addPlugin(getBinaryTypeFromFile(filename), PLUGIN_VST3, filename, nullptr, nullptr, 0, nullptr);
#endif


+ 7
- 6
source/backend/utils/Information.cpp View File

@@ -65,13 +65,16 @@ const char* carla_get_complete_license_text()
"<li>LADSPA plugin support</li>"
"<li>DSSI plugin support</li>"
"<li>LV2 plugin support</li>"
#if defined(USING_JUCE) && (defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN))
"<li>VST2/3 plugin support (using Juce)</li>"
#if defined(USING_JUCE) && JUCE_PLUGINHOST_VST
"<li>VST2 plugin support (using JUCE)</li>"
#else
"<li>VST2 plugin support (using VeSTige header by Javier Serrano Polo)</li>"
#endif
#if defined(USING_JUCE) && defined(CARLA_OS_MAC)
"<li>AU plugin support (using Juce)</li>"
#if defined(USING_JUCE) && JUCE_PLUGINHOST_VST3
"<li>VST3 plugin support (using JUCE)</li>"
#endif
#if defined(USING_JUCE) && JUCE_PLUGINHOST_AU
"<li>AU plugin support (using JUCE)</li>"
#endif

// Sample kit libraries
@@ -199,9 +202,7 @@ const char* const* carla_get_supported_features()
#endif
#ifdef USING_JUCE
"juce",
# if defined(CARLA_OS_MAC) || defined(CARLA_OS_WIN)
"vst3",
# endif
# if defined(CARLA_OS_MAC)
"au",
# endif


+ 7
- 9
source/frontend/carla_database.py View File

@@ -91,7 +91,7 @@ def findVST3Binaries(binPath):
binaries = []

for root, dirs, files in os.walk(binPath):
for name in tuple(name for name in files if name.lower().endswith(".vst3")):
for name in tuple(name for name in (files+dirs) if name.lower().endswith(".vst3")):
binaries.append(os.path.join(root, name))

return binaries
@@ -472,20 +472,18 @@ class SearchPluginsThread(QThread):
# Increase count by the number of externally discoverable plugin types
if self.fCheckNative:
self.fCurCount += pluginCount
# MacOS and Windows are the only VST3 supported OSes
if self.fCheckVST3 and not (MACOS or WINDOWS):
# Linux, MacOS and Windows are the only VST3 supported OSes
if self.fCheckVST3 and not (LINUX or MACOS or WINDOWS):
self.fCurCount -= 1

if self.fCheckPosix32:
self.fCurCount += pluginCount
# MacOS is the only VST3 supported posix OS
if self.fCheckVST3 and not MACOS:
if self.fCheckVST3 and not (LINUX or MACOS):
self.fCurCount -= 1

if self.fCheckPosix64:
self.fCurCount += pluginCount
# MacOS is the only VST3 supported posix OS
if self.fCheckVST3 and not MACOS:
if self.fCheckVST3 and not (LINUX or MACOS):
self.fCurCount -= 1

if self.fCheckWin32:
@@ -660,7 +658,7 @@ class SearchPluginsThread(QThread):
if not self.fContinueChecking: return

if self.fCheckVST3:
if self.fCheckNative and (MACOS or WINDOWS):
if self.fCheckNative and (LINUX or MACOS or WINDOWS):
plugins = self._checkVST3(OS, self.fToolNative)
settingsDB.setValue("Plugins/VST3_native", plugins)
if not self.fContinueChecking: return
@@ -1104,7 +1102,7 @@ class PluginRefreshW(QDialog):
self.ui.ch_au.setEnabled(False)
self.ui.ch_au.setVisible(False)

if not (hasWin32 or hasWin64):
if not (LINUX or hasWin32 or hasWin64):
self.ui.ch_vst3.setEnabled(False)
self.ui.ch_vst3.setVisible(False)



Loading…
Cancel
Save