Changeset 1837

Timestamp:

05/24/10 05:53:00 (11 years ago)

Author:

jwoithe

Message:

MOTU: 8pre: disable the phones / main fader mixer widgets because these controls are not software controllable on the 8pre and thus aren't accessible via the dbus interface.
MOTU: 8pre: add pad controls to the channel matrix mixers so the ADAT controls show up at the same place in the matrix mixers as they do on other devices. See also r1384 where a similar issue was addressed for the Ultralite.
MOTU: 8pre: add some pad channels to enlarge the 1x rate data packets to the sizes seen under other systems.

Files:

• trunk/libffado/src/motu/motu_avdevice.cpp (modified) (1 diff)
• trunk/libffado/src/motu/motu_mixerdefs.cpp (modified) (1 diff)
• trunk/libffado/support/mixer-qt4/ffado/mixer/motu.py (modified) (1 diff)

trunk/libffado/src/motu/motu_avdevice.cpp

@@ -249 +249 @@
-    {"Phones-L", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 10},
-    {"Phones-R", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ANY, 13},
+    {"Padding1", MOTU_PA_IN | MOTU_PA_RATE_1x|MOTU_PA_OPTICAL_OFF|MOTU_PA_PADDING, 22},
+    {"Padding2", MOTU_PA_IN | MOTU_PA_RATE_1x|MOTU_PA_OPTICAL_OFF|MOTU_PA_PADDING, 25},
-    {"ADAT1", MOTU_PA_IN | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ADAT, 40},
-    {"ADAT1", MOTU_PA_OUT | MOTU_PA_RATE_ANY|MOTU_PA_OPTICAL_ADAT, 22},

trunk/libffado/src/motu/motu_mixerdefs.cpp

@@ -270 +270 @@
-    {"Analog 7", MOTU_CTRL_STD_CHANNEL, 0x0018, },
-    {"Analog 8", MOTU_CTRL_STD_CHANNEL, 0x001c, },
+    //
+    // The Ultralite doesn't include AES/EBU or SPDIF mixer controls, but
+    // "pad" mixer entries are required so the index of the ADAT controls
+    // within the various matrix mixers remain unchanged compared to other
+    // interfaces.  This in turn means the python ffado-mixer code doesn't
+    // have to deal with differing layouts within the matrix mixer controls.
+    {"AES/EBU 1", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, },
+    {"AES/EBU 2", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, },
+    {"SPDIF 1", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, },
+    {"SPDIF 2", MOTU_CTRL_STD_CHANNEL, MOTU_CTRL_NONE, },
+    //
-    {"ADAT 1", MOTU_CTRL_STD_CHANNEL, 0x0020, },
-    {"ADAT 2", MOTU_CTRL_STD_CHANNEL, 0x0024, },

trunk/libffado/support/mixer-qt4/ffado/mixer/motu.py

@@ -632 +632 @@
-            self.optical_in_mode.removeItem(2)
-            self.optical_out_mode.removeItem(2)
+
+        # The 8pre doesn't have software phones/main fader controls
+        if (self.model==MOTU_MODEL_8PRE):
+            self.disable_hide(self.mainout_fader)
+            self.disable_hide(self.phones_fader)
-
-        # Only the 896HD has meter controls