From f6171941d97b33ffb8012b8f0c335fc3bfd8142f Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 13 Apr 2014 23:03:29 +0100 Subject: [PATCH] Force carla-rack to really use rack mode --- source/carla-patchbay | 1 + source/carla-rack | 1 + source/carla_host.py | 3 +++ source/carla_shared.py | 9 ++++++--- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/source/carla-patchbay b/source/carla-patchbay index 2aec26b32..3a7eabcbd 100755 --- a/source/carla-patchbay +++ b/source/carla-patchbay @@ -66,6 +66,7 @@ if __name__ == '__main__': gCarla.isLocal = True gCarla.isPlugin = False gCarla.processMode = ENGINE_PROCESS_MODE_MULTIPLE_CLIENTS + gCarla.processModeForced = True initHost(initName, libPrefix) diff --git a/source/carla-rack b/source/carla-rack index 7b8b0579e..60aeab7a8 100755 --- a/source/carla-rack +++ b/source/carla-rack @@ -66,6 +66,7 @@ if __name__ == '__main__': gCarla.isLocal = True gCarla.isPlugin = False gCarla.processMode = ENGINE_PROCESS_MODE_CONTINUOUS_RACK + gCarla.processModeForced = True initHost(initName, libPrefix) diff --git a/source/carla_host.py b/source/carla_host.py index b9e672bc6..019b6a031 100644 --- a/source/carla_host.py +++ b/source/carla_host.py @@ -498,6 +498,9 @@ class HostWindow(QMainWindow): except: audioSampleRate = CARLA_DEFAULT_AUDIO_SAMPLE_RATE + if gCarla.processModeForced: + processMode = gCarla.processMode + # ------------------------------------------------------------- # fix things if needed diff --git a/source/carla_shared.py b/source/carla_shared.py index 3e5e86b43..48aab0988 100644 --- a/source/carla_shared.py +++ b/source/carla_shared.py @@ -241,6 +241,8 @@ class CarlaObject(object): 'sampleRate', # current process mode 'processMode', + # check if process mode is forced (rack/patchbay) + 'processModeForced', # current transport mode 'transportMode', # current max parameters @@ -272,9 +274,10 @@ gCarla.isLocal = True gCarla.isPlugin = False gCarla.bufferSize = 0 gCarla.sampleRate = 0.0 -gCarla.processMode = ENGINE_PROCESS_MODE_MULTIPLE_CLIENTS if LINUX else ENGINE_PROCESS_MODE_CONTINUOUS_RACK -gCarla.transportMode = ENGINE_TRANSPORT_MODE_JACK if LINUX else ENGINE_TRANSPORT_MODE_INTERNAL -gCarla.maxParameters = MAX_DEFAULT_PARAMETERS +gCarla.processMode = ENGINE_PROCESS_MODE_MULTIPLE_CLIENTS if LINUX else ENGINE_PROCESS_MODE_CONTINUOUS_RACK +gCarla.processModeForced = False +gCarla.transportMode = ENGINE_TRANSPORT_MODE_JACK if LINUX else ENGINE_TRANSPORT_MODE_INTERNAL +gCarla.maxParameters = MAX_DEFAULT_PARAMETERS gCarla.discovery_native = "" gCarla.discovery_posix32 = "" gCarla.discovery_posix64 = ""