diff --git a/resources/ui/carla.ui b/resources/ui/carla.ui index 2df78dcec..6aff7a09e 100644 --- a/resources/ui/carla.ui +++ b/resources/ui/carla.ui @@ -473,6 +473,9 @@ true + + false + Show Transport bar diff --git a/source/backend/engine/CarlaEngine.cpp b/source/backend/engine/CarlaEngine.cpp index cbd90867b..9a33b0790 100644 --- a/source/backend/engine/CarlaEngine.cpp +++ b/source/backend/engine/CarlaEngine.cpp @@ -1231,10 +1231,13 @@ void CarlaEngine::setOption(const OptionsType option, const int value, const cha break; case OPTION_TRANSPORT_MODE: + // FIXME: Always enable JACK transport for now +#if 0 if (value < CarlaBackend::TRANSPORT_MODE_INTERNAL || value > CarlaBackend::TRANSPORT_MODE_JACK) return carla_stderr2("carla_set_engine_option(OPTION_TRANSPORT_MODE, %i, \"%s\") - invalid value", value, valueStr); fOptions.transportMode = static_cast(value); +#endif break; case OPTION_MAX_PARAMETERS: diff --git a/source/backend/engine/CarlaEngineJack.cpp b/source/backend/engine/CarlaEngineJack.cpp index 5075908a5..fb9e3b2ce 100644 --- a/source/backend/engine/CarlaEngineJack.cpp +++ b/source/backend/engine/CarlaEngineJack.cpp @@ -511,8 +511,9 @@ public: #ifdef BUILD_BRIDGE fOptions.processMode = PROCESS_MODE_MULTIPLE_CLIENTS; - fOptions.transportMode = TRANSPORT_MODE_JACK; #endif + // FIXME: Always enable JACK transport for now + fOptions.transportMode = TRANSPORT_MODE_JACK; carla_zeroStruct(fTransportPos); } diff --git a/source/carla.py b/source/carla.py index 1dcb17879..50a77794c 100755 --- a/source/carla.py +++ b/source/carla.py @@ -1339,7 +1339,7 @@ class CarlaMainW(QMainWindow): settings = QSettings() settings.setValue("Geometry", self.saveGeometry()) settings.setValue("ShowToolbar", self.ui.toolBar.isVisible()) - settings.setValue("ShowTransport", self.ui.frame_transport.isVisible()) + #settings.setValue("ShowTransport", self.ui.frame_transport.isVisible()) settings.setValue("HorizontalScrollBarValue", self.ui.graphicsView.horizontalScrollBar().value()) settings.setValue("VerticalScrollBarValue", self.ui.graphicsView.verticalScrollBar().value()) @@ -1353,9 +1353,10 @@ class CarlaMainW(QMainWindow): self.ui.act_settings_show_toolbar.setChecked(showToolbar) self.ui.toolBar.setVisible(showToolbar) - showTransport = settings.value("ShowTransport", True, type=bool) - self.ui.act_settings_show_transport.setChecked(showTransport) - self.ui.frame_transport.setVisible(showTransport) + #showTransport = settings.value("ShowTransport", True, type=bool) + #self.ui.act_settings_show_transport.setChecked(showTransport) + #self.ui.frame_transport.setVisible(showTransport) + self.ui.frame_transport.setVisible(False) self.fSavedSettings = { "Main/DefaultProjectFolder": settings.value("Main/DefaultProjectFolder", HOME, type=str),