Changeset 678

Timestamp:

11/01/07 14:27:55 (15 years ago)

Author:

ppalmers

Message:

Fix bug where the internal data structures of the AVC::Unit were not cleared before discovery. This
prevented devices from being re-discovered since all old structures remained (e.g. all of a sudden
there are 2 music subunits)

Files:

• trunk/libffado/src/libavc/general/avc_unit.cpp (modified) (2 diffs)
• trunk/libffado/src/libavc/general/avc_unit.h (modified) (1 diff)

trunk/libffado/src/libavc/general/avc_unit.cpp

@@ -56 +56 @@
-Unit::~Unit()
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -139 +116 @@
-}
-
+// prepare the device for a rediscovery
+bool
+Unit::clean()
+{
+    for ( SubunitVector::iterator it = m_subunits.begin();
+          it != m_subunits.end();
+          ++it )
+    {
+        delete *it;
+    }
+    m_subunits.clear();
+
+    for ( PlugVector::iterator it = m_pcrPlugs.begin();
+          it != m_pcrPlugs.end();
+          ++it )
+    {
+        delete *it;
+    }
+    m_pcrPlugs.clear();
+
+    for ( PlugVector::iterator it = m_externalPlugs.begin();
+          it != m_externalPlugs.end();
+          ++it )
+    {
+        delete *it;
+    }
+    m_externalPlugs.clear();
+
+    for ( PlugConnectionVector::iterator it = m_plugConnections.begin();
+          it != m_plugConnections.end();
+          ++it )
+    {
+        delete *it;
+    }
+    m_plugConnections.clear();
+
+    delete m_pPlugManager;
+    m_pPlugManager = new PlugManager();
+
+    if (m_pPlugManager == NULL) {
+        debugError("Could not create new plugmanager");
+        return false;
+    }
+
+    m_syncInfos.clear();
+
+    m_activeSyncInfo = NULL;
+
+    return true;
+}
+
-bool
-Unit::discover()
-{
+
+    if( !clean() ) {
+        debugError( "Could not clean unit data structures\n" );
+        return false;
+    }
-
-    if ( !enumerateSubUnits() ) {

trunk/libffado/src/libavc/general/avc_unit.h

@@ -117 +117 @@
-
-protected:
+    /// cleans the internal data structures that are created by discovery
+    virtual bool clean();
-
-    virtual bool enumerateSubUnits();