Changeset 1549

Timestamp:

05/09/09 10:42:57 (14 years ago)

Author:

ppalmers

Message:

fixes #221, #219

Files:

• branches/libffado-2.0/src/devicemanager.cpp (modified) (1 diff)

branches/libffado-2.0/src/devicemanager.cpp

@@ -645 +645 @@
-        sort(m_avDevices.begin(), m_avDevices.end(), FFADODevice::compareGUID);
-
-        // first map the devices to a position using the device spec strings
-        std::map<fb_octlet_t, int> positionMap;
-        for ( FFADODeviceVectorIterator it = m_avDevices.begin();
-            it != m_avDevices.end();
-            ++it )
-        {
-            int pos = m_deviceStringParser->matchPosition((*it)->getConfigRom());
-            fb_octlet_t guid = (*it)->getConfigRom().getGuid();
-            positionMap[guid] = pos;
-            debugOutput( DEBUG_LEVEL_VERBOSE, "Mapping %s to position %d...\n", (*it)->getConfigRom().getGuidString().c_str(), pos );
-        }
-
-        // now run over all positions, and add the devices that belong to it
-        FFADODeviceVector sorted;
-        int nbPositions = m_deviceStringParser->countDeviceStrings();
-        int i=0;
-
+
+
+
-            for ( FFADODeviceVectorIterator it = m_avDevices.begin();
-                it != m_avDevices.end();
-                ++it )
-            {
+                int pos = m_deviceStringParser->matchPosition((*it)->getConfigRom());
-                fb_octlet_t guid = (*it)->getConfigRom().getGuid();
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-            }
-}
-
-// assign the new vector
-assert(sorted.size() == m_avDevices.size())
-m_avDevices = sorted;
+    // assign the new vector
+
+    assert(sorted.size() == m_avDevices.size());
+    m_avDevices = sorted
+}
-
-        // set device id's