falkTX
/
Cadence
mirror of https://github.com/falkTX/Cadence
1
0
Fork 0
Code Releases 3 Activity
Browse Source

Cadence: add GUI widgets for jack-bridges

tags/v0.9.0
falkTX 13 years ago
parent
d72c12ce74
commit
fe6b97624a
2 changed files with 338 additions and 7 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +10
    -2
      src/cadence.py
  2. +328
    -5
      src/ui/cadence.ui

+ 10
- 2
src/cadence.py View File

@@ -299,7 +299,7 @@ class CadenceSystemCheck_kernel(CadenceSystemCheck):
def __init__(self): def __init__(self):
CadenceSystemCheck.__init__(self) CadenceSystemCheck.__init__(self)


self.name = self.tr("Current kernel")
self.name = self.tr("Current kernel")


uname3 = os.uname()[2] uname3 = os.uname()[2]


@@ -330,7 +330,7 @@ class CadenceSystemCheck_kernel(CadenceSystemCheck):
self.result += kernelType.title() self.result += kernelType.title()


if kernelType in ("rt", "realtime") or (kernelType == "lowlatency" and versionInt >= [2, 6, 39]): 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 self.moreInfo = None
elif versionInt >= [2, 6, 39]: elif versionInt >= [2, 6, 39]:
self.icon = self.ICON_WARN self.icon = self.ICON_WARN
@@ -1282,6 +1282,10 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
def saveSettings(self): def saveSettings(self):
self.settings.setValue("Geometry", self.saveGeometry()) 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): def loadSettings(self, geometry):
if geometry: if geometry:
self.restoreGeometry(self.settings.value("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) "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): def timerEvent(self, event):
if event.timerId() == self.m_timer250: if event.timerId() == self.m_timer250:
if DBus.jack and self.m_last_dsp_load != None: if DBus.jack and self.m_last_dsp_load != None:


+ 328
- 5
src/ui/cadence.ui View File

@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>732</width>
<height>483</height>
<width>753</width>
<height>581</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -448,7 +448,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="checkBox">
<widget class="QCheckBox" name="cb_jack_autostart">
<property name="text"> <property name="text">
<string>Auto-start JACK at login</string> <string>Auto-start JACK at login</string>
</property> </property>
@@ -471,7 +471,327 @@
<property name="title"> <property name="title">
<string>JACK Bridges</string> <string>JACK Bridges</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_5"/>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<widget class="QToolBox" name="toolBox_2">
<widget class="QWidget" name="toolBox_alsaaudio" native="true">
<attribute name="label">
<string>ALSA Audio</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_18">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>No bridge in use</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_3">
<property name="text">
<string>Start</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_4">
<property name="text">
<string>Stop</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Bridge Type:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox">
<item>
<property name="text">
<string>(None)</string>
</property>
</item>
<item>
<property name="text">
<string>ALSA -&gt; JACK (Plugin)</string>
</property>
</item>
<item>
<property name="text">
<string>ALSA -&gt; PulseAudio -&gt; JACK (Plugin)</string>
</property>
</item>
<item>
<property name="text">
<string>ALSA -&gt; Loop -&gt; JACK</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButton_2">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="toolBox_alsamidi" native="true">
<attribute name="label">
<string>ALSA MIDI</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_20">
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>A2J state</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_5">
<property name="text">
<string>Start</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_6">
<property name="text">
<string>Stop</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>Export HW...</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_8">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_11">
<item>
<spacer name="horizontalSpacer_14">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="checkBox">
<property name="text">
<string>Auto-start at login</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButton_3">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="toolBox_pulseaudio" native="true">
<attribute name="label">
<string>PulseAudio</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_19">
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>PulseAudio state</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_10">
<item>
<spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_7">
<property name="text">
<string>Start</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_8">
<property name="text">
<string>Stop</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_13">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_12">
<item>
<spacer name="horizontalSpacer_15">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="checkBox_2">
<property name="text">
<string>Auto-start at login</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButton_4">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
<item> <item>
@@ -479,6 +799,9 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
@@ -1619,7 +1942,7 @@ Default is off</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>732</width>
<width>753</width>
<height>19</height> <height>19</height>
</rect> </rect>
</property> </property>


Write Preview
Loading…
Cancel
Save