diff --git a/src/cadence.py b/src/cadence.py
index 5de6d40..c683fd8 100755
--- a/src/cadence.py
+++ b/src/cadence.py
@@ -299,7 +299,7 @@ class CadenceSystemCheck_kernel(CadenceSystemCheck):
def __init__(self):
CadenceSystemCheck.__init__(self)
- self.name = self.tr("Current kernel")
+ self.name = self.tr("Current kernel")
uname3 = os.uname()[2]
@@ -330,7 +330,7 @@ class CadenceSystemCheck_kernel(CadenceSystemCheck):
self.result += kernelType.title()
if kernelType in ("rt", "realtime") or (kernelType == "lowlatency" and versionInt >= [2, 6, 39]):
- self.icon = self.ICON_WARN
+ self.icon = self.ICON_OK
self.moreInfo = None
elif versionInt >= [2, 6, 39]:
self.icon = self.ICON_WARN
@@ -1282,6 +1282,10 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
def saveSettings(self):
self.settings.setValue("Geometry", self.saveGeometry())
+ GlobalSettings.setValue("JACK/AutoStart", self.cb_jack_autostart.isChecked())
+ #GlobalSettings.setValue("A2J-MIDI/AutoStart", self.cb_a2jmidi_autostart.isChecked())
+ #GlobalSettings.setValue("Pulse2JACK/AutoStart", (havePulseAudio and self.cb_pulse_autostart.isChecked()))
+
def loadSettings(self, geometry):
if geometry:
self.restoreGeometry(self.settings.value("Geometry", ""))
@@ -1291,6 +1295,10 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
"Main/CloseToTray": self.settings.value("Main/CloseToTray", True, type=bool)
}
+ self.cb_jack_autostart.setChecked(GlobalSettings.value("JACK/AutoStart", True, type=bool))
+ #self.cb_a2j_autostart.setChecked(GlobalSettings.value("A2J/AutoStart", True).toBool())
+ #self.cb_pulse_autostart.setChecked(GlobalSettings.value("Pulse2JACK/AutoStart", havePulseAudio).toBool())
+
def timerEvent(self, event):
if event.timerId() == self.m_timer250:
if DBus.jack and self.m_last_dsp_load != None:
diff --git a/src/ui/cadence.ui b/src/ui/cadence.ui
index db2e1f1..cbe53d2 100644
--- a/src/ui/cadence.ui
+++ b/src/ui/cadence.ui
@@ -6,8 +6,8 @@
0
0
- 732
- 483
+ 753
+ 581
@@ -448,7 +448,7 @@
-
-
+
Auto-start JACK at login
@@ -471,7 +471,327 @@
JACK Bridges
-
+
+
-
+
+
+
+ ALSA Audio
+
+
+
-
+
+
+ No bridge in use
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 10
+ 20
+
+
+
+
+ -
+
+
+ Start
+
+
+
+ -
+
+
+ Stop
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 10
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Bridge Type:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
-
+
+ (None)
+
+
+ -
+
+ ALSA -> JACK (Plugin)
+
+
+ -
+
+ ALSA -> PulseAudio -> JACK (Plugin)
+
+
+ -
+
+ ALSA -> Loop -> JACK
+
+
+
+
+ -
+
+
+ ...
+
+
+
+
+
+
+
+
+
+ ALSA MIDI
+
+
+ -
+
+
+ A2J state
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 10
+ 20
+
+
+
+
+ -
+
+
+ Start
+
+
+
+ -
+
+
+ Stop
+
+
+
+ -
+
+
+ Export HW...
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 10
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Auto-start at login
+
+
+
+ -
+
+
+ ...
+
+
+
+
+
+
+
+
+
+ PulseAudio
+
+
+ -
+
+
+ PulseAudio state
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 10
+ 20
+
+
+
+
+ -
+
+
+ Start
+
+
+
+ -
+
+
+ Stop
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 10
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Auto-start at login
+
+
+
+ -
+
+
+ ...
+
+
+
+
+
+
+
+
+
+
-
@@ -479,6 +799,9 @@
Qt::Vertical
+
+ QSizePolicy::Preferred
+
20
@@ -1619,7 +1942,7 @@ Default is off
0
0
- 732
+ 753
19