Browse Source

Always enable JACK transport mode, for now

tags/1.9.4
falkTX 11 years ago
parent
commit
78311c90e8
4 changed files with 13 additions and 5 deletions
  1. +3
    -0
      resources/ui/carla.ui
  2. +3
    -0
      source/backend/engine/CarlaEngine.cpp
  3. +2
    -1
      source/backend/engine/CarlaEngineJack.cpp
  4. +5
    -4
      source/carla.py

+ 3
- 0
resources/ui/carla.ui View File

@@ -473,6 +473,9 @@
<property name="checkable">
<bool>true</bool>
</property>
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Show Transport bar</string>
</property>


+ 3
- 0
source/backend/engine/CarlaEngine.cpp View File

@@ -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<CarlaBackend::TransportMode>(value);
#endif
break;

case OPTION_MAX_PARAMETERS:


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

@@ -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<jack_position_t>(fTransportPos);
}


+ 5
- 4
source/carla.py View File

@@ -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),


Loading…
Cancel
Save