Changeset 1840

Timestamp:

05/27/10 19:08:11 (2 years ago)

Author:

jwoithe

Message:

MOTU: add detection of the Ultralite Mk3 hybrid device (thanks to Tomas R Cantu for providing the ID information for this device).
MOTU: ffado-mixer: don't attempt to support generation-3 devices yet. Log a debug message to this effect.

Files:

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

trunk/libffado/src/motu/motu_avdevice.cpp

@@ -69 +69 @@
-    {FW_VENDORID_MOTU, 0, 0x00000005, 0x000001f2, MOTU_MODEL_896HD, "MOTU", "896HD"},
-    {FW_VENDORID_MOTU, 0, 0x00000015, 0x000001f2, MOTU_MODEL_828mk3, "MOTU", "828Mk3"},
-
+
+
-};
-
@@ -478 +479 @@
-    { Ports_896HD,        N_ELEMENTS( Ports_896HD ),        192000, &Mixer_896HD, NULL, },
-    { Ports_828mk3,       N_ELEMENTS( Ports_828mk3 ),       192000 },
-
+
+
-};
-
@@ -1439 +1441 @@
-        return MOTU_DEVICE_G1;
-    if (m_motu_model==MOTU_MODEL_828mk3 ||
-
+
+
-        return MOTU_DEVICE_G3;
-    return MOTU_DEVICE_G2;

trunk/libffado/src/motu/motu_avdevice.h

@@ -263 +263 @@
-
-enum EMotuModel {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-};
-

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

@@ -30 +30 @@
-
-# Model defines.  These must agree with what is used in motu_avdevice.h.
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-class Motu(QWidget):
@@ -564 +567 @@
-        self.sample_rate = self.hw.getDiscrete('/Mixer/Info/SampleRate')
-        log.debug("device sample rate: %d" % (self.sample_rate))
+
+        # For the moment none of the "Mk3" (aka Generation-3) devices are
+        # supported by ffado-mixer.
+        if (self.model==MOTU_MODEL_828mk3 or self.mode==MOTU_MODEL_ULTRALITEmk3 or self.mode==MOTU_MODEL_ULTRALITEmk3_HYB):
+            log.debug("Generation-3 MOTU devices are not yet supported by ffado-mixer")
+            return
-
-        # The 828Mk2 has separate Mic inputs but no AES/EBU, so use the