Browse Source

Misc

tags/1.9.4
falkTX 12 years ago
parent
commit
e5fc74c39a
2 changed files with 9 additions and 5 deletions
  1. +1
    -1
      source/Makefile.mk
  2. +8
    -4
      source/backend/engine/CarlaEngineJack.cpp

+ 1
- 1
source/Makefile.mk View File

@@ -55,7 +55,7 @@ BASE_FLAGS += -Wcast-align -Wunsafe-loop-optimizations
endif
ifeq ($(LINUX),true)
CFLAGS += -isystem /opt/kxstudio/include
CXXFLAGS += -isystem /opt/kxstudio/include -isystem /usr/include/qt5
CXXFLAGS += -isystem /opt/kxstudio/include -isystem /usr/include/qt4
endif
ifeq ($(MACOS),true)
CFLAGS += -isystem /opt/local/include/


+ 8
- 4
source/backend/engine/CarlaEngineJack.cpp View File

@@ -77,10 +77,10 @@ public:
case ENGINE_PROCESS_MODE_SINGLE_CLIENT:
case ENGINE_PROCESS_MODE_MULTIPLE_CLIENTS:
CARLA_SAFE_ASSERT_RETURN(jackClient != nullptr && jackPort != nullptr,);
#ifndef CARLA_OS_WIN
if (const jack_uuid_t uuid = jackbridge_port_uuid(jackPort))
jackbridge_set_property(jackClient, uuid, URI_CANVAS_CV, "NO", "text/plain");
#endif
break;

default:
@@ -95,8 +95,10 @@ public:

if (fJackClient != nullptr && fJackPort != nullptr)
{
#ifndef CARLA_OS_WIN
if (const jack_uuid_t uuid = jackbridge_port_uuid(fJackPort))
jackbridge_remove_property(fJackClient, uuid, URI_CANVAS_CV);
#endif

try {
jackbridge_port_unregister(fJackClient, fJackPort);
@@ -163,10 +165,10 @@ public:
case ENGINE_PROCESS_MODE_SINGLE_CLIENT:
case ENGINE_PROCESS_MODE_MULTIPLE_CLIENTS:
CARLA_SAFE_ASSERT_RETURN(jackClient != nullptr && jackPort != nullptr,);
#ifndef CARLA_OS_WIN
if (const jack_uuid_t uuid = jackbridge_port_uuid(jackPort))
jackbridge_set_property(jackClient, uuid, URI_CANVAS_CV, "YES", "text/plain");
#endif
break;

default:
@@ -181,8 +183,10 @@ public:

if (fJackClient != nullptr && fJackPort != nullptr)
{
#ifndef CARLA_OS_WIN
if (const jack_uuid_t uuid = jackbridge_port_uuid(fJackPort))
jackbridge_remove_property(fJackClient, uuid, URI_CANVAS_CV);
#endif

try {
jackbridge_port_unregister(fJackClient, fJackPort);


Loading…
Cancel
Save