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

Transport controls are now considered stable

tags/v1.9.9
falkTX 7 years ago
parent
3c6c972a8c
commit
456b13efaa
6 changed files with 10 additions and 39 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -7
      resources/ui/carla_settings.ui
  2. +1
    -1
      source/backend/engine/CarlaEngineInternal.cpp
  3. +1
    -1
      source/backend/engine/CarlaEngineInternal.hpp
  4. +8
    -22
      source/carla_host.py
  5. +0
    -6
      source/carla_settings.py
  6. +0
    -2
      source/carla_shared.py

+ 0
- 7
resources/ui/carla_settings.ui View File

@@ -1793,13 +1793,6 @@
<string>Main</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_17">
<item>
<widget class="QCheckBox" name="ch_exp_transport">
<property name="text">
<string>Enable transport controls</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cb_exp_plugin_bridges">
<property name="text">


+ 1
- 1
source/backend/engine/CarlaEngineInternal.cpp View File

@@ -1,6 +1,6 @@
/*
* Carla Plugin Host
* Copyright (C) 2011-2017 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2011-2018 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as


+ 1
- 1
source/backend/engine/CarlaEngineInternal.hpp View File

@@ -1,6 +1,6 @@
/*
* Carla Plugin Host
* Copyright (C) 2011-2017 Filipe Coelho <falktx@falktx.com>
* Copyright (C) 2011-2018 Filipe Coelho <falktx@falktx.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as


+ 8
- 22
source/carla_host.py View File

@@ -1530,29 +1530,15 @@ class HostWindow(QMainWindow):
self.ui.act_add_jack.setVisible(False)

if not (self.host.isControl or self.host.isPlugin):
if self.host.experimental:
if settings.value(CARLA_KEY_EXPERIMENTAL_TRANSPORT, CARLA_DEFAULT_EXPERIMENTAL_TRANSPORT, type=bool):
if self.ui.cb_transport_jack.isChecked():
transportMode = ENGINE_TRANSPORT_MODE_JACK
else:
transportMode = ENGINE_TRANSPORT_MODE_INTERNAL
transportExtra = ":link:" if self.ui.cb_transport_link.isChecked() else ""
else:
# Stop transport if becoming disabled
if self.ui.w_transport.isEnabled() and self.host.is_engine_running():
self.host.transport_pause()
self.host.transport_relocate(0)
self.host.transport_pause()

transportMode = ENGINE_TRANSPORT_MODE_DISABLED
transportExtra = ""

self.ui.w_transport.setEnabled(transportMode != ENGINE_TRANSPORT_MODE_DISABLED)
self.host.transportMode = transportMode
self.host.set_engine_option(ENGINE_OPTION_TRANSPORT_MODE, transportMode, transportExtra)

if self.ui.cb_transport_jack.isChecked():
transportMode = ENGINE_TRANSPORT_MODE_JACK
else:
self.ui.w_transport.setEnabled(False)
transportMode = ENGINE_TRANSPORT_MODE_INTERNAL
transportExtra = ":link:" if self.ui.cb_transport_link.isChecked() else ""

self.ui.w_transport.setEnabled(transportMode != ENGINE_TRANSPORT_MODE_DISABLED)
self.host.transportMode = transportMode
self.host.set_engine_option(ENGINE_OPTION_TRANSPORT_MODE, transportMode, transportExtra)

self.fMiniCanvasUpdateTimeout = 1000 if self.fSavedSettings[CARLA_KEY_CANVAS_FANCY_EYE_CANDY] else 0



+ 0
- 6
source/carla_settings.py View File

@@ -517,10 +517,6 @@ class CarlaSettingsW(QDialog):
# ----------------------------------------------------------------------------------------------------
# Experimental

self.ui.ch_exp_transport.setChecked(settings.value(CARLA_KEY_EXPERIMENTAL_TRANSPORT,
CARLA_DEFAULT_EXPERIMENTAL_TRANSPORT,
type=bool))

self.ui.ch_exp_jack_apps.setChecked(settings.value(CARLA_KEY_EXPERIMENTAL_JACK_APPS,
CARLA_DEFAULT_EXPERIMENTAL_JACK_APPS,
type=bool))
@@ -692,7 +688,6 @@ class CarlaSettingsW(QDialog):
# ----------------------------------------------------------------------------------------------------
# Experimental

settings.setValue(CARLA_KEY_EXPERIMENTAL_TRANSPORT, self.ui.ch_exp_transport.isChecked())
settings.setValue(CARLA_KEY_EXPERIMENTAL_JACK_APPS, self.ui.ch_exp_jack_apps.isChecked())
settings.setValue(CARLA_KEY_EXPERIMENTAL_LOAD_LIB_GLOBAL, self.ui.ch_exp_load_lib_global.isChecked())
settings.setValue(CARLA_KEY_EXPERIMENTAL_PREVENT_BAD_BEHAVIOUR, self.ui.ch_exp_prevent_bad_behaviour.isChecked())
@@ -846,7 +841,6 @@ class CarlaSettingsW(QDialog):
self.ui.cb_canvas_render_hq_aa.setChecked(CARLA_DEFAULT_CANVAS_HQ_ANTIALIASING and self.ui.cb_canvas_render_hq_aa.isEnabled())
self.ui.ch_engine_force_stereo.setChecked(CARLA_DEFAULT_FORCE_STEREO)
self.ui.ch_engine_prefer_plugin_bridges.setChecked(CARLA_DEFAULT_PREFER_PLUGIN_BRIDGES)
self.ui.ch_exp_transport.setChecked(CARLA_DEFAULT_EXPERIMENTAL_TRANSPORT)

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



+ 0
- 2
source/carla_shared.py View File

@@ -233,7 +233,6 @@ CARLA_KEY_WINE_RT_PRIO_ENABLED = "Wine/RtPrioEnabled" # bool
CARLA_KEY_WINE_BASE_RT_PRIO = "Wine/BaseRtPrio" # int
CARLA_KEY_WINE_SERVER_RT_PRIO = "Wine/ServerRtPrio" # int

CARLA_KEY_EXPERIMENTAL_TRANSPORT = "Experimental/Transport" # bool
CARLA_KEY_EXPERIMENTAL_PLUGIN_BRIDGES = "Experimental/PluginBridges" # bool
CARLA_KEY_EXPERIMENTAL_WINE_BRIDGES = "Experimental/WineBridges" # bool
CARLA_KEY_EXPERIMENTAL_JACK_APPS = "Experimental/JackApplications" # bool
@@ -306,7 +305,6 @@ CARLA_DEFAULT_WINE_BASE_RT_PRIO = 15
CARLA_DEFAULT_WINE_SERVER_RT_PRIO = 10

# Experimental
CARLA_DEFAULT_EXPERIMENTAL_TRANSPORT = False
CARLA_DEFAULT_EXPERIMENTAL_PLUGIN_BRIDGES = False
CARLA_DEFAULT_EXPERIMENTAL_WINE_BRIDGES = False
CARLA_DEFAULT_EXPERIMENTAL_JACK_APPS = False


Write Preview
Loading…
Cancel
Save