Changeset 525

Timestamp:

08/19/07 16:02:18 (16 years ago)

Author:

jwoithe

Message:

The new device cache code breaks things for non-AVC interfaces such as the MOTU. Make certain that the cache code (which uses AVC commands) is only used by BeBoB devices. The solution in this patch may need revisiting but at least it restores functionality for now.

Files:

• trunk/libffado/src/devicemanager.cpp (modified) (2 diffs)

trunk/libffado/src/devicemanager.cpp

@@ -538 +538 @@
-        return true;
-    }
+    // FIXME: the above test doesn't have the desired effect - MOTU devices
+    // are still allowed to proceed.  Therefore for the moment include a
+    // further check.
+    // If the device isn't a BeBoB device we can't assume it will accept AVC
+    // commands (for example, trying to send AVC commands to a MOTU via
+    // libiec61883 gives an endless stream of "send oops" messages). 
+    // Therefore only proceed if the device is a known BeBoB device.
+    if (!BeBoB::AvDevice::probe(pAvDevice->getConfigRom())) {
+        return true;
+    }
-
-    // the path looks like this:
@@ -576 +586 @@
-    Glib::ustring sDevicePath = getCachePath() + configRom.getGuidString();
-    char* configId;
+    // If the device isn't a BeBoB device we can't assume it will accept AVC
+    // commands (for example, trying to send AVC commands to a MOTU via
+    // libiec61883 gives an endless stream of "send oops" messages). 
+    // Therefore only proceed if the device is a known BeBoB device.
+    if (!BeBoB::AvDevice::probe((ConfigRom&)configRom)) {
+        return false;
+    }
-    asprintf(&configId, "%08x",
-    BeBoB::AvDevice::getConfigurationId(*m_1394Service,