Index: /trunk/libffado/support/mixer-qt4/ffado/mixer/generic_dice_eap.py
===================================================================
--- /trunk/libffado/support/mixer-qt4/ffado/mixer/generic_dice_eap.py (revision 1796)
+++ /trunk/libffado/support/mixer-qt4/ffado/mixer/generic_dice_eap.py (revision 1796)
@@ -0,0 +1,57 @@
+#
+# Copyright (C) 2009-2010 by Arnold Krille
+#
+# This file is part of FFADO
+# FFADO = Free Firewire (pro-)audio drivers for linux
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+#
+
+from PyQt4 import QtGui, QtCore, Qt
+import dbus
+
+from ffado.widgets.matrixmixer import MatrixMixer
+from ffado.widgets.crossbarrouter import *
+
+from ffado.config import *
+
+class Generic_Dice_EAP(QtGui.QWidget):
+ def __init__(self, parent=None):
+ QtGui.QWidget.__init__(self, parent)
+ self.layout = QtGui.QGridLayout(self)
+ self.setLayout(self.layout)
+ self.tabs = QtGui.QTabWidget(self)
+ self.layout.addWidget(self.tabs)
+
+ def buildMixer(self):
+ #print self.hw
+ #print self.hw.getText("/Generic/Nickname")
+ self.matrix = MatrixMixer(self.hw.servername, self.hw.basepath+"/EAP/MatrixMixer", self)
+ scrollarea = QtGui.QScrollArea(self.tabs)
+ scrollarea.setWidgetResizable(True)
+ scrollarea.setWidget(self.matrix)
+ self.tabs.addTab(scrollarea, "Matrix")
+
+ self.router = CrossbarRouter(self.hw.servername, self.hw.basepath+"/EAP/Router", self)
+ scrollarea = QtGui.QScrollArea(self.tabs)
+ scrollarea.setWidgetResizable(True)
+ scrollarea.setWidget(self.router)
+ self.tabs.addTab(scrollarea, "Routing")
+
+
+ #def getDisplayTitle(self):
+ # return "Saffire PRO40/PRO24 Mixer"
+
+#
+# vim: et ts=4 sw=4
Index: /trunk/libffado/support/mixer-qt4/ffado/mixer/saffire_dice_monitoring.ui
===================================================================
--- /trunk/libffado/support/mixer-qt4/ffado/mixer/saffire_dice_monitoring.ui (revision 1794)
+++ /trunk/libffado/support/mixer-qt4/ffado/mixer/saffire_dice_monitoring.ui (revision 1796)
@@ -8,5 +8,5 @@
0
599
- 657
+ 406
@@ -28,42 +28,100 @@
-
+
- -
-
-
- Dim Level:
-
-
- Qt::AlignCenter
-
-
- dimLevel
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- dB
-
-
- -127
-
-
+
-
+
+
0
-
-
- -
+
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Ch 1 Instrument
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Ch 4 High Level
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Ch 2 Instrument
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Ch 3 High Level
+
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Use ADAT-Out as S/PDIF
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Pad Output
+
+
+
+
+
+
+
+ -
@@ -118,5 +176,40 @@
- -
+
-
+
+
+ Dim Level:
+
+
+ Qt::AlignCenter
+
+
+ dimLevel
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ dB
+
+
+ -127
+
+
+ 0
+
+
+
+ -
@@ -140,5 +233,5 @@
- -
+
-
@@ -159,82 +252,4 @@
true
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Ch 1 Instrument
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Ch 3 High Level
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Ch 2 Instrument
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Ch 4 High Level
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Use ADAT-Out as S/PDIF
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Pad Output
Index: /trunk/libffado/support/mixer-qt4/ffado/mixer/saffire_dice.py
===================================================================
--- /trunk/libffado/support/mixer-qt4/ffado/mixer/saffire_dice.py (revision 1794)
+++ /trunk/libffado/support/mixer-qt4/ffado/mixer/saffire_dice.py (revision 1796)
@@ -1,4 +1,4 @@
#
-# Copyright (C) 2009 by Arnold Krille
+# Copyright (C) 2009-2010 by Arnold Krille
#
# This file is part of FFADO
@@ -24,4 +24,5 @@
from ffado.widgets.matrixmixer import MatrixMixer
from ffado.widgets.crossbarrouter import *
+from ffado.mixer.generic_dice_eap import *
from ffado.config import *
@@ -197,26 +198,12 @@
self.emit(QtCore.SIGNAL("closeEditor(QWidget*)"), editor)
-class Saffire_Dice(QtGui.QWidget):
+class Saffire_Dice(Generic_Dice_EAP):
def __init__(self, parent=None):
- QtGui.QWidget.__init__(self, parent)
- self.layout = QtGui.QGridLayout(self)
- self.setLayout(self.layout)
- self.tabs = QtGui.QTabWidget(self)
- self.layout.addWidget(self.tabs)
+ Generic_Dice_EAP.__init__(self, parent)
def buildMixer(self):
#print self.hw
#print self.hw.getText("/Generic/Nickname")
- self.matrix = MatrixMixer(self.hw.servername, self.hw.basepath+"/EAP/MatrixMixer", self)
- scrollarea = QtGui.QScrollArea(self.tabs)
- scrollarea.setWidgetResizable(True)
- scrollarea.setWidget(self.matrix)
- self.tabs.addTab(scrollarea, "Matrix")
-
- self.router = CrossbarRouter(self.hw.servername, self.hw.basepath+"/EAP/Router", self)
- scrollarea = QtGui.QScrollArea(self.tabs)
- scrollarea.setWidgetResizable(True)
- scrollarea.setWidget(self.router)
- self.tabs.addTab(scrollarea, "Routing")
+ Generic_Dice_EAP.buildMixer(self)
model = MonitoringModel(self.hw, self)
@@ -243,4 +230,5 @@
if self.configrom.getModelName() == "SAFFIRE_PRO_24":
+ widget.stacked.setCurrentWidget(widget.pagePro24)
self.ch1inst = BooleanControl(self.hw, self.hw.basepath + "/EAP/Ch1LineInst")
widget.chkInst1.setChecked(self.ch1inst.selected())
@@ -255,11 +243,14 @@
widget.chkLevel4.setChecked(self.ch4level.selected())
self.connect(widget.chkLevel4, QtCore.SIGNAL("toggled(bool)"), self.ch4level.select)
- widget.chkSpdif.deleteLater()
- widget.btnPad.deleteLater()
- else:
- widget.chkInst1.deleteLater()
- widget.chkInst2.deleteLater()
- widget.chkLevel3.deleteLater()
- widget.chkLevel4.deleteLater()
+ #widget.chkSpdif.deleteLater()
+ #widget.btnPad.deleteLater()
+ elif self.configrom.getModelName() == "SAFFIRE_PRO_40":
+ widget.stacked.setCurrentWidget(widget.pagePro40)
+ #widget.chkInst1.deleteLater()
+ #widget.chkInst2.deleteLater()
+ #widget.chkLevel3.deleteLater()
+ #widget.chkLevel4.deleteLater()
+ else:
+ self.stacked.deleteLater()
Index: /trunk/libffado/support/mixer-qt4/ffado/widgets/crossbarrouter.py
===================================================================
--- /trunk/libffado/support/mixer-qt4/ffado/widgets/crossbarrouter.py (revision 1780)
+++ /trunk/libffado/support/mixer-qt4/ffado/widgets/crossbarrouter.py (revision 1796)
@@ -71,4 +71,5 @@
self.lbl = QtGui.QLabel(self.outname, self)
+ self.lbl.setToolTip("The name of the destination that is to be controlled here.")
self.layout.addWidget(self.lbl, 0, 0)
@@ -79,4 +80,5 @@
self.combo = QtGui.QComboBox(self)
+ self.combo.setToolTip("Select the source for this destination.
Each destination can only receive sound from one source at a time. But one source can send sound to multiple destinations.")
self.layout.addWidget(self.combo, 1, 0, 1, 2)
self.combo.addItem("Disconnected")