Index: /trunk/libffado/support/mixer/mixer_edirolfa101.ui
===================================================================
--- /trunk/libffado/support/mixer/mixer_edirolfa101.ui (revision 1326)
+++ /trunk/libffado/support/mixer/mixer_edirolfa101.ui (revision 1328)
@@ -26,5 +26,5 @@
0
0
- 276
+ 521
161
@@ -66,16 +66,16 @@
- textLabel12
-
-
- 1/2
-
-
- AlignCenter
-
-
-
-
- sldInput12
+ textLabel1
+
+
+ 1
+
+
+ AlignCenter
+
+
+
+
+ sldInput1
@@ -115,5 +115,69 @@
- 60
+ 40
+ 20
+
+
+
+
+
+ layout6
+
+
+
+ unnamed
+
+
+
+ textLabel2
+
+
+ 2
+
+
+ AlignCenter
+
+
+
+
+ sldInput2
+
+
+ 0
+
+
+ 32767
+
+
+ 10000
+
+
+ 1000
+
+
+ Vertical
+
+
+ Both
+
+
+ 10000
+
+
+
+
+
+
+ spacer16_2
+
+
+ Horizontal
+
+
+ Expanding
+
+
+
+ 40
20
@@ -130,54 +194,118 @@
- textLabel34
-
-
- 3/4
-
-
- AlignCenter
-
-
-
-
- sldInput34
-
-
- 0
-
-
- 32767
-
-
- 10000
-
-
- 1000
-
-
- Vertical
-
-
- Both
-
-
- 10000
-
-
-
-
-
-
- spacer17
-
-
- Horizontal
-
-
- Expanding
-
-
-
- 60
+ textLabel3
+
+
+ 3
+
+
+ AlignCenter
+
+
+
+
+ sldInput3
+
+
+ 0
+
+
+ 32767
+
+
+ 10000
+
+
+ 1000
+
+
+ Vertical
+
+
+ Both
+
+
+ 10000
+
+
+
+
+
+
+ spacer16_3
+
+
+ Horizontal
+
+
+ Expanding
+
+
+
+ 40
+ 20
+
+
+
+
+
+ layout7
+
+
+
+ unnamed
+
+
+
+ textLabel4
+
+
+ 4
+
+
+ AlignCenter
+
+
+
+
+ sldInput4
+
+
+ 0
+
+
+ 32767
+
+
+ 10000
+
+
+ 1000
+
+
+ Vertical
+
+
+ Both
+
+
+ 10000
+
+
+
+
+
+
+ spacer16_4
+
+
+ Horizontal
+
+
+ Expanding
+
+
+
+ 40
20
@@ -194,16 +322,16 @@
- textLabel56
-
-
- 5/6
-
-
- AlignCenter
-
-
-
-
- sldInput56
+ textLabel5
+
+
+ 5
+
+
+ AlignCenter
+
+
+
+
+ sldInput5
@@ -239,15 +367,79 @@
- spacer17_3
-
-
- Horizontal
-
-
- Expanding
-
-
-
- 60
+ spacer16_5
+
+
+ Horizontal
+
+
+ Expanding
+
+
+
+ 40
+ 20
+
+
+
+
+
+ layout8
+
+
+
+ unnamed
+
+
+
+ textLabel6
+
+
+ 6
+
+
+ AlignCenter
+
+
+
+
+ sldInput6
+
+
+ 0
+
+
+ 32767
+
+
+ 10000
+
+
+ 1000
+
+
+ Vertical
+
+
+ Both
+
+
+ 10000
+
+
+
+
+
+
+ spacer16_6
+
+
+ Horizontal
+
+
+ Expanding
+
+
+
+ 40
20
@@ -264,16 +456,16 @@
- textLabel78
-
-
- 7/8
-
-
- AlignCenter
-
-
-
-
- sldInput78
+ textLabel7
+
+
+ 7
+
+
+ AlignCenter
+
+
+
+
+ sldInput7
@@ -309,15 +501,79 @@
- spacer17_2
-
-
- Horizontal
-
-
- Expanding
-
-
-
- 60
+ spacer16_7
+
+
+ Horizontal
+
+
+ Expanding
+
+
+
+ 40
+ 20
+
+
+
+
+
+ layout9
+
+
+
+ unnamed
+
+
+
+ textLabel8
+
+
+ 8
+
+
+ AlignCenter
+
+
+
+
+ sldInput8
+
+
+ 0
+
+
+ 32767
+
+
+ 10000
+
+
+ 1000
+
+
+ Vertical
+
+
+ Both
+
+
+ 10000
+
+
+
+
+
+
+ spacer16_8
+
+
+ Horizontal
+
+
+ Expanding
+
+
+
+ 40
20
@@ -334,16 +590,16 @@
- textLabel910
-
-
- 9/10
-
-
- AlignCenter
-
-
-
-
- sldInput910
+ textLabel9
+
+
+ 9
+
+
+ AlignCenter
+
+
+
+
+ sldInput9
@@ -377,4 +633,68 @@
+
+
+ spacer16_9
+
+
+ Horizontal
+
+
+ Expanding
+
+
+
+ 40
+ 20
+
+
+
+
+
+ layout10
+
+
+
+ unnamed
+
+
+
+ textLabel10
+
+
+ 10
+
+
+ AlignCenter
+
+
+
+
+ sldInput10
+
+
+ 0
+
+
+ 32767
+
+
+ 10000
+
+
+ 1000
+
+
+ Vertical
+
+
+ Both
+
+
+ 10000
+
+
+
+
@@ -383,32 +703,62 @@
- sldInput12
- sliderMoved(int)
- EdirolFa101ControlUI
- setVolumeIn12(int)
-
-
- sldInput34
- sliderMoved(int)
- EdirolFa101ControlUI
- setVolumeIn34(int)
-
-
- sldInput56
- sliderMoved(int)
- EdirolFa101ControlUI
- setVolumeIn56(int)
-
-
- sldInput78
- sliderMoved(int)
- EdirolFa101ControlUI
- setVolumeIn78(int)
-
-
- sldInput910
- sliderMoved(int)
- EdirolFa101ControlUI
- setVolumeIn910(int)
+ sldInput1
+ sliderMoved(int)
+ EdirolFa101ControlUI
+ setVolumeIn1(int)
+
+
+ sldInput2
+ sliderMoved(int)
+ EdirolFa101ControlUI
+ setVolumeIn2(int)
+
+
+ sldInput3
+ sliderMoved(int)
+ EdirolFa101ControlUI
+ setVolumeIn3(int)
+
+
+ sldInput4
+ sliderMoved(int)
+ EdirolFa101ControlUI
+ setVolumeIn4(int)
+
+
+ sldInput5
+ sliderMoved(int)
+ EdirolFa101ControlUI
+ setVolumeIn5(int)
+
+
+ sldInput6
+ sliderMoved(int)
+ EdirolFa101ControlUI
+ setVolumeIn6(int)
+
+
+ sldInput7
+ sliderMoved(int)
+ EdirolFa101ControlUI
+ setVolumeIn7(int)
+
+
+ sldInput8
+ sliderMoved(int)
+ EdirolFa101ControlUI
+ setVolumeIn8(int)
+
+
+ sldInput9
+ sliderMoved(int)
+ EdirolFa101ControlUI
+ setVolumeIn9(int)
+
+
+ sldInput10
+ sliderMoved(int)
+ EdirolFa101ControlUI
+ setVolumeIn10(int)
@@ -419,9 +769,14 @@
init()
initValues()
- setVolumeIn12( int )
- setVolumeIn34( int )
- setVolumeIn56( int )
- setVolumeIn910( int )
- setVolumeIn78( int )
+ setVolumeIn6( int )
+ setVolumeIn7( int )
+ setVolumeIn8( int )
+ setVolumeIn9( int )
+ setVolumeIn10( int )
+ setVolumeIn1(int)
+ setVolumeIn2(int)
+ setVolumeIn3(int)
+ setVolumeIn4(int)
+ setVolumeIn5(int)
Index: /trunk/libffado/support/mixer/mixer_edirolfa66.py
===================================================================
--- /trunk/libffado/support/mixer/mixer_edirolfa66.py (revision 1106)
+++ /trunk/libffado/support/mixer/mixer_edirolfa66.py (revision 1328)
@@ -26,36 +26,49 @@
class EdirolFa66Control(EdirolFa66ControlUI):
def __init__(self,parent = None,name = None,fl = 0):
- EdirolFa66ControlUI.__init__(self,parent,name,fl)
+ EdirolFa66ControlUI.__init__(self, parent, name, fl)
- def setComboMixSource(self,a0):
+ def setComboMixSource(self, a0):
self.setSelector('line34source', a0)
- def setVolumeIn12(self,a0):
- self.setVolume('line12', a0)
+ def setVolumeIn1(self, vol):
+ self.setVolume('in1', vol)
- def setVolumeIn34(self,a0):
- self.setVolume('line34', a0)
+ def setVolumeIn2(self, vol):
+ self.setVolume('in2', vol)
- def setVolumeIn56(self,a0):
- self.setVolume('spdif', a0)
+ def setVolumeIn3(self, vol):
+ self.setVolume('in3', vol)
- def setVolume(self,a0,a1):
- name = a0
- vol = -a1
+ def setVolumeIn4(self, vol):
+ self.setVolume('in4', vol)
+
+ def setVolumeIn5(self, vol):
+ self.setVolume('in5', vol)
+
+ def setVolumeIn6(self, vol):
+ self.setVolume('in6', vol)
+
+ def setVolume(self, name, vol):
+ vol = -vol
+ ctrl = self.VolumeControls[name]
print "setting %s volume to %d" % (name, vol)
- self.hw.setContignuous(self.VolumeControls[name][0], vol)
+ self.hw.setContignuous(ctrl[0], vol, idx = ctrl[1])
def init(self):
print "Init Edirol FA-66 window"
- self.VolumeControls={
- 'line12' : ['/Mixer/Feature_1', self.sldInput12],
- 'line34' : ['/Mixer/Feature_2', self.sldInput34],
- 'spdif' : ['/Mixer/Feature_3', self.sldInput56],
+ self.VolumeControls = {
+ # feature name, channel, qt slider
+ 'in1' : ['/Mixer/Feature_1', 1, self.sldInput1],
+ 'in2' : ['/Mixer/Feature_1', 2, self.sldInput2],
+ 'in3' : ['/Mixer/Feature_2', 1, self.sldInput3],
+ 'in4' : ['/Mixer/Feature_2', 2, self.sldInput4],
+ 'in5' : ['/Mixer/Feature_3', 1, self.sldInput5],
+ 'in6' : ['/Mixer/Feature_3', 2, self.sldInput6],
}
def initValues(self):
for name, ctrl in self.VolumeControls.iteritems():
- vol = self.hw.getContignuous(ctrl[0])
+ vol = self.hw.getContignuous(ctrl[0], idx = ctrl[1])
print "%s volume is %d" % (name , vol)
- ctrl[1].setValue(-vol)
+ ctrl[2].setValue(-vol)
Index: /trunk/libffado/support/mixer/mixer_edirolfa66.ui
===================================================================
--- /trunk/libffado/support/mixer/mixer_edirolfa66.ui (revision 1326)
+++ /trunk/libffado/support/mixer/mixer_edirolfa66.ui (revision 1328)
@@ -26,5 +26,5 @@
0
0
- 180
+ 325
161
@@ -33,5 +33,5 @@
Edirol FA-66
-
+
unnamed
@@ -50,24 +50,24 @@
- layout46
-
-
-
- unnamed
-
-
-
- textLabel12
-
-
- 1/2
-
-
- AlignCenter
-
-
-
-
- sldInput12
+ layout14
+
+
+
+ unnamed
+
+
+
+ textLabel1
+
+
+ 1
+
+
+ AlignCenter
+
+
+
+
+ sldInput1
@@ -97,5 +97,5 @@
- spacer16
+ spacer16_2_2
@@ -107,5 +107,5 @@
- 60
+ 40
20
@@ -114,24 +114,24 @@
- layout47
-
-
-
- unnamed
-
-
-
- textLabel34
-
-
- 3/4
-
-
- AlignCenter
-
-
-
-
- sldInput34
+ layout16
+
+
+
+ unnamed
+
+
+
+ textLabel2
+
+
+ 2
+
+
+ AlignCenter
+
+
+
+
+ sldInput2
@@ -161,5 +161,5 @@
- spacer17
+ spacer16
@@ -171,5 +171,5 @@
- 60
+ 40
20
@@ -178,24 +178,216 @@
- layout48
-
-
-
- unnamed
-
-
-
- textLabel56
-
-
- 5/6
-
-
- AlignCenter
-
-
-
-
- sldInput56
+ layout17
+
+
+
+ unnamed
+
+
+
+ textLabel3
+
+
+ 3
+
+
+ AlignCenter
+
+
+
+
+ sldInput3
+
+
+ 0
+
+
+ 32767
+
+
+ 10000
+
+
+ 1000
+
+
+ Vertical
+
+
+ Both
+
+
+ 10000
+
+
+
+
+
+
+ spacer16_2_3
+
+
+ Horizontal
+
+
+ Expanding
+
+
+
+ 40
+ 20
+
+
+
+
+
+ layout18
+
+
+
+ unnamed
+
+
+
+ textLabel4
+
+
+ 4
+
+
+ AlignCenter
+
+
+
+
+ sldInput4
+
+
+ 0
+
+
+ 32767
+
+
+ 10000
+
+
+ 1000
+
+
+ Vertical
+
+
+ Both
+
+
+ 10000
+
+
+
+
+
+
+ spacer16_2
+
+
+ Horizontal
+
+
+ Expanding
+
+
+
+ 40
+ 20
+
+
+
+
+
+ layout19
+
+
+
+ unnamed
+
+
+
+ textLabel5
+
+
+ 5
+
+
+ AlignCenter
+
+
+
+
+ sldInput5
+
+
+ 0
+
+
+ 32767
+
+
+ 10000
+
+
+ 1000
+
+
+ Vertical
+
+
+ Both
+
+
+ 10000
+
+
+
+
+
+
+ spacer16_2_4
+
+
+ Horizontal
+
+
+ Expanding
+
+
+
+ 40
+ 20
+
+
+
+
+
+ layout20
+
+
+
+ unnamed
+
+
+
+ textLabel6
+
+
+ 6
+
+
+ AlignCenter
+
+
+
+
+ sldInput6
@@ -231,32 +423,56 @@
-
+
- sldInput12
- sliderMoved(int)
- EdirolFa66ControlUI
- setVolumeIn12(int)
-
-
- sldInput34
- sliderMoved(int)
- EdirolFa66ControlUI
- setVolumeIn34(int)
-
-
- sldInput56
- sliderMoved(int)
- EdirolFa66ControlUI
- setVolumeIn56(int)
+ sldInput1
+ sliderMoved(int)
+ EdirolFa66ControlUI
+ setVolumeIn1(int)
+
+
+ sldInput2
+ sliderMoved(int)
+ EdirolFa66ControlUI
+ setVolumeIn2(int)
+
+
+ sldInput3
+ sliderMoved(int)
+ EdirolFa66ControlUI
+ setVolumeIn3(int)
+
+
+ sldInput4
+ sliderMoved(int)
+ EdirolFa66ControlUI
+ setVolumeIn4(int)
+
+
+ sldInput5
+ sliderMoved(int)
+ EdirolFa66ControlUI
+ setVolumeIn5(int)
+
+
+ sldInput6
+ sliderMoved(int)
+ EdirolFa66ControlUI
+ setVolumeIn6(int)
+
+ mixer_edirolfa66.ui.h
+
+ setVolumeIn2( int )
+ initValues()
+ setVolumeIn1( int )
+ setVolumeIn3( int )
+ setVolumeIn4( int )
+ setVolumeIn5( int )
+ setVolumeIn6( int )
init()
- initValues()
- setVolumeIn12( int )
- setVolumeIn34( int )
- setVolumeIn56( int )
Index: /trunk/libffado/support/mixer/mixer_edirolfa101.py
===================================================================
--- /trunk/libffado/support/mixer/mixer_edirolfa101.py (revision 1326)
+++ /trunk/libffado/support/mixer/mixer_edirolfa101.py (revision 1328)
@@ -25,45 +25,63 @@
class EdirolFa101Control(EdirolFa101ControlUI):
- def __init__(self,parent = None,name = None,fl = 0):
- EdirolFa101ControlUI.__init__(self,parent,name,fl)
+ def __init__(self, parent = None, name = None, fl = 0):
+ EdirolFa101ControlUI.__init__(self, parent, name, fl)
- def setComboMixSource(self,a0):
- self.setSelector('line34source', a0)
+ def setVolumeIn1(self, vol):
+ self.setVolume('in1', vol)
- def setVolumeIn12(self,a0):
- self.setVolume('line12', a0)
+ def setVolumeIn2(self, vol):
+ self.setVolume('in2', vol)
- def setVolumeIn34(self,a0):
- self.setVolume('line34', a0)
+ def setVolumeIn3(self, vol):
+ self.setVolume('in3', vol)
- def setVolumeIn56(self,a0):
- self.setVolume('line56', a0)
+ def setVolumeIn4(self, vol):
+ self.setVolume('in4', vol)
- def setVolumeIn78(self,a0):
- self.setVolume('line78', a0)
+ def setVolumeIn5(self, vol):
+ self.setVolume('in5', vol)
- def setVolumeIn910(self,a0):
- self.setVolume('spdif', a0)
+ def setVolumeIn6(self, vol):
+ self.setVolume('in6', vol)
- def setVolume(self,a0,a1):
- name = a0
- vol = -a1
+ def setVolumeIn7(self, vol):
+ self.setVolume('in7', vol)
+
+ def setVolumeIn8(self, vol):
+ self.setVolume('in8', vol)
+
+ def setVolumeIn9(self, vol):
+ self.setVolume('in9', vol)
+
+ def setVolumeIn10(self,vol):
+ self.setVolume('in10', vol)
+
+ def setVolume(self, name, vol):
+ vol = -vol
+ ctrl = self.VolumeControls[name]
print "setting %s volume to %d" % (name, vol)
- self.hw.setContignuous(self.VolumeControls[name][0], vol)
+ self.hw.setContignuous(ctrl[0], vol, idx = ctrl[1])
def init(self):
print "Init Edirol FA-101 window"
- self.VolumeControls={
- 'line12' : ['/Mixer/Feature_5', self.sldInput12],
- 'line34' : ['/Mixer/Feature_1', self.sldInput34],
- 'line56' : ['/Mixer/Feature_2', self.sldInput56],
- 'line78' : ['/Mixer/Feature_3', self.sldInput78],
- 'spdif' : ['/Mixer/Feature_4', self.sldInput910],
+ self.VolumeControls = {
+ # feature name, channel, qt slider
+ 'in1' : ['/Mixer/Feature_5', 1, self.sldInput1],
+ 'in2' : ['/Mixer/Feature_5', 2, self.sldInput2],
+ 'in3' : ['/Mixer/Feature_1', 1, self.sldInput3],
+ 'in4' : ['/Mixer/Feature_1', 2, self.sldInput4],
+ 'in5' : ['/Mixer/Feature_2', 1, self.sldInput5],
+ 'in6' : ['/Mixer/Feature_2', 2, self.sldInput6],
+ 'in7' : ['/Mixer/Feature_3', 1, self.sldInput7],
+ 'in8' : ['/Mixer/Feature_3', 2, self.sldInput8],
+ 'in9' : ['/Mixer/Feature_4', 1, self.sldInput9],
+ 'in10' : ['/Mixer/Feature_4', 2, self.sldInput10],
}
def initValues(self):
for name, ctrl in self.VolumeControls.iteritems():
- vol = self.hw.getContignuous(ctrl[0])
+ vol = self.hw.getContignuous(ctrl[0], idx = ctrl[1])
print "%s volume is %d" % (name , vol)
- ctrl[1].setValue(-vol)
+ ctrl[2].setValue(-vol)