Changeset 1311

Timestamp:

08/17/08 16:37:25 (5 months ago)

Author:

jwoithe

Message:

MOTU: make mix2, mix3 and mix4 mixers fully functional by removing commented out code used during development.

Files:

• branches/libffado-2.0/support/mixer/mixer_motu.py (modified) (4 diffs)

branches/libffado-2.0/support/mixer/mixer_motu.py

@@ -594 +594 @@
-            # Mic input controls displace AES/EBU since no current device
-            # has both.
- 
-#self.mix2_tab.page(1).setTabLabel("Mic 
-#self.mix3_tab.page(1).setTabLabel("Mic 
-#self.mix4_tab.page(1).setTabLabel("Mic 
+
+self.mix2_tab.page(1).setTabLabel("Mic
+self.mix3_tab.page(1).setTabLabel("Mic
+self.mix4_tab.page(1).setTabLabel("Mic
-            # FIXME: when implmented, will mic channels just reuse the AES/EBU
-            # dbus path?  If not we'll have to reset the respective values in
@@ -604 +604 @@
-            if (not(self.has_aesebu_inputs)):
-                self.mix1_tab.page(1).setEnabled(False)
-#
-#
-#
+
+
+
-        if (not(self.has_spdif_inputs)):
-            self.mix1_tab.page(2).setEnabled(False);
-#
-#
-#
+
+
+
-
-        # Devices without AES/EBU inputs/outputs have dedicated "MainOut"
@@ -640 +640 @@
-            self.mix1_tab.page(2).setEnabled(False)  # SPDIF
-            self.mix1_tab.page(1).setEnabled(False)  # AES/EBU
-#
-#
-#
-#
-#
-#
-#
-#
-#
+
+
+
+
+
+
+
+
+
-        if (self.sample_rate > 48000):
-            print "Disabling controls not present above 48 kHz"
@@ -655 +655 @@
-            self.mix1_adat7.setEnabled(False)
-            self.mix1_adat8.setEnabled(False)
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
-#
+
+
+
+
+
+
+
+
+
+
+
+
-
-        # Ensure the correct input controls are active for a given interface