Browse Source

Hide engine settings under NSM, always use JACK

tags/1.9.4
falkTX 12 years ago
parent
commit
1d153a96a0
2 changed files with 8 additions and 2 deletions
  1. +4
    -1
      source/carla_host.py
  2. +4
    -1
      source/carla_settings.py

+ 4
- 1
source/carla_host.py View File

@@ -346,7 +346,8 @@ class HostWindow(QMainWindow):
# Called by containers

def openSettingsWindow(self, hasCanvas, hasCanvasGL):
dialog = CarlaSettingsW(self, hasCanvas, hasCanvasGL)
hasEngine = bool(self.fSessionManagerName != "Non Session Manager")
dialog = CarlaSettingsW(self, hasCanvas, hasCanvasGL, hasEngine)
return dialog.exec_()

def setupContainer(self, showCanvas, canvasThemeData = []):
@@ -414,6 +415,8 @@ class HostWindow(QMainWindow):
def setEngineSettings(self, settings = None):
if gCarla.isPlugin:
return "Plugin"
if self.fSessionManagerName == "Non Session Manager":
return "JACK"

if settings is None: settings = QSettings()



+ 4
- 1
source/carla_settings.py View File

@@ -247,7 +247,7 @@ class CarlaSettingsW(QDialog):
# so add +2 pos padding if driverName != "JACK".
PROCESS_MODE_NON_JACK_PADDING = 2

def __init__(self, parent, hasCanvas, hasCanvasGL):
def __init__(self, parent, hasCanvas, hasCanvasGL, hasEngine):
QDialog.__init__(self, parent)
self.ui = ui_carla_settings.Ui_CarlaSettingsW()
self.ui.setupUi(self)
@@ -278,6 +278,9 @@ class CarlaSettingsW(QDialog):
self.ui.cb_canvas_use_opengl.setChecked(False)
self.ui.cb_canvas_use_opengl.setEnabled(False)

if not hasEngine:
self.ui.lw_page.hideRow(self.TAB_INDEX_ENGINE)

if WINDOWS:
self.ui.group_main_theme.setEnabled(False)
self.ui.ch_main_theme_pro.setChecked(False)


Loading…
Cancel
Save