Changeset 1217

Timestamp:

05/25/08 07:43:32 (15 years ago)

Author:

ppalmers

Message:

merge libffado-2.0 changes r1213:1216 to trunk (svn merge -r 1213:HEAD svn+ssh://ffadosvn@ffado.org/ffado/branches/libffado-2.0)

Files:

• trunk/libffado/src/ffadodevice.cpp (modified) (1 diff)
• trunk/libffado/src/libcontrol/ClockSelect.cpp (modified) (1 diff)
• trunk/libffado/src/libcontrol/ClockSelect.h (modified) (1 diff)
• trunk/libffado/support/mixer/ffadomixer.in (modified) (4 diffs)
• trunk/libffado/support/mixer/mixer_saffire.py (modified) (1 diff)
• trunk/libffado/support/mixer/mixer_saffire.ui (modified) (1 diff)
• trunk/libffado/support/mixer/mixer_saffirele.py (modified) (1 diff)
• trunk/libffado/support/mixer/mixer_saffirele.ui (deleted)
• trunk/libffado/support/mixer/mixer_saffirelelarge.ui (copied) (copied from branches/libffado-2.0/support/mixer/mixer_saffirelelarge.ui)
• trunk/libffado/support/mixer/mixer_saffirelesmall.ui (copied) (copied from branches/libffado-2.0/support/mixer/mixer_saffirelesmall.ui)
• trunk/libffado/support/mixer/mixer_saffirepro.py (modified) (2 diffs)
• trunk/libffado/support/mixer/mixer_saffirepro.ui (deleted)
• trunk/libffado/support/mixer/mixer_saffireprolarge.ui (copied) (copied from branches/libffado-2.0/support/mixer/mixer_saffireprolarge.ui)
• trunk/libffado/support/mixer/mixer_saffireprosmall.ui (copied) (copied from branches/libffado-2.0/support/mixer/mixer_saffireprosmall.ui)
• trunk/libffado/support/mixer/mixer_saffire_base.py (copied) (copied from branches/libffado-2.0/support/mixer/mixer_saffire_base.py)
• trunk/libffado/support/mixer/SConscript (modified) (1 diff)

trunk/libffado/src/ffadodevice.cpp

@@ -65 +65 @@
-        if(!m_genericContainer->addElement(new Control::ClockSelect(*this))) {
-            debugWarning("failed to add clock source control to container\n");
+        }
+        // add a generic control for the sample rate selection
+        if(!m_genericContainer->addElement(new Control::SamplerateSelect(*this))) {
+            debugWarning("failed to add sample rate control to container\n");
-        }
-        // add a generic control for the nickname

trunk/libffado/src/libcontrol/ClockSelect.cpp

@@ -170 +170 @@
-}
-
+// --- samplerate selection ---
+
+SamplerateSelect::SamplerateSelect(FFADODevice &d)
+: Discrete(&d)
+, m_Device( d )
+{
+    setName("SamplerateSelect");
+    setLabel("Samplerate Select");
+    setDescription("Select the device sample rate");
+}
+
+bool
+SamplerateSelect::setValue(int v)
+{
+    return m_Device.setSamplingFrequency(v);
+}
+
+int
+SamplerateSelect::getValue()
+{
+    return m_Device.getSamplingFrequency();
+}
+
+bool
+SamplerateSelect::setValue(int idx, int v)
+{
+    return m_Device.setSamplingFrequency(v);
+}
+
+int
+SamplerateSelect::getValue(int idx)
+{
+    return m_Device.getSamplingFrequency();
+}
+
+int
+SamplerateSelect::getMinimum()
+{
+    return 32000;
+}
+
+int
+SamplerateSelect::getMaximum()
+{
+    return 192000;
+}
+
-} // namespace Control

trunk/libffado/src/libcontrol/ClockSelect.h

@@ -64 +64 @@
-};
-
+/*!
+@brief Samplerate selection control element
+@note this is a workaround and should be done more elegant
+*/
+class SamplerateSelect
+: public Discrete
+{
+public:
+    SamplerateSelect(FFADODevice &);
+    virtual ~SamplerateSelect() {};
+
+    virtual bool setValue(int v);
+    virtual int getValue();
+    virtual bool setValue(int idx, int v);
+    virtual int getValue(int idx);
+
+    virtual int getMinimum();
+    virtual int getMaximum();
+protected:
+    FFADODevice &m_Device;
+};
+
-}; // namespace Control
-

trunk/libffado/support/mixer/ffadomixer.in

@@ -40 +40 @@
-from mixer_phase88 import *
-from mixer_phase24 import *
-from mixer_saffirepro import *
-from mixer_saffire import *
-from mixer_saffirele import *
+from mixer_saffirepro import *
-from mixer_af2 import *
-from mixer_bcoaudio5 import *
@@ -368 +368 @@
-        l = QVBoxLayout( w )
-
+        # create a control object
+        hw = ControlInterface(server, basepath+'/DeviceManager/'+path)
+
-        #
-        # Generic elements for all mixers follow here:
-        #
-
-        tmp = GlobalMixer( w )
-        tmp.clockselect = ClockSelectInterface( server, basepath+"/DeviceManager/"+path )
-        tmp.nickname = TextInterface( server, basepath+"/DeviceManager/"+path+"/Generic/Nickname" )
+        tmp.hw = hw
-        tmp.initValues()
-        l.addWidget( tmp, 1 )
@@ -388 +391 @@
-        if dev != None:
-            mixerapp = dev[1]
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    mixerapp = "SaffireMixer"
-                else:
-                    mixerapp = "SaffireLEMixer"
-
-            exec( "mixerwidget = "+mixerapp+"( w )" )
@@ -407 +453 @@
-        #
-        l.addWidget( mixerwidget, 10 )
-ControlInterface(server, basepath+'/DeviceManager/'+path)
+hw
-        mixerwidget.configrom = cfgrom
-        mixerwidget.clockselect = ClockSelectInterface(server, basepath+'/DeviceManager/'+path)

trunk/libffado/support/mixer/mixer_saffire.py

@@ -22 +22 @@
-
-from qt import *
-
+
+
-
-
+, SaffireMixerBase
-    def __init__(self,parent = None,name = None,fl = 0):
-        SaffireMixerUI.__init__(self,parent,name,fl)
+        SaffireMixerBase.__init__(self)
-
-    def init(self):
-    print "Init
+print "Init large
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    
-    
-    
-    
-    
-    
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
-
-    def initValues(self):
-        for ctrl, info in self.VolumeControls.iteritems():
-            vol = self.hw.getMatrixMixerValue(self.VolumeControls[ctrl][0],
-                                              self.VolumeControls[ctrl][1],
-                                              self.VolumeControls[ctrl][2])
-
-            print "%s volume is %d" % (ctrl.name() , 0x7FFF-vol)
-            ctrl.setValue(0x7FFF-vol)
-
-            # connect the UI element
-            QObject.connect(ctrl,SIGNAL('valueChanged(int)'),self.updateMatrixVolume)
-
-        for ctrl, info in self.VolumeControlsLowRes.iteritems():
-            vol = self.hw.getDiscrete(self.VolumeControlsLowRes[ctrl][0])
-
-            print "%s volume is %d" % (ctrl.name() , vol)
-            ctrl.setValue(vol)
-
-            # connect the UI element
-            QObject.connect(ctrl,SIGNAL('valueChanged(int)'),self.updateLowResVolume)
-
-        for ctrl, info in self.SelectorControls.iteritems():
-            state = self.hw.getDiscrete(self.SelectorControls[ctrl][0])
-            print "%s state is %d" % (ctrl.name() , state)
-            if state:
-                ctrl.setChecked(True)
-            else:
-                ctrl.setChecked(False)
-
-            # connect the UI element
-            QObject.connect(ctrl,SIGNAL('stateChanged(int)'),self.updateSelector)
-
-        self.initClockSelector()
-        # connect the clock selector UI element
-        QObject.connect(self.comboClockSelect, SIGNAL('activated(int)'), self.updateClockSelection)

trunk/libffado/support/mixer/mixer_saffire.ui

@@ -2473 +2473 @@
-            </widget>
-        </widget>
-        <widget class="QGroupBox" row="1" column="1">
-            <property name="name">
-                <cstring>groupBox1_3</cstring>
-            </property>
-            <property name="title">
-                <string>Clock Source</string>
-            </property>
-            <grid>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QComboBox" row="0" column="0">
-                    <property name="name">
-                        <cstring>comboClockSelect</cstring>
-                    </property>
-                </widget>
-            </grid>
-        </widget>
-        <widget class="QGroupBox" row="1" column="0">
-            <property name="name">

trunk/libffado/support/mixer/mixer_saffirele.py

@@ -22 +22 @@
-
-from qt import *
-
-
-
+
+
+
+
+
-    def __init__(self,parent = None,name = None,fl = 0):
-
+
+
-
-    def init(self):
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    def updateMatrixVolume(self,a0):
-
-
-
-
-
-
-
-
-
-
-
+
-    def updateLowResVolume(self,a0):
-
-
-
-
-
-
-
+
-    def updateSelector(self,a0):
-
-
-
-
-
-
-
-
-
-
+
-    def triggerButton(self):
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/libffado/support/mixer/mixer_saffirepro.py

@@ -22 +22 @@
-
-from qt import *
-
-
-
+
+
+
+
+
-    def __init__(self,parent = None,name = None,fl = 0):
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-    def init(self):
-
+large 
-
-            self.VolumeControls={
@@ -223 +179 @@
-            self.TextControls={
-            }
+
-            self.saveTextControls={
-            }
-
+            self.ComboControls={
+                self.comboStandalone:        ['/Control/StandaloneConfig'],
+            }
+
+    def updateMatrixVolume(self,a0):
+        SaffireMixerBase.updateMatrixVolume(self,a0)
+    def updateLowResVolume(self,a0):
+        SaffireMixerBase.updateLowResVolume(self,a0)
+    def updateSelector(self,a0):
+        SaffireMixerBase.updateSelector(self,a0)
+    def triggerButton(self):
+        SaffireMixerBase.triggerButton(self)
+    def saveText(self):
+        SaffireMixerBase.saveText(self)
+    def initCombo(self, combo):
+        SaffireMixerBase.initCombo(self,combo)
+    def selectCombo(self, mode):
+        SaffireMixerBase.selectCombo(self,mode)
+
-    def updateValues(self):
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-            if state:
-
+
+
-            else:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/libffado/support/mixer/SConscript

@@ -30 +30 @@
-    e = env.Clone()
-
-
-
+
+
+
+
+
-                       'mackie_generic', 'quatafire', 'motu',
-                       'global', 'dummy'