Changeset 367 for trunk

Timestamp:

01/03/07 15:31:25 (16 years ago)

Author:

wagi

Message:

DeviceManager::saveCache: basePath construction fixed for more than one device
DeviceManager::loadCache: likewise

Files:

• trunk/libfreebob/src/devicemanager.cpp (modified) (4 diffs)

trunk/libfreebob/src/devicemanager.cpp

@@ -1 +1 @@
- /* devicemanager.cpp
-
+,07
- *
- * This file is part of FreeBoB.
@@ -34 +34 @@
-
-#include <iostream>
+#include <sstream>
+
-#include <unistd.h>
-
@@ -369 +371 @@
-        BeBoB::AvDevice* pBeBoBDevice = reinterpret_cast< BeBoB::AvDevice* >( pAvDevice );
-        if ( pBeBoBDevice ) {
+            // Let's use a very simple path to find the devices later.
+            // Since under hood there will an xml node name this should
+            // adhere the needed naming rules. Of course we could give it
+            // a good node name and add an attribute but that would mean
+            // we have to expose a bigger interface from IOSerialize/IODesialize,
+            // which is just not needed. KISS.
+            ostringstream strstrm;
+            strstrm << "id" << i;
+            Glib::ustring basePath = "BeBoB/" + strstrm.str() + "/";
+
-            Util::XMLSerialize ser( fileName );
-std::string idx = "id" + i
-
+pBeBoBDevice->serialize( basePath, ser )
+
-            i++;
-            pBeBoBDevice->serialize( basePath, ser );
-            std::cout << "a bebob device serialized" << std::endl;
-            return true;
-        }
-    }
@@ -413 +423 @@
-
-    do {
-
+
+
-        pBeBoBDevice = BeBoB::AvDevice::deserialize(
-idx
+strstrm.str()
-            *m_1394Service,
-            deser );