Browse Source

Fix build

tags/1.9.5
falkTX 10 years ago
parent
commit
4b34563f1a
2 changed files with 18 additions and 2 deletions
  1. +6
    -1
      source/backend/engine/CarlaEngineBridge.cpp
  2. +12
    -1
      source/backend/engine/CarlaEngineJack.cpp

+ 6
- 1
source/backend/engine/CarlaEngineBridge.cpp View File

@@ -254,6 +254,12 @@ public:
{ {
carla_debug("CarlaEngineBridge::init(\"%s\")", clientName); carla_debug("CarlaEngineBridge::init(\"%s\")", clientName);


if (! pData->init(clientName))
{
setLastError("Failed to init internal data");
return false;
}

if (! fShmAudioPool.attach()) if (! fShmAudioPool.attach())
{ {
carla_stdout("Failed to attach to audio pool shared memory"); carla_stdout("Failed to attach to audio pool shared memory");
@@ -318,7 +324,6 @@ public:


startThread(); startThread();


CarlaEngine::init(clientName);
return true; return true;
} }




+ 12
- 1
source/backend/engine/CarlaEngineJack.cpp View File

@@ -720,6 +720,12 @@ public:
carla_zeroStruct<jack_position_t>(fTransportPos); carla_zeroStruct<jack_position_t>(fTransportPos);


#ifdef BUILD_BRIDGE #ifdef BUILD_BRIDGE
if (! pData->init(clientName))
{
setLastError("Failed to init internal data");
return false;
}

if (pData->bufferSize == 0 || carla_compareFloats(pData->sampleRate, 0.0)) if (pData->bufferSize == 0 || carla_compareFloats(pData->sampleRate, 0.0))
{ {
// open temp client to get initial buffer-size and sample-rate values // open temp client to get initial buffer-size and sample-rate values
@@ -739,7 +745,7 @@ public:


fIsRunning = true; fIsRunning = true;


return CarlaEngine::init(clientName);
return true;
#else #else
fClient = jackbridge_client_open(clientName, JackNullOption, nullptr); fClient = jackbridge_client_open(clientName, JackNullOption, nullptr);


@@ -752,7 +758,12 @@ public:
const char* const jackClientName(jackbridge_get_client_name(fClient)); const char* const jackClientName(jackbridge_get_client_name(fClient));


if (! pData->init(jackClientName)) if (! pData->init(jackClientName))
{
jackbridge_client_close(fClient);
fClient = nullptr;
setLastError("Failed to init internal data");
return false; return false;
}


pData->bufferSize = jackbridge_get_buffer_size(fClient); pData->bufferSize = jackbridge_get_buffer_size(fClient);
pData->sampleRate = jackbridge_get_sample_rate(fClient); pData->sampleRate = jackbridge_get_sample_rate(fClient);


Loading…
Cancel
Save