Browse Source

Fix build without liblo

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.1-rc1
falkTX 6 years ago
parent
commit
b91c92490e
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 17 additions and 1 deletions
  1. +1
    -1
      data/windows/pack-win.sh
  2. +16
    -0
      source/backend/engine/CarlaEngineJack.cpp

+ 1
- 1
data/windows/pack-win.sh View File

@@ -33,7 +33,7 @@ fi


source data/windows/common.env source data/windows/common.env


PKG_FOLDER="Carla_2.0-alpha1-win${ARCH}"
PKG_FOLDER="Carla_2.0-alpha2-win${ARCH}"


export WIN32=true export WIN32=true




+ 16
- 0
source/backend/engine/CarlaEngineJack.cpp View File

@@ -1975,7 +1975,11 @@ protected:
CARLA_SAFE_ASSERT_RETURN(name != nullptr && name[0] != '\0',); CARLA_SAFE_ASSERT_RETURN(name != nullptr && name[0] != '\0',);


// ignore this if on internal patchbay mode // ignore this if on internal patchbay mode
#if defined(HAVE_LIBLO) && !defined(BUILD_BRIDGE)
if (! (fExternalPatchbayHost || (fExternalPatchbayOsc && pData->osc.isControlRegisteredForTCP()))) return; if (! (fExternalPatchbayHost || (fExternalPatchbayOsc && pData->osc.isControlRegisteredForTCP()))) return;
#else
if (! fExternalPatchbayHost) return;
#endif


// do nothing on client registration, wait for first port // do nothing on client registration, wait for first port
if (reg) return; if (reg) return;
@@ -1997,7 +2001,11 @@ protected:
void handleJackPortRegistrationCallback(const jack_port_id_t port, const bool reg) void handleJackPortRegistrationCallback(const jack_port_id_t port, const bool reg)
{ {
// ignore this if on internal patchbay mode // ignore this if on internal patchbay mode
#if defined(HAVE_LIBLO) && !defined(BUILD_BRIDGE)
if (! (fExternalPatchbayHost || (fExternalPatchbayOsc && pData->osc.isControlRegisteredForTCP()))) return; if (! (fExternalPatchbayHost || (fExternalPatchbayOsc && pData->osc.isControlRegisteredForTCP()))) return;
#else
if (! fExternalPatchbayHost) return;
#endif


const jack_port_t* const jackPort(jackbridge_port_by_id(fClient, port)); const jack_port_t* const jackPort(jackbridge_port_by_id(fClient, port));
CARLA_SAFE_ASSERT_RETURN(jackPort != nullptr,); CARLA_SAFE_ASSERT_RETURN(jackPort != nullptr,);
@@ -2062,7 +2070,11 @@ protected:
void handleJackPortConnectCallback(const jack_port_id_t a, const jack_port_id_t b, const bool connect) void handleJackPortConnectCallback(const jack_port_id_t a, const jack_port_id_t b, const bool connect)
{ {
// ignore this if on internal patchbay mode // ignore this if on internal patchbay mode
#if defined(HAVE_LIBLO) && !defined(BUILD_BRIDGE)
if (! (fExternalPatchbayHost || (fExternalPatchbayOsc && pData->osc.isControlRegisteredForTCP()))) return; if (! (fExternalPatchbayHost || (fExternalPatchbayOsc && pData->osc.isControlRegisteredForTCP()))) return;
#else
if (! fExternalPatchbayHost) return;
#endif


const jack_port_t* const jackPortA(jackbridge_port_by_id(fClient, a)); const jack_port_t* const jackPortA(jackbridge_port_by_id(fClient, a));
CARLA_SAFE_ASSERT_RETURN(jackPortA != nullptr,); CARLA_SAFE_ASSERT_RETURN(jackPortA != nullptr,);
@@ -2135,7 +2147,11 @@ protected:
void handleJackPortRenameCallback(const jack_port_id_t port, const char* const oldFullName, const char* const newFullName) void handleJackPortRenameCallback(const jack_port_id_t port, const char* const oldFullName, const char* const newFullName)
{ {
// ignore this if on internal patchbay mode // ignore this if on internal patchbay mode
#if defined(HAVE_LIBLO) && !defined(BUILD_BRIDGE)
if (! (fExternalPatchbayHost || (fExternalPatchbayOsc && pData->osc.isControlRegisteredForTCP()))) return; if (! (fExternalPatchbayHost || (fExternalPatchbayOsc && pData->osc.isControlRegisteredForTCP()))) return;
#else
if (! fExternalPatchbayHost) return;
#endif


CARLA_SAFE_ASSERT_RETURN(oldFullName != nullptr && oldFullName[0] != '\0',); CARLA_SAFE_ASSERT_RETURN(oldFullName != nullptr && oldFullName[0] != '\0',);
CARLA_SAFE_ASSERT_RETURN(newFullName != nullptr && newFullName[0] != '\0',); CARLA_SAFE_ASSERT_RETURN(newFullName != nullptr && newFullName[0] != '\0',);


Loading…
Cancel
Save