falkTX
/
Cadence
mirror of https://github.com/falkTX/Cadence
1
0
Fork 0
Code Releases 3 Activity
Browse Source

Carla: change unix* to posix*

tags/v0.9.0
falkTX 12 years ago
parent
20d7b06a87
commit
656c0559ae
12 changed files with 321 additions and 275 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +6
    -6
      Makefile
  2. +10
    -10
      c++/carla-backend/carla_backend.h
  3. +22
    -22
      c++/carla-backend/carla_shared.cpp
  4. +4
    -4
      c++/carla-backend/carla_shared.h
  5. +100
    -58
      c++/carla-bridge/Makefile
  6. +1
    -0
      c++/carla-bridge/carla_bridge_client.h
  7. +22
    -22
      c++/carla-discovery/Makefile
  8. +3
    -3
      c++/carla-includes/carla_includes.h
  9. +103
    -100
      src/carla.py
  10. +29
    -29
      src/carla_backend.py
  11. +10
    -10
      src/shared_carla.py
  12. +11
    -11
      src/ui/carla_refresh.ui

+ 6
- 6
Makefile View File

@@ -171,13 +171,13 @@ xycontroller:

# ------------------------------------------------------------------------------------------------------------------------------------------------------

unix32:
$(MAKE) -C c++/carla-bridge unix32
$(MAKE) -C c++/carla-discovery unix32
posix32:
$(MAKE) -C c++/carla-bridge posix32
$(MAKE) -C c++/carla-discovery posix32

unix64:
$(MAKE) -C c++/carla-bridge unix64
$(MAKE) -C c++/carla-discovery unix64
posix64:
$(MAKE) -C c++/carla-bridge posix64
$(MAKE) -C c++/carla-discovery posix64

wine32:
$(MAKE) -C c++/carla-bridge wine32


+ 10
- 10
c++/carla-backend/carla_backend.h View File

@@ -80,12 +80,12 @@ const unsigned int PARAMETER_USES_CUSTOM_TEXT = 0x80; //!< Parameter uses custom
* The binary type of a plugin.
*/
enum BinaryType {
BINARY_NONE = 0, //!< Null binary type.
BINARY_UNIX32 = 1, //!< Unix 32bit.
BINARY_UNIX64 = 2, //!< Unix 64bit.
BINARY_WIN32 = 3, //!< Windows 32bit.
BINARY_WIN64 = 4, //!< Windows 64bit.
BINARY_OTHER = 5 //!< Other.
BINARY_NONE = 0, //!< Null binary type.
BINARY_POSIX32 = 1, //!< POSIX 32bit.
BINARY_POSIX64 = 2, //!< POSIX 64bit.
BINARY_WIN32 = 3, //!< Windows 32bit.
BINARY_WIN64 = 4, //!< Windows 64bit.
BINARY_OTHER = 5 //!< Other.
};

/*!
@@ -258,16 +258,16 @@ enum OptionsType {
OPTION_PATH_SFZ = 16,

/*!
* Set path to the Unix 32bit plugin bridge executable.\n
* Set path to the POSIX 32bit plugin bridge executable.\n
* Default unset.
*/
OPTION_PATH_BRIDGE_UNIX32 = 17,
OPTION_PATH_BRIDGE_POSIX32 = 17,

/*!
* Set path to the Unix 64bit plugin bridge executable.\n
* Set path to the POSIX 64bit plugin bridge executable.\n
* Default unset.
*/
OPTION_PATH_BRIDGE_UNIX64 = 18,
OPTION_PATH_BRIDGE_POSIX64 = 18,

/*!
* Set path to the Windows 32bit plugin bridge executable.\n


+ 22
- 22
c++/carla-backend/carla_shared.cpp View File

@@ -36,10 +36,10 @@ const char* BinaryType2str(const BinaryType type)
{
case BINARY_NONE:
return "BINARY_NONE";
case BINARY_UNIX32:
return "BINARY_UNIX32";
case BINARY_UNIX64:
return "BINARY_UNIX64";
case BINARY_POSIX32:
return "BINARY_POSIX32";
case BINARY_POSIX64:
return "BINARY_POSIX64";
case BINARY_WIN32:
return "BINARY_WIN32";
case BINARY_WIN64:
@@ -234,10 +234,10 @@ const char* OptionsType2str(const OptionsType type)
return "OPTION_PATH_SF2";
case OPTION_PATH_SFZ:
return "OPTION_PATH_SFZ";
case OPTION_PATH_BRIDGE_UNIX32:
return "OPTION_PATH_BRIDGE_UNIX32";
case OPTION_PATH_BRIDGE_UNIX64:
return "OPTION_PATH_BRIDGE_UNIX64";
case OPTION_PATH_BRIDGE_POSIX32:
return "OPTION_PATH_BRIDGE_POSIX32";
case OPTION_PATH_BRIDGE_POSIX64:
return "OPTION_PATH_BRIDGE_POSIX64";
case OPTION_PATH_BRIDGE_WIN32:
return "OPTION_PATH_BRIDGE_WIN32";
case OPTION_PATH_BRIDGE_WIN64:
@@ -365,10 +365,10 @@ const char* getBinaryBidgePath(const BinaryType type)
switch (type)
{
#ifndef BUILD_BRIDGE
case BINARY_UNIX32:
return carlaOptions.bridge_unix32;
case BINARY_UNIX64:
return carlaOptions.bridge_unix64;
case BINARY_POSIX32:
return carlaOptions.bridge_posix32;
case BINARY_POSIX64:
return carlaOptions.bridge_posix64;
case BINARY_WIN32:
return carlaOptions.bridge_win32;
case BINARY_WIN64:
@@ -543,11 +543,11 @@ void setOption(const OptionsType option, const int value, const char* const valu
case OPTION_PATH_SFZ:
carla_setenv("SFZ_PATH", valueStr);
break;
case OPTION_PATH_BRIDGE_UNIX32:
carlaOptions.bridge_unix32 = strdup(valueStr);
case OPTION_PATH_BRIDGE_POSIX32:
carlaOptions.bridge_posix32 = strdup(valueStr);
break;
case OPTION_PATH_BRIDGE_UNIX64:
carlaOptions.bridge_unix64 = strdup(valueStr);
case OPTION_PATH_BRIDGE_POSIX64:
carlaOptions.bridge_posix64 = strdup(valueStr);
break;
case OPTION_PATH_BRIDGE_WIN32:
carlaOptions.bridge_win32 = strdup(valueStr);
@@ -574,11 +574,11 @@ void resetOptions()
{
qDebug("CarlaBackend::resetOptions()");

if (carlaOptions.bridge_unix32)
free((void*)carlaOptions.bridge_unix32);
if (carlaOptions.bridge_posix32)
free((void*)carlaOptions.bridge_posix32);

if (carlaOptions.bridge_unix64)
free((void*)carlaOptions.bridge_unix64);
if (carlaOptions.bridge_posix64)
free((void*)carlaOptions.bridge_posix64);

if (carlaOptions.bridge_win32)
free((void*)carlaOptions.bridge_win32);
@@ -608,8 +608,8 @@ void resetOptions()
carlaOptions.preferUiBridges = true;
carlaOptions.oscUiTimeout = 4000/100;

carlaOptions.bridge_unix32 = nullptr;
carlaOptions.bridge_unix64 = nullptr;
carlaOptions.bridge_posix32 = nullptr;
carlaOptions.bridge_posix64 = nullptr;
carlaOptions.bridge_win32 = nullptr;
carlaOptions.bridge_win64 = nullptr;
carlaOptions.bridge_lv2gtk2 = nullptr;


+ 4
- 4
c++/carla-backend/carla_shared.h View File

@@ -68,8 +68,8 @@ struct carla_options_t {
bool preferUiBridges;
uint oscUiTimeout;

const char* bridge_unix32;
const char* bridge_unix64;
const char* bridge_posix32;
const char* bridge_posix64;
const char* bridge_win32;
const char* bridge_win64;
const char* bridge_lv2gtk2;
@@ -87,8 +87,8 @@ struct carla_options_t {
useDssiVstChunks(false),
preferUiBridges(true),
oscUiTimeout(4000/100),
bridge_unix32(nullptr),
bridge_unix64(nullptr),
bridge_posix32(nullptr),
bridge_posix64(nullptr),
bridge_win32(nullptr),
bridge_win64(nullptr),
bridge_lv2gtk2(nullptr),


+ 100
- 58
c++/carla-bridge/Makefile View File

@@ -17,17 +17,17 @@ BUILD_FLAGS += -DVESTIGE_HEADER -I../carla-includes/vestige # Comment this line

32BIT_FLAGS = -m32
64BIT_FLAGS = -m64
LINK_FLAGS = $(shell pkg-config --libs liblo QtCore)
LINK_FLAGS = $(shell pkg-config --libs liblo QtCore) $(LDFLAGS)

# --------------------------------------------------------------

BUILD_PLUGIN_FLAGS = $(BUILD_FLAGS) -DBUILD_BRIDGE_PLUGIN -DCARLA_BACKEND_NO_EXPORTS -DCARLA_ENGINE_JACK $(shell pkg-config --cflags jack)
BUILD_PLUGIN_FLAGS = $(BUILD_FLAGS) -DBUILD_BRIDGE_PLUGIN -DCARLA_ENGINE_JACK $(shell pkg-config --cflags jack)
LINK_PLUGIN_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs jack)

UNIX_BUILD_FLAGS = $(BUILD_PLUGIN_FLAGS) $(shell pkg-config --cflags QtGui)
UNIX_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32 -L/usr/lib/i386-linux-gnu
UNIX_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu
UNIX_LINK_FLAGS = $(LINK_PLUGIN_FLAGS) $(shell pkg-config --libs QtGui) -ldl
POSIX_BUILD_FLAGS = $(BUILD_PLUGIN_FLAGS) $(shell pkg-config --cflags QtGui)
POSIX_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32 -L/usr/lib/i386-linux-gnu
POSIX_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu
POSIX_LINK_FLAGS = $(LINK_PLUGIN_FLAGS) $(shell pkg-config --libs QtGui) -ldl

WIN_BUILD_FLAGS = $(BUILD_PLUGIN_FLAGS) $(shell pkg-config --cflags QtGui)
WIN_32BIT_FLAGS = $(32BIT_FLAGS)
@@ -47,12 +47,18 @@ LINK_UI_FLAGS = $(LINK_FLAGS) -ldl
BUILD_UI_LV2_GTK2_FLAGS = $(BUILD_UI_FLAGS) -DBRIDGE_LV2 -DBRIDGE_LV2_GTK2 $(shell pkg-config --cflags gtk+-2.0)
LINK_UI_LV2_GTK2_FLAGS = $(LINK_UI_FLAGS) $(shell pkg-config --libs gtk+-2.0)

BUILD_UI_LV2_GTK3_FLAGS = $(BUILD_UI_FLAGS) -DBRIDGE_LV2 -DBRIDGE_LV2_GTK3 $(shell pkg-config --cflags gtk+-3.0)
LINK_UI_LV2_GTK3_FLAGS = $(LINK_UI_FLAGS) $(shell pkg-config --libs gtk+-3.0)

BUILD_UI_LV2_QT4_FLAGS = $(BUILD_UI_FLAGS) -DBRIDGE_LV2 -DBRIDGE_LV2_QT4 $(shell pkg-config --cflags QtGui)
LINK_UI_LV2_QT4_FLAGS = $(LINK_UI_FLAGS) $(shell pkg-config --libs QtGui)

BUILD_UI_LV2_X11_FLAGS = $(BUILD_UI_FLAGS) -DBRIDGE_LV2 -DBRIDGE_LV2_X11 $(shell pkg-config --cflags QtGui)
LINK_UI_LV2_X11_FLAGS = $(LINK_UI_FLAGS) $(shell pkg-config --libs QtGui)

BUILD_UI_VST_HWND_FLAGS = $(BUILD_UI_FLAGS) -DBRIDGE_VST -DBRIDGE_VST_HWND $(shell pkg-config --cflags QtGui)
LINK_UI_VST_HWND_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs QtGui) -mwindows -static

BUILD_UI_VST_X11_FLAGS = $(BUILD_UI_FLAGS) -DBRIDGE_VST -DBRIDGE_VST_X11 $(shell pkg-config --cflags QtGui)
LINK_UI_VST_X11_FLAGS = $(LINK_UI_FLAGS) $(shell pkg-config --libs QtGui)

@@ -62,16 +68,18 @@ all: ui

ui: ui_lv2-gtk2 ui_lv2-qt4 ui_lv2-x11 ui_vst-x11
ui_lv2-gtk2: carla-bridge-lv2-gtk2
ui_lv2-gtk3: carla-bridge-lv2-gtk3
ui_lv2-qt4: carla-bridge-lv2-qt4
ui_lv2-x11: carla-bridge-lv2-x11
ui_vst-hwnd: carla-bridge-vst-hwnd.exe
ui_vst-x11: carla-bridge-vst-x11

unix32: carla-bridge-unix32
unix64: carla-bridge-unix64
win32: carla-bridge-win32.exe
win64: carla-bridge-win64.exe
wine32: carla-bridge-win32.exe.so
wine64: carla-bridge-win64.exe.so
posix32: carla-bridge-posix32
posix64: carla-bridge-posix64
win32: carla-bridge-win32.exe
win64: carla-bridge-win64.exe
wine32: carla-bridge-win32.exe.so
wine64: carla-bridge-win64.exe.so

# --------------------------------------------------------------
# ui_lv2-gtk2
@@ -90,6 +98,23 @@ carla_bridge_toolkit-gtk2__lv2-gtk2.o: carla_bridge_toolkit-gtk2.cpp
carla_bridge_osc__lv2-gtk2.o: carla_bridge_osc.cpp
$(CXX) $< $(BUILD_UI_LV2_GTK2_FLAGS) -c -o $@

# --------------------------------------------------------------
# ui_lv2-gtk3

OBJS_UI_LV2_GTK3 = carla_bridge_ui-lv2__lv2-gtk3.o carla_bridge_toolkit-gtk3__lv2-gtk3.o carla_bridge_osc__lv2-gtk3.o ../carla-lilv/carla_lilv.a

carla-bridge-lv2-gtk3: $(OBJS_UI_LV2_GTK3)
$(CXX) $^ $(LINK_UI_LV2_GTK3_FLAGS) -o $@ && $(STRIP) $@

carla_bridge_ui-lv2__lv2-gtk3.o: carla_bridge_ui-lv2.cpp
$(CXX) $< $(BUILD_UI_LV2_GTK3_FLAGS) -c -o $@

carla_bridge_toolkit-gtk3__lv2-gtk3.o: carla_bridge_toolkit-gtk3.cpp
$(CXX) $< $(BUILD_UI_LV2_GTK3_FLAGS) -c -o $@

carla_bridge_osc__lv2-gtk3.o: carla_bridge_osc.cpp
$(CXX) $< $(BUILD_UI_LV2_GTK3_FLAGS) -c -o $@

# --------------------------------------------------------------
# ui_lv2-qt4

@@ -124,6 +149,23 @@ carla_bridge_toolkit-qt4__lv2-x11.o: carla_bridge_toolkit-qt4.cpp
carla_bridge_osc__lv2-x11.o: carla_bridge_osc.cpp
$(CXX) $< $(BUILD_UI_LV2_X11_FLAGS) -c -o $@

# --------------------------------------------------------------
# ui_vst-hwnd

OBJS_UI_VST_HWND = carla_bridge_ui-vst__vst-hwnd.o carla_bridge_toolkit-qt4__vst-hwnd.o carla_bridge_osc__vst-hwnd.o

carla-bridge-vst-hwnd.exe: $(OBJS_UI_VST_HWND)
$(CXX) $^ $(LINK_UI_VST_HWND_FLAGS) -o $@ && $(STRIP) $@

carla_bridge_ui-vst__vst-hwnd.o: carla_bridge_ui-vst.cpp
$(CXX) $< $(BUILD_UI_VST_HWND_FLAGS) -c -o $@

carla_bridge_toolkit-qt4__vst-hwnd.o: carla_bridge_toolkit-qt4.cpp
$(CXX) $< $(BUILD_UI_VST_HWND_FLAGS) -c -o $@

carla_bridge_osc__vst-hwnd.o: carla_bridge_osc.cpp
$(CXX) $< $(BUILD_UI_VST_HWND_FLAGS) -c -o $@

# --------------------------------------------------------------
# ui_vst-x11

@@ -142,72 +184,72 @@ carla_bridge_osc__vst-x11.o: carla_bridge_osc.cpp
$(CXX) $< $(BUILD_UI_VST_X11_FLAGS) -c -o $@

# --------------------------------------------------------------
# unix32
# posix32

OBJS_UNIX32 = \
carla_bridge_plugin__unix32.o carla_bridge_osc__unix32.o \
carla_engine_jack__unix32.o carla_shared__unix32.o ladspa__unix32.o dssi__unix32.o lv2__unix32.o vst__unix32.o ../carla-lilv/carla_lilv_32bit.a
OBJS_POSIX32 = \
carla_bridge_plugin__posix32.o carla_bridge_osc__posix32.o \
carla_engine_jack__posix32.o carla_shared__posix32.o ladspa__posix32.o dssi__posix32.o lv2__posix32.o vst__posix32.o ../carla-lilv/carla_lilv_32bit.a

carla-bridge-unix32: $(OBJS_UNIX32)
$(CXX) $^ $(UNIX_LINK_FLAGS) $(UNIX_32BIT_FLAGS) -o $@ && $(STRIP) $@
carla-bridge-posix32: $(OBJS_POSIX32)
$(CXX) $^ $(POSIX_LINK_FLAGS) $(POSIX_32BIT_FLAGS) -o $@ && $(STRIP) $@

carla_bridge_plugin__unix32.o: carla_bridge_plugin.cpp
$(CXX) $< $(UNIX_BUILD_FLAGS) $(UNIX_32BIT_FLAGS) -c -o $@
carla_bridge_plugin__posix32.o: carla_bridge_plugin.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@

carla_bridge_osc__unix32.o: carla_bridge_osc.cpp
$(CXX) $< $(UNIX_BUILD_FLAGS) $(UNIX_32BIT_FLAGS) -c -o $@
carla_bridge_osc__posix32.o: carla_bridge_osc.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@

carla_engine_jack__unix32.o: ../carla-backend/carla_engine_jack.cpp
$(CXX) $< $(UNIX_BUILD_FLAGS) $(UNIX_32BIT_FLAGS) -c -o $@
carla_engine_jack__posix32.o: ../carla-backend/carla_engine_jack.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@

carla_shared__unix32.o: ../carla-backend/carla_shared.cpp
$(CXX) $< $(UNIX_BUILD_FLAGS) $(UNIX_32BIT_FLAGS) -c -o $@
carla_shared__posix32.o: ../carla-backend/carla_shared.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@

ladspa__unix32.o: ../carla-backend/ladspa.cpp
$(CXX) $< $(UNIX_BUILD_FLAGS) $(UNIX_32BIT_FLAGS) -c -o $@
ladspa__posix32.o: ../carla-backend/ladspa.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@

dssi__unix32.o: ../carla-backend/dssi.cpp
$(CXX) $< $(UNIX_BUILD_FLAGS) $(UNIX_32BIT_FLAGS) -c -o $@
dssi__posix32.o: ../carla-backend/dssi.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@

lv2__unix32.o: ../carla-backend/lv2.cpp
$(CXX) $< $(UNIX_BUILD_FLAGS) $(UNIX_32BIT_FLAGS) -c -o $@
lv2__posix32.o: ../carla-backend/lv2.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@

vst__unix32.o: ../carla-backend/vst.cpp
$(CXX) $< $(UNIX_BUILD_FLAGS) $(UNIX_32BIT_FLAGS) -c -o $@
vst__posix32.o: ../carla-backend/vst.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@

# --------------------------------------------------------------
# unix64
# posix64

OBJS_UNIX64 = \
carla_bridge_plugin__unix64.o carla_bridge_osc__unix64.o \
carla_engine_jack__unix64.o carla_shared__unix64.o ladspa__unix64.o dssi__unix64.o lv2__unix64.o vst__unix64.o ../carla-lilv/carla_lilv_64bit.a
OBJS_POSIX64 = \
carla_bridge_plugin__posix64.o carla_bridge_osc__posix64.o \
carla_engine_jack__posix64.o carla_shared__posix64.o ladspa__posix64.o dssi__posix64.o lv2__posix64.o vst__posix64.o ../carla-lilv/carla_lilv_64bit.a

carla-bridge-unix64: $(OBJS_UNIX64)
$(CXX) $^ $(UNIX_LINK_FLAGS) $(UNIX_64BIT_FLAGS) -o $@ && $(STRIP) $@
carla-bridge-posix64: $(OBJS_POSIX64)
$(CXX) $^ $(POSIX_LINK_FLAGS) $(POSIX_64BIT_FLAGS) -o $@ && $(STRIP) $@

carla_bridge_plugin__unix64.o: carla_bridge_plugin.cpp
$(CXX) $< $(UNIX_BUILD_FLAGS) $(UNIX_64BIT_FLAGS) -c -o $@
carla_bridge_plugin__posix64.o: carla_bridge_plugin.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@

carla_bridge_osc__unix64.o: carla_bridge_osc.cpp
$(CXX) $< $(UNIX_BUILD_FLAGS) $(UNIX_64BIT_FLAGS) -c -o $@
carla_bridge_osc__posix64.o: carla_bridge_osc.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@

carla_engine_jack__unix64.o: ../carla-backend/carla_engine_jack.cpp
$(CXX) $< $(UNIX_BUILD_FLAGS) $(UNIX_64BIT_FLAGS) -c -o $@
carla_engine_jack__posix64.o: ../carla-backend/carla_engine_jack.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@

carla_shared__unix64.o: ../carla-backend/carla_shared.cpp
$(CXX) $< $(UNIX_BUILD_FLAGS) $(UNIX_64BIT_FLAGS) -c -o $@
carla_shared__posix64.o: ../carla-backend/carla_shared.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@

ladspa__unix64.o: ../carla-backend/ladspa.cpp
$(CXX) $< $(UNIX_BUILD_FLAGS) $(UNIX_64BIT_FLAGS) -c -o $@
ladspa__posix64.o: ../carla-backend/ladspa.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@

dssi__unix64.o: ../carla-backend/dssi.cpp
$(CXX) $< $(UNIX_BUILD_FLAGS) $(UNIX_64BIT_FLAGS) -c -o $@
dssi__posix64.o: ../carla-backend/dssi.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@

lv2__unix64.o: ../carla-backend/lv2.cpp
$(CXX) $< $(UNIX_BUILD_FLAGS) $(UNIX_64BIT_FLAGS) -c -o $@
lv2__posix64.o: ../carla-backend/lv2.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@

vst__unix64.o: ../carla-backend/vst.cpp
$(CXX) $< $(UNIX_BUILD_FLAGS) $(UNIX_64BIT_FLAGS) -c -o $@
vst__posix64.o: ../carla-backend/vst.cpp
$(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@

# --------------------------------------------------------------
# wine32
@@ -292,5 +334,5 @@ doc: carla_bridge.doxygen

clean:
rm -f *.o *.so *.exe
rm -f carla-bridge-lv2-gtk2 carla-bridge-lv2-qt4 carla-bridge-lv2-x11 carla-bridge-vst-x11
rm -f carla-bridge-unix32 carla-bridge-unix64
rm -f carla-bridge-lv2-gtk2 carla-bridge-lv2-gtk3 carla-bridge-lv2-qt4 carla-bridge-lv2-x11 carla-bridge-vst-x11
rm -f carla-bridge-posix32 carla-bridge-posix64

+ 1
- 0
c++/carla-bridge/carla_bridge_client.h View File

@@ -27,6 +27,7 @@
#include "carla_lib_includes.h"
#endif

#include <cmath>
#include <cstdio>
#include <cstdint>
#include <cstdlib>


+ 22
- 22
c++/carla-discovery/Makefile View File

@@ -35,31 +35,31 @@ LINK_FLAGS += $(shell pkg-config --libs linuxsampler)
endif
endif

UNIX_BUILD_FLAGS = $(BUILD_FLAGS)
UNIX_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32 -L/usr/lib/i386-linux-gnu
UNIX_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu
UNIX_LINK_FLAGS = $(LINK_FLAGS) -ldl
POSIX_BUILD_FLAGS = $(BUILD_FLAGS)
POSIX_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32 -L/usr/lib/i386-linux-gnu
POSIX_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu
POSIX_LINK_FLAGS = $(LINK_FLAGS) -ldl

WIN_BUILD_FLAGS = $(BUILD_FLAGS)
WIN_32BIT_FLAGS = $(32BIT_FLAGS)
WIN_64BIT_FLAGS = $(64BIT_FLAGS)
WIN_LINK_FLAGS = $(LINK_FLAGS) -static
WIN_BUILD_FLAGS = $(BUILD_FLAGS)
WIN_32BIT_FLAGS = $(32BIT_FLAGS)
WIN_64BIT_FLAGS = $(64BIT_FLAGS)
WIN_LINK_FLAGS = $(LINK_FLAGS) -static

WINE_BUILD_FLAGS = $(BUILD_FLAGS) # -fpermissive
WINE_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32/wine -L/usr/lib/i386-linux-gnu/wine
WINE_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64/wine -L/usr/lib/x86_64-linux-gnu/wine
WINE_LINK_FLAGS = $(LINK_FLAGS) -ldl
WINE_BUILD_FLAGS = $(BUILD_FLAGS) # -fpermissive
WINE_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32/wine -L/usr/lib/i386-linux-gnu/wine
WINE_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64/wine -L/usr/lib/x86_64-linux-gnu/wine
WINE_LINK_FLAGS = $(LINK_FLAGS) -ldl

# --------------------------------------------------------------

all: carla-discovery-native

unix32: carla-discovery-unix32
unix64: carla-discovery-unix64
win32: carla-discovery-win32.exe
win64: carla-discovery-win64.exe
wine32: carla-discovery-win32.exe.so
wine64: carla-discovery-win64.exe.so
posix32: carla-discovery-posix32
posix64: carla-discovery-posix64
win32: carla-discovery-win32.exe
win64: carla-discovery-win64.exe
wine32: carla-discovery-win32.exe.so
wine64: carla-discovery-win64.exe.so

# --------------------------------------------------------------

@@ -69,11 +69,11 @@ wine64: carla-discovery-win64.exe.so
carla-discovery-native: carla-discovery.cpp ../carla-lilv/carla_lilv.a
$(CXX) $^ $(BUILD_FLAGS) $(LINK_FLAGS) -o $@ && $(STRIP) $@

carla-discovery-unix32: $(32BIT_OBJS)
$(CXX) $^ $(UNIX_BUILD_FLAGS) $(UNIX_32BIT_FLAGS) $(UNIX_LINK_FLAGS) -o $@ && $(STRIP) $@
carla-discovery-posix32: $(32BIT_OBJS)
$(CXX) $^ $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) $(POSIX_LINK_FLAGS) -o $@ && $(STRIP) $@

carla-discovery-unix64: $(64BIT_OBJS)
$(CXX) $^ $(UNIX_BUILD_FLAGS) $(UNIX_64BIT_FLAGS) $(UNIX_LINK_FLAGS) -o $@ && $(STRIP) $@
carla-discovery-posix64: $(64BIT_OBJS)
$(CXX) $^ $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) $(POSIX_LINK_FLAGS) -o $@ && $(STRIP) $@

carla-discovery-win32.exe: $(32BIT_OBJS)
$(CXX) $^ $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) $(WIN_LINK_FLAGS) -o $@ && $(STRIP) $@


+ 3
- 3
c++/carla-includes/carla_includes.h View File

@@ -71,11 +71,11 @@
#endif

// set native binary type
#if defined(Q_OS_UNIX)
#if defined(Q_OS_HAIKU) || defined(Q_OS_UNIX)
# if __LP64__
# define BINARY_NATIVE BINARY_UNIX64
# define BINARY_NATIVE BINARY_POSIX64
# else
# define BINARY_NATIVE BINARY_UNIX32
# define BINARY_NATIVE BINARY_POSIX32
# endif
#elif defined(Q_OS_WIN)
# ifdef Q_OS_WIN64


+ 103
- 100
src/carla.py View File

@@ -38,11 +38,11 @@ class SearchPluginsThread(QThread):

self.settings_db = self.parent().settings_db

self.check_native = False
self.check_unix32 = False
self.check_unix64 = False
self.check_win32 = False
self.check_win64 = False
self.check_native = False
self.check_posix32 = False
self.check_posix64 = False
self.check_win32 = False
self.check_win64 = False

self.check_ladspa = False
self.check_dssi = False
@@ -59,8 +59,8 @@ class SearchPluginsThread(QThread):
apps = ""
apps += " carla-discovery"
apps += " carla-discovery-native"
apps += " carla-discovery-unix32"
apps += " carla-discovery-unix64"
apps += " carla-discovery-posix32"
apps += " carla-discovery-posix64"
apps += " carla-discovery-win32.exe"
apps += " carla-discovery-win64.exe"

@@ -70,12 +70,12 @@ class SearchPluginsThread(QThread):
def pluginLook(self, percent, plugin):
self.emit(SIGNAL("PluginLook(int, QString)"), percent, plugin)

def setSearchBinaryTypes(self, native, unix32, unix64, win32, win64):
self.check_native = native
self.check_unix32 = unix32
self.check_unix64 = unix64
self.check_win32 = win32
self.check_win64 = win64
def setSearchBinaryTypes(self, native, posix32, posix64, win32, win64):
self.check_native = native
self.check_posix32 = posix32
self.check_posix64 = posix64
self.check_win32 = win32
self.check_win64 = win64

def setSearchPluginTypes(self, ladspa, dssi, lv2, vst, gig, sf2, sfz):
self.check_ladspa = ladspa
@@ -273,9 +273,9 @@ class SearchPluginsThread(QThread):

if self.check_native:
self.m_count += plugin_count
if self.check_unix32:
if self.check_posix32:
self.m_count += plugin_count
if self.check_unix64:
if self.check_posix64:
self.m_count += plugin_count
if self.check_win32:
self.m_count += plugin_count
@@ -311,11 +311,11 @@ class SearchPluginsThread(QThread):
if self.check_ladspa:
m_value = 0
if haveLRDF:
if self.check_native: m_value += 0.1
if self.check_unix32: m_value += 0.1
if self.check_unix64: m_value += 0.1
if self.check_win32: m_value += 0.1
if self.check_win64: m_value += 0.1
if self.check_native: m_value += 0.1
if self.check_posix32: m_value += 0.1
if self.check_posix64: m_value += 0.1
if self.check_win32: m_value += 0.1
if self.check_win64: m_value += 0.1
rdf_pad_value = self.m_percent_value * m_value

if self.check_native:
@@ -323,14 +323,14 @@ class SearchPluginsThread(QThread):
self.settings_db.setValue("Plugins/LADSPA_native", self.ladspa_plugins)
self.settings_db.sync()

if self.check_unix32:
self.checkLADSPA(OS, carla_discovery_unix32)
self.settings_db.setValue("Plugins/LADSPA_unix32", self.ladspa_plugins)
if self.check_posix32:
self.checkLADSPA(OS, carla_discovery_posix32)
self.settings_db.setValue("Plugins/LADSPA_posix32", self.ladspa_plugins)
self.settings_db.sync()

if self.check_unix64:
self.checkLADSPA(OS, carla_discovery_unix64)
self.settings_db.setValue("Plugins/LADSPA_unix64", self.ladspa_plugins)
if self.check_posix64:
self.checkLADSPA(OS, carla_discovery_posix64)
self.settings_db.setValue("Plugins/LADSPA_posix64", self.ladspa_plugins)
self.settings_db.sync()

if self.check_win32:
@@ -362,14 +362,14 @@ class SearchPluginsThread(QThread):
self.settings_db.setValue("Plugins/DSSI_native", self.dssi_plugins)
self.settings_db.sync()

if self.check_unix32:
self.checkDSSI(OS, carla_discovery_unix32)
self.settings_db.setValue("Plugins/DSSI_unix32", self.dssi_plugins)
if self.check_posix32:
self.checkDSSI(OS, carla_discovery_posix32)
self.settings_db.setValue("Plugins/DSSI_posix32", self.dssi_plugins)
self.settings_db.sync()

if self.check_unix64:
self.checkDSSI(OS, carla_discovery_unix64)
self.settings_db.setValue("Plugins/DSSI_unix64", self.dssi_plugins)
if self.check_posix64:
self.checkDSSI(OS, carla_discovery_posix64)
self.settings_db.setValue("Plugins/DSSI_posix64", self.dssi_plugins)
self.settings_db.sync()

if self.check_win32:
@@ -388,14 +388,14 @@ class SearchPluginsThread(QThread):
self.settings_db.setValue("Plugins/LV2_native", self.lv2_plugins)
self.settings_db.sync()

if self.check_unix32:
self.checkLV2(carla_discovery_unix32)
self.settings_db.setValue("Plugins/LV2_unix32", self.lv2_plugins)
if self.check_posix32:
self.checkLV2(carla_discovery_posix32)
self.settings_db.setValue("Plugins/LV2_posix32", self.lv2_plugins)
self.settings_db.sync()

if self.check_unix64:
self.checkLV2(carla_discovery_unix64)
self.settings_db.setValue("Plugins/LV2_unix64", self.lv2_plugins)
if self.check_posix64:
self.checkLV2(carla_discovery_posix64)
self.settings_db.setValue("Plugins/LV2_posix64", self.lv2_plugins)
self.settings_db.sync()

if self.check_win32:
@@ -414,14 +414,14 @@ class SearchPluginsThread(QThread):
self.settings_db.setValue("Plugins/VST_native", self.vst_plugins)
self.settings_db.sync()

if self.check_unix32:
self.checkVST(OS, carla_discovery_unix32)
self.settings_db.setValue("Plugins/VST_unix32", self.vst_plugins)
if self.check_posix32:
self.checkVST(OS, carla_discovery_posix32)
self.settings_db.setValue("Plugins/VST_posix32", self.vst_plugins)
self.settings_db.sync()

if self.check_unix64:
self.checkVST(OS, carla_discovery_unix64)
self.settings_db.setValue("Plugins/VST_unix64", self.vst_plugins)
if self.check_posix64:
self.checkVST(OS, carla_discovery_posix64)
self.settings_db.setValue("Plugins/VST_posix64", self.vst_plugins)
self.settings_db.sync()

if self.check_win32:
@@ -457,12 +457,15 @@ class PluginRefreshW(QDialog, ui_carla_refresh.Ui_PluginRefreshW):

self.b_skip.setVisible(False)

if LINUX:
self.ch_unix32.setText("Linux 32bit")
self.ch_unix64.setText("Linux 64bit")
if HAIKU:
self.ch_posix32.setText("Haiku 32bit")
self.ch_posix64.setText("Haiku 64bit")
elif LINUX:
self.ch_posix32.setText("Linux 32bit")
self.ch_posix64.setText("Linux 64bit")
elif MACOS:
self.ch_unix32.setText("MacOS 32bit")
self.ch_unix64.setText("MacOS 64bit")
self.ch_posix32.setText("MacOS 32bit")
self.ch_posix64.setText("MacOS 64bit")

self.settings = self.parent().settings
self.settings_db = self.parent().settings_db
@@ -470,19 +473,19 @@ class PluginRefreshW(QDialog, ui_carla_refresh.Ui_PluginRefreshW):

self.pThread = SearchPluginsThread(self)

if carla_discovery_unix32 and not WINDOWS:
self.ico_unix32.setPixmap(getIcon("dialog-ok-apply").pixmap(16, 16))
if carla_discovery_posix32 and not WINDOWS:
self.ico_posix32.setPixmap(getIcon("dialog-ok-apply").pixmap(16, 16))
else:
self.ico_unix32.setPixmap(getIcon("dialog-error").pixmap(16, 16))
self.ch_unix32.setChecked(False)
self.ch_unix32.setEnabled(False)
self.ico_posix32.setPixmap(getIcon("dialog-error").pixmap(16, 16))
self.ch_posix32.setChecked(False)
self.ch_posix32.setEnabled(False)

if carla_discovery_unix64 and not WINDOWS:
self.ico_unix64.setPixmap(getIcon("dialog-ok-apply").pixmap(16, 16))
if carla_discovery_posix64 and not WINDOWS:
self.ico_posix64.setPixmap(getIcon("dialog-ok-apply").pixmap(16, 16))
else:
self.ico_unix64.setPixmap(getIcon("dialog-error").pixmap(16, 16))
self.ch_unix64.setChecked(False)
self.ch_unix64.setEnabled(False)
self.ico_posix64.setPixmap(getIcon("dialog-error").pixmap(16, 16))
self.ch_posix64.setChecked(False)
self.ch_posix64.setEnabled(False)

if carla_discovery_win32:
self.ico_win32.setPixmap(getIcon("dialog-ok-apply").pixmap(16, 16))
@@ -525,17 +528,17 @@ class PluginRefreshW(QDialog, ui_carla_refresh.Ui_PluginRefreshW):
self.label_win32.setVisible(False)
elif LINUX or MACOS:
if is64bit:
hasNonNative = bool(carla_discovery_unix32 or carla_discovery_win32 or carla_discovery_win64)
self.ch_unix64.setChecked(False)
self.ch_unix64.setVisible(False)
self.ico_unix64.setVisible(False)
self.label_unix64.setVisible(False)
hasNonNative = bool(carla_discovery_posix32 or carla_discovery_win32 or carla_discovery_win64)
self.ch_posix64.setChecked(False)
self.ch_posix64.setVisible(False)
self.ico_posix64.setVisible(False)
self.label_posix64.setVisible(False)
else:
hasNonNative = bool(carla_discovery_unix64 or carla_discovery_win32 or carla_discovery_win64)
self.ch_unix32.setChecked(False)
self.ch_unix32.setVisible(False)
self.ico_unix32.setVisible(False)
self.label_unix32.setVisible(False)
hasNonNative = bool(carla_discovery_posix64 or carla_discovery_win32 or carla_discovery_win64)
self.ch_posix32.setChecked(False)
self.ch_posix32.setVisible(False)
self.ico_posix32.setVisible(False)
self.label_posix32.setVisible(False)

if hasNative:
self.ico_native.setPixmap(getIcon("dialog-ok-apply").pixmap(16, 16))
@@ -572,11 +575,11 @@ class PluginRefreshW(QDialog, ui_carla_refresh.Ui_PluginRefreshW):
self.b_skip.setVisible(True)
self.b_close.setVisible(False)

native, unix32, unix64, win32, win64 = (self.ch_native.isChecked(), self.ch_unix32.isChecked(), self.ch_unix64.isChecked(), self.ch_win32.isChecked(), self.ch_win64.isChecked())
native, posix32, posix64, win32, win64 = (self.ch_native.isChecked(), self.ch_posix32.isChecked(), self.ch_posix64.isChecked(), self.ch_win32.isChecked(), self.ch_win64.isChecked())
ladspa, dssi, lv2, vst, gig, sf2, sfz = (self.ch_ladspa.isChecked(), self.ch_dssi.isChecked(), self.ch_lv2.isChecked(), self.ch_vst.isChecked(),
self.ch_gig.isChecked(), self.ch_sf2.isChecked(), self.ch_sfz.isChecked())

self.pThread.setSearchBinaryTypes(native, unix32, unix64, win32, win64)
self.pThread.setSearchBinaryTypes(native, posix32, posix64, win32, win64)
self.pThread.setSearchPluginTypes(ladspa, dssi, lv2, vst, gig, sf2, sfz)
self.pThread.start()

@@ -608,8 +611,8 @@ class PluginRefreshW(QDialog, ui_carla_refresh.Ui_PluginRefreshW):
self.settings.setValue("PluginDatabase/SearchSF2", self.ch_sf2.isChecked())
self.settings.setValue("PluginDatabase/SearchSFZ", self.ch_sfz.isChecked())
self.settings.setValue("PluginDatabase/SearchNative", self.ch_native.isChecked())
self.settings.setValue("PluginDatabase/SearchUnix32", self.ch_unix32.isChecked())
self.settings.setValue("PluginDatabase/SearchUnix64", self.ch_unix64.isChecked())
self.settings.setValue("PluginDatabase/SearchPOSIX32", self.ch_posix32.isChecked())
self.settings.setValue("PluginDatabase/SearchPOSIX64", self.ch_posix64.isChecked())
self.settings.setValue("PluginDatabase/SearchWin32", self.ch_win32.isChecked())
self.settings.setValue("PluginDatabase/SearchWin64", self.ch_win64.isChecked())
self.settings_db.setValue("Plugins/LastLoadedBinary", "")
@@ -623,8 +626,8 @@ class PluginRefreshW(QDialog, ui_carla_refresh.Ui_PluginRefreshW):
self.ch_sf2.setChecked(self.settings.value("PluginDatabase/SearchSF2", True, type=bool))
self.ch_sfz.setChecked(self.settings.value("PluginDatabase/SearchSFZ", True, type=bool))
self.ch_native.setChecked(self.settings.value("PluginDatabase/SearchNative", True, type=bool))
self.ch_unix32.setChecked(self.settings.value("PluginDatabase/SearchUnix32", False, type=bool))
self.ch_unix64.setChecked(self.settings.value("PluginDatabase/SearchUnix64", False, type=bool))
self.ch_posix32.setChecked(self.settings.value("PluginDatabase/SearchPOSIX32", False, type=bool))
self.ch_posix64.setChecked(self.settings.value("PluginDatabase/SearchPOSIX64", False, type=bool))
self.ch_win32.setChecked(self.settings.value("PluginDatabase/SearchWin32", False, type=bool))
self.ch_win64.setChecked(self.settings.value("PluginDatabase/SearchWin64", False, type=bool))

@@ -648,7 +651,7 @@ class PluginDatabaseW(QDialog, ui_carla_database.Ui_PluginDatabaseW):
self.warning_old_shown = False
self.b_add.setEnabled(False)

if BINARY_NATIVE in (BINARY_UNIX32, BINARY_WIN32):
if BINARY_NATIVE in (BINARY_POSIX32, BINARY_WIN32):
self.ch_bridged.setText(self.tr("Bridged (64bit)"))
else:
self.ch_bridged.setText(self.tr("Bridged (32bit)"))
@@ -716,29 +719,29 @@ class PluginDatabaseW(QDialog, ui_carla_database.Ui_PluginDatabaseW):

ladspa_plugins = []
ladspa_plugins += toList(self.settings_db.value("Plugins/LADSPA_native", []))
ladspa_plugins += toList(self.settings_db.value("Plugins/LADSPA_unix32", []))
ladspa_plugins += toList(self.settings_db.value("Plugins/LADSPA_unix64", []))
ladspa_plugins += toList(self.settings_db.value("Plugins/LADSPA_posix32", []))
ladspa_plugins += toList(self.settings_db.value("Plugins/LADSPA_posix64", []))
ladspa_plugins += toList(self.settings_db.value("Plugins/LADSPA_win32", []))
ladspa_plugins += toList(self.settings_db.value("Plugins/LADSPA_win64", []))

dssi_plugins = []
dssi_plugins += toList(self.settings_db.value("Plugins/DSSI_native", []))
dssi_plugins += toList(self.settings_db.value("Plugins/DSSI_unix32", []))
dssi_plugins += toList(self.settings_db.value("Plugins/DSSI_unix64", []))
dssi_plugins += toList(self.settings_db.value("Plugins/DSSI_posix32", []))
dssi_plugins += toList(self.settings_db.value("Plugins/DSSI_posix64", []))
dssi_plugins += toList(self.settings_db.value("Plugins/DSSI_win32", []))
dssi_plugins += toList(self.settings_db.value("Plugins/DSSI_win64", []))

lv2_plugins = []
lv2_plugins += toList(self.settings_db.value("Plugins/LV2_native", []))
lv2_plugins += toList(self.settings_db.value("Plugins/LV2_unix32", []))
lv2_plugins += toList(self.settings_db.value("Plugins/LV2_unix64", []))
lv2_plugins += toList(self.settings_db.value("Plugins/LV2_posix32", []))
lv2_plugins += toList(self.settings_db.value("Plugins/LV2_posix64", []))
lv2_plugins += toList(self.settings_db.value("Plugins/LV2_win32", []))
lv2_plugins += toList(self.settings_db.value("Plugins/LV2_win64", []))

vst_plugins = []
vst_plugins += toList(self.settings_db.value("Plugins/VST_native", []))
vst_plugins += toList(self.settings_db.value("Plugins/VST_unix32", []))
vst_plugins += toList(self.settings_db.value("Plugins/VST_unix64", []))
vst_plugins += toList(self.settings_db.value("Plugins/VST_posix32", []))
vst_plugins += toList(self.settings_db.value("Plugins/VST_posix64", []))
vst_plugins += toList(self.settings_db.value("Plugins/VST_win32", []))
vst_plugins += toList(self.settings_db.value("Plugins/VST_win64", []))

@@ -807,9 +810,9 @@ class PluginDatabaseW(QDialog, ui_carla_database.Ui_PluginDatabaseW):
else:
type_text = self.tr("Unknown")
if LINUX or MACOS:
if plugin['build'] == BINARY_UNIX32:
if plugin['build'] == BINARY_POSIX32:
type_text = "32bit"
elif plugin['build'] == BINARY_UNIX64:
elif plugin['build'] == BINARY_POSIX64:
type_text = "64bit"
elif plugin['build'] == BINARY_WIN32:
type_text = "Windows 32bit"
@@ -898,8 +901,8 @@ class PluginDatabaseW(QDialog, ui_carla_database.Ui_PluginDatabaseW):
hide_non_gui = self.ch_gui.isChecked()
hide_non_stereo = self.ch_stereo.isChecked()

if LINUX or MACOS:
native_bins = [BINARY_UNIX32, BINARY_UNIX64]
if HAIKU or LINUX or MACOS:
native_bins = [BINARY_POSIX32, BINARY_POSIX64]
wine_bins = [BINARY_WIN32, BINARY_WIN64]
elif WINDOWS:
native_bins = [BINARY_WIN32, BINARY_WIN64]
@@ -1220,11 +1223,11 @@ class CarlaMainW(QMainWindow, ui_carla.Ui_CarlaMainW):
# ---------------------------------------------
# bridge paths

if carla_bridge_unix32:
Carla.Host.set_option(OPTION_PATH_BRIDGE_UNIX32, 0, carla_bridge_unix32)
if carla_bridge_posix32:
Carla.Host.set_option(OPTION_PATH_BRIDGE_POSIX32, 0, carla_bridge_posix32)

if carla_bridge_unix64:
Carla.Host.set_option(OPTION_PATH_BRIDGE_UNIX64, 0, carla_bridge_unix64)
if carla_bridge_posix64:
Carla.Host.set_option(OPTION_PATH_BRIDGE_POSIX64, 0, carla_bridge_posix64)

if carla_bridge_win32:
Carla.Host.set_option(OPTION_PATH_BRIDGE_WIN32, 0, carla_bridge_win32)
@@ -1596,8 +1599,8 @@ class CarlaMainW(QMainWindow, ui_carla.Ui_CarlaMainW):
if not x_ladspa_plugins:
x_ladspa_plugins = []
x_ladspa_plugins += toList(self.settings_db.value("Plugins/LADSPA_native", []))
x_ladspa_plugins += toList(self.settings_db.value("Plugins/LADSPA_unix32", []))
x_ladspa_plugins += toList(self.settings_db.value("Plugins/LADSPA_unix64", []))
x_ladspa_plugins += toList(self.settings_db.value("Plugins/LADSPA_posix32", []))
x_ladspa_plugins += toList(self.settings_db.value("Plugins/LADSPA_posix64", []))
x_ladspa_plugins += toList(self.settings_db.value("Plugins/LADSPA_win32", []))
x_ladspa_plugins += toList(self.settings_db.value("Plugins/LADSPA_win64", []))
x_plugins = x_ladspa_plugins
@@ -1606,8 +1609,8 @@ class CarlaMainW(QMainWindow, ui_carla.Ui_CarlaMainW):
if not x_dssi_plugins:
x_dssi_plugins = []
x_dssi_plugins += toList(self.settings_db.value("Plugins/DSSI_native", []))
x_dssi_plugins += toList(self.settings_db.value("Plugins/DSSI_unix32", []))
x_dssi_plugins += toList(self.settings_db.value("Plugins/DSSI_unix64", []))
x_dssi_plugins += toList(self.settings_db.value("Plugins/DSSI_posix32", []))
x_dssi_plugins += toList(self.settings_db.value("Plugins/DSSI_posix64", []))
x_dssi_plugins += toList(self.settings_db.value("Plugins/DSSI_win32", []))
x_dssi_plugins += toList(self.settings_db.value("Plugins/DSSI_win64", []))
x_plugins = x_dssi_plugins
@@ -1616,8 +1619,8 @@ class CarlaMainW(QMainWindow, ui_carla.Ui_CarlaMainW):
if not x_lv2_plugins:
x_lv2_plugins = []
x_lv2_plugins += toList(self.settings_db.value("Plugins/LV2_native", []))
x_lv2_plugins += toList(self.settings_db.value("Plugins/LV2_unix32", []))
x_lv2_plugins += toList(self.settings_db.value("Plugins/LV2_unix64", []))
x_lv2_plugins += toList(self.settings_db.value("Plugins/LV2_posix32", []))
x_lv2_plugins += toList(self.settings_db.value("Plugins/LV2_posix64", []))
x_lv2_plugins += toList(self.settings_db.value("Plugins/LV2_win32", []))
x_lv2_plugins += toList(self.settings_db.value("Plugins/LV2_win64", []))
x_plugins = x_lv2_plugins
@@ -1626,8 +1629,8 @@ class CarlaMainW(QMainWindow, ui_carla.Ui_CarlaMainW):
if not x_vst_plugins:
x_vst_plugins = []
x_vst_plugins += toList(self.settings_db.value("Plugins/VST_native", []))
x_vst_plugins += toList(self.settings_db.value("Plugins/VST_unix32", []))
x_vst_plugins += toList(self.settings_db.value("Plugins/VST_unix64", []))
x_vst_plugins += toList(self.settings_db.value("Plugins/VST_posix32", []))
x_vst_plugins += toList(self.settings_db.value("Plugins/VST_posix64", []))
x_vst_plugins += toList(self.settings_db.value("Plugins/VST_win32", []))
x_vst_plugins += toList(self.settings_db.value("Plugins/VST_win64", []))
x_plugins = x_vst_plugins


+ 29
- 29
src/carla_backend.py View File

@@ -241,16 +241,16 @@ if haveLRDF:
global carla_library_path
carla_library_path = ""

carla_discovery_native = ""
carla_discovery_unix32 = ""
carla_discovery_unix64 = ""
carla_discovery_win32 = ""
carla_discovery_win64 = ""
carla_discovery_native = ""
carla_discovery_posix32 = ""
carla_discovery_posix64 = ""
carla_discovery_win32 = ""
carla_discovery_win64 = ""

carla_bridge_unix32 = ""
carla_bridge_unix64 = ""
carla_bridge_win32 = ""
carla_bridge_win64 = ""
carla_bridge_posix32 = ""
carla_bridge_posix64 = ""
carla_bridge_win32 = ""
carla_bridge_win64 = ""

carla_bridge_lv2_gtk2 = ""
carla_bridge_lv2_qt4 = ""
@@ -298,22 +298,22 @@ else:
carla_discovery_native = os.path.join(p, "carla-discovery-native")
break

# find carla_discovery_unix32
if os.path.exists(os.path.join(CWDpp, "carla-discovery", "carla-discovery-unix32")):
carla_discovery_unix32 = os.path.join(CWDpp, "carla-discovery", "carla-discovery-unix32")
# find carla_discovery_posix32
if os.path.exists(os.path.join(CWDpp, "carla-discovery", "carla-discovery-posix32")):
carla_discovery_posix32 = os.path.join(CWDpp, "carla-discovery", "carla-discovery-posix32")
else:
for p in PATH:
if os.path.exists(os.path.join(p, "carla-discovery-unix32")):
carla_discovery_unix32 = os.path.join(p, "carla-discovery-unix32")
if os.path.exists(os.path.join(p, "carla-discovery-posix32")):
carla_discovery_posix32 = os.path.join(p, "carla-discovery-posix32")
break

# find carla_discovery_unix64
if os.path.exists(os.path.join(CWDpp, "carla-discovery", "carla-discovery-unix64")):
carla_discovery_unix64 = os.path.join(CWDpp, "carla-discovery", "carla-discovery-unix64")
# find carla_discovery_posix64
if os.path.exists(os.path.join(CWDpp, "carla-discovery", "carla-discovery-posix64")):
carla_discovery_posix64 = os.path.join(CWDpp, "carla-discovery", "carla-discovery-posix64")
else:
for p in PATH:
if os.path.exists(os.path.join(p, "carla-discovery-unix64")):
carla_discovery_unix64 = os.path.join(p, "carla-discovery-unix64")
if os.path.exists(os.path.join(p, "carla-discovery-posix64")):
carla_discovery_posix64 = os.path.join(p, "carla-discovery-posix64")
break

# find carla_discovery_win32
@@ -334,22 +334,22 @@ else:
carla_discovery_win64 = os.path.join(p, "carla-discovery-win64.exe")
break

# find carla_bridge_unix32
if os.path.exists(os.path.join(CWDpp, "carla-bridge", "carla-bridge-unix32")):
carla_bridge_unix32 = os.path.join(CWDpp, "carla-bridge", "carla-bridge-unix32")
# find carla_bridge_posix32
if os.path.exists(os.path.join(CWDpp, "carla-bridge", "carla-bridge-posix32")):
carla_bridge_posix32 = os.path.join(CWDpp, "carla-bridge", "carla-bridge-posix32")
else:
for p in PATH:
if os.path.exists(os.path.join(p, "carla-bridge-unix32")):
carla_bridge_unix32 = os.path.join(p, "carla-bridge-unix32")
if os.path.exists(os.path.join(p, "carla-bridge-posix32")):
carla_bridge_posix32 = os.path.join(p, "carla-bridge-posix32")
break

# find carla_bridge_unix64
if os.path.exists(os.path.join(CWDpp, "carla-bridge", "carla-bridge-unix64")):
carla_bridge_unix64 = os.path.join(CWDpp, "carla-bridge", "carla-bridge-unix64")
# find carla_bridge_posix64
if os.path.exists(os.path.join(CWDpp, "carla-bridge", "carla-bridge-posix64")):
carla_bridge_posix64 = os.path.join(CWDpp, "carla-bridge", "carla-bridge-posix64")
else:
for p in PATH:
if os.path.exists(os.path.join(p, "carla-bridge-unix64")):
carla_bridge_unix64 = os.path.join(p, "carla-bridge-unix64")
if os.path.exists(os.path.join(p, "carla-bridge-posix64")):
carla_bridge_posix64 = os.path.join(p, "carla-bridge-posix64")
break

# find carla_bridge_win32


+ 10
- 10
src/shared_carla.py View File

@@ -73,12 +73,12 @@ PARAMETER_USES_SCALEPOINTS = 0x40
PARAMETER_USES_CUSTOM_TEXT = 0x80

# enum BinaryType
BINARY_NONE = 0
BINARY_UNIX32 = 1
BINARY_UNIX64 = 2
BINARY_WIN32 = 3
BINARY_WIN64 = 4
BINARY_OTHER = 5
BINARY_NONE = 0
BINARY_POSIX32 = 1
BINARY_POSIX64 = 2
BINARY_WIN32 = 3
BINARY_WIN64 = 4
BINARY_OTHER = 5

# enum PluginType
PLUGIN_NONE = 0
@@ -152,8 +152,8 @@ OPTION_PATH_VST = 13
OPTION_PATH_GIG = 14
OPTION_PATH_SF2 = 15
OPTION_PATH_SFZ = 16
OPTION_PATH_BRIDGE_UNIX32 = 17
OPTION_PATH_BRIDGE_UNIX64 = 18
OPTION_PATH_BRIDGE_POSIX32 = 17
OPTION_PATH_BRIDGE_POSIX64 = 18
OPTION_PATH_BRIDGE_WIN32 = 19
OPTION_PATH_BRIDGE_WIN64 = 20
OPTION_PATH_BRIDGE_LV2_GTK2 = 21
@@ -195,8 +195,8 @@ Carla.processMode = PROCESS_MODE_MULTIPLE_CLIENTS
Carla.maxParameters = MAX_PARAMETERS

# set native binary type
if LINUX or MACOS:
BINARY_NATIVE = BINARY_UNIX64 if is64bit else BINARY_UNIX32
if HAIKU or LINUX or MACOS:
BINARY_NATIVE = BINARY_POSIX64 if is64bit else BINARY_POSIX32
elif WINDOWS:
BINARY_NATIVE = BINARY_WIN64 if is64bit else BINARY_WIN32
else:


+ 11
- 11
src/ui/carla_refresh.ui View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>615</width>
<height>249</height>
<height>255</height>
</rect>
</property>
<property name="windowTitle">
@@ -151,16 +151,16 @@
</widget>
</item>
<item>
<widget class="QCheckBox" name="ch_unix32">
<widget class="QCheckBox" name="ch_posix32">
<property name="text">
<string>Unix 32bit</string>
<string>POSIX 32bit</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="ch_unix64">
<widget class="QCheckBox" name="ch_posix64">
<property name="text">
<string>Unix 64bit</string>
<string>POSIX 64bit</string>
</property>
</widget>
</item>
@@ -241,7 +241,7 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="ico_unix32">
<widget class="QLabel" name="ico_posix32">
<property name="maximumSize">
<size>
<width>22</width>
@@ -278,7 +278,7 @@
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="ico_unix64">
<widget class="QLabel" name="ico_posix64">
<property name="text">
<string/>
</property>
@@ -304,9 +304,9 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_unix32">
<widget class="QLabel" name="label_posix32">
<property name="text">
<string>carla-discovery-unix32</string>
<string>carla-discovery-posix32</string>
</property>
</widget>
</item>
@@ -337,9 +337,9 @@
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="label_unix64">
<widget class="QLabel" name="label_posix64">
<property name="text">
<string>carla-discovery-unix64</string>
<string>carla-discovery-posix64</string>
</property>
</widget>
</item>


Write Preview
Loading…
Cancel
Save