Browse Source

JackSettings: misc fixing

tags/v0.9.0
falkTX 13 years ago
parent
commit
d9889d2e7d
3 changed files with 16 additions and 19 deletions
  1. +10
    -7
      src/jacksettings.py
  2. +6
    -6
      src/shared_jack.py
  3. +0
    -6
      src/ui/settings_jack.ui

+ 10
- 7
src/jacksettings.py View File

@@ -83,8 +83,8 @@ def setSampleRate(srate):
# Helper functions (engine) # Helper functions (engine)


def engineHasFeature(feature): def engineHasFeature(feature):
feature_list = jackctl.ReadContainer(["engine"])[1]
return bool(dbus.String(feature) in feature_list)
featureList = jackctl.ReadContainer(["engine"])[1]
return bool(dbus.String(feature) in featureList)


def getEngineParameter(parameter, fallback): def getEngineParameter(parameter, fallback):
if not engineHasFeature(parameter): if not engineHasFeature(parameter):
@@ -107,8 +107,8 @@ def setEngineParameter(parameter, value, optional=True):
# Helper functions (driver) # Helper functions (driver)


def driverHasFeature(feature): def driverHasFeature(feature):
feature_list = jackctl.ReadContainer(["driver"])[1]
return bool(dbus.String(feature) in feature_list)
featureList = jackctl.ReadContainer(["driver"])[1]
return bool(dbus.String(feature) in featureList)


def getDriverParameter(parameter, fallback): def getDriverParameter(parameter, fallback):
if not driverHasFeature(parameter): if not driverHasFeature(parameter):
@@ -145,10 +145,12 @@ class JackSettingsW(QDialog, ui_settings_jack.Ui_JackSettingsW):
# ------------------------------------------------------------- # -------------------------------------------------------------
# Align driver text and hide non available ones # Align driver text and hide non available ones


driver_list = jackctl.ReadContainer(["drivers"])[1]
driverList = jackctl.ReadContainer(["drivers"])[1]

for i in range(self.obj_server_driver.rowCount()): for i in range(self.obj_server_driver.rowCount()):
self.obj_server_driver.item(0, i).setTextAlignment(Qt.AlignCenter) self.obj_server_driver.item(0, i).setTextAlignment(Qt.AlignCenter)
if dbus.String(self.obj_server_driver.item(0, i).text().lower()) not in driver_list:

if dbus.String(self.obj_server_driver.item(0, i).text().lower()) not in driverList:
self.obj_server_driver.hideRow(i) self.obj_server_driver.hideRow(i)


# ------------------------------------------------------------- # -------------------------------------------------------------
@@ -799,7 +801,8 @@ if __name__ == '__main__':
if dbus: if dbus:
if initBus(dbus.SessionBus()): if initBus(dbus.SessionBus()):
QMessageBox.critical(None, app.translate("JackSettingsW", "Error"), app.translate("JackSettingsW", QMessageBox.critical(None, app.translate("JackSettingsW", "Error"), app.translate("JackSettingsW",
"jackdbus is not available!\nIs not possible to configure JACK at this point."))
"jackdbus is not available!\n"
"Is not possible to configure JACK at this point."))
sys_exit(1) sys_exit(1)
else: else:
QMessageBox.critical(None, app.translate("JackSettingsW", "Error"), QMessageBox.critical(None, app.translate("JackSettingsW", "Error"),


+ 6
- 6
src/shared_jack.py View File

@@ -74,14 +74,14 @@ jack = JackObject()


# Init objects # Init objects
DBus.loop = None DBus.loop = None
DBus.bus = None
DBus.a2j = None
DBus.bus = None
DBus.a2j = None
DBus.jack = None DBus.jack = None
DBus.ladish_control = None DBus.ladish_control = None
DBus.ladish_studio = None
DBus.ladish_room = None
DBus.ladish_graph = None
DBus.ladish_app_iface = None
DBus.ladish_studio = None
DBus.ladish_room = None
DBus.ladish_graph = None
DBus.ladish_app_iface = None
DBus.ladish_app_daemon = None DBus.ladish_app_daemon = None
DBus.patchbay = None DBus.patchbay = None




+ 0
- 6
src/ui/settings_jack.ui View File

@@ -134,9 +134,6 @@
</item> </item>
<item row="0" column="2"> <item row="0" column="2">
<widget class="QLabel" name="label_23"> <widget class="QLabel" name="label_23">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Scheduler priority when running in realtime mode</string> <string>Scheduler priority when running in realtime mode</string>
</property> </property>
@@ -150,9 +147,6 @@
</item> </item>
<item row="0" column="3"> <item row="0" column="3">
<widget class="QSpinBox" name="obj_server_realtime_priority"> <widget class="QSpinBox" name="obj_server_realtime_priority">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip"> <property name="toolTip">
<string>Scheduler priority when running in realtime mode</string> <string>Scheduler priority when running in realtime mode</string>
</property> </property>


Loading…
Cancel
Save