Changeset 371

Timestamp:

01/06/07 04:45:31 (16 years ago)

Author:

wagi

Message:

AvDevice::serialize: m_pcrPlugs and m_externalPlug added to the bed processed
(ongoing)
AvDevice::deserialize: likewise
AvPlug?: started with de/serializing functions (ongoing)

Files:

• trunk/libfreebob/src/bebob/bebob_avdevice.cpp (modified) (2 diffs)
• trunk/libfreebob/src/bebob/bebob_avdevice.h (modified) (1 diff)
• trunk/libfreebob/src/bebob/bebob_avplug.cpp (modified) (2 diffs)
• trunk/libfreebob/src/bebob/bebob_avplug.h (modified) (3 diffs)

trunk/libfreebob/src/bebob/bebob_avdevice.cpp

@@ -1229 +1229 @@
-}
-
+
+template <typename T> bool serializeVector( Glib::ustring path,
+                                            Util::IOSerialize& ser,
+                                            T& vec )
+{
+    bool result = true; // if vec.size() == 0
+    int i = 0;
+    for ( typename T::iterator it = vec.begin(); it != vec.end(); ++it ) {
+        std::ostringstream strstrm;
+        strstrm << path << i;
+        result &= ( *it )->serialize( strstrm.str() + "/", ser );
+        i++;
+    }
+    return result;
+}
+
+template <typename T, typename VT> bool deserializeVector( Glib::ustring path,
+                                                           Util::IODeserialize& deser,
+                                                           Ieee1394Service& ieee1394Service,
+                                                           ConfigRom& configRom,
+                                                           AvPlugManager& plugManager,
+                                                           VT& vec )
+{
+    int i = 0;
+    bool bFinished = false;
+    do {
+        std::ostringstream strstrm;
+        strstrm << path << i;
+        T* ptr = T::deserialize( strstrm.str() + "/",
+                                 deser,
+                                 ieee1394Service,
+                                 configRom,
+                                 plugManager );
+        if ( ptr ) {
+            vec.push_back( ptr );
+            i++;
+        } else {
+            bFinished = true;
+        }
+    } while ( !bFinished );
+
+    return true;
+}
+
-bool
-AvDevice::serialize( Glib::ustring basePath, Util::IOSerialize& ser )
-{
-    bool result;
-
+
+
+
+
+
+
+
-
-    return result;
-}
+
-
-AvDevice*
@@ -1255 +1306 @@
-
-        pDev->m_1394Service = &ieee1394Service;
-
+
+
+
+
+
+
+
-    }
-

trunk/libfreebob/src/bebob/bebob_avdevice.h

@@ -1 +1 @@
-/* bebob_avdevice.h
-
+,07
- *
- * This file is part of FreeBoB.

trunk/libfreebob/src/bebob/bebob_avplug.cpp

@@ -95 +95 @@
-        setDebugLevel( DEBUG_LEVEL_VERBOSE );
-     }
+}
+
+AvPlug::AvPlug()
+    : m_1394Service( 0 )
+    , m_pConfigRom( 0 )
+    , m_subunitType( AVCCommand::eST_Reserved ) // a good value for unknown/undefined?
+    , m_subunitId( 0 )
+    , m_functionBlockType( 0 )
+    , m_functionBlockId( 0 )
+    , m_addressType( eAPA_Undefined )
+    , m_direction( eAPD_Unknown )
+    , m_id( 0 )
+    , m_infoPlugType( eAPT_Unknown )
+    , m_nrOfChannels( 0 )
+    , m_plugManager( 0 )
+    , m_verboseLevel( 0 )
+    , m_globalId( 0 )
+{
-}
-
@@ -1413 +1431 @@
-}
-
+bool
+AvPlug::serialize( Glib::ustring basePath, Util::IOSerialize& ser )
+{
+    bool result;
+    result  = ser.write( basePath + "m_subunitType", m_subunitType );
+    result &= ser.write( basePath + "m_subunitId", m_subunitId );
+    /// XXX ...
+
+    return result;
+}
+
+AvPlug*
+AvPlug::deserialize( Glib::ustring basePath,
+                     Util::IODeserialize& deser,
+                     Ieee1394Service& ieee1394Service,
+                     ConfigRom& configRom,
+                     AvPlugManager& plugManager )
+{
+    AvPlug* pPlug = new AvPlug;
+    if ( !pPlug ) {
+        return 0;
+    }
+
+    pPlug->m_1394Service = &ieee1394Service;
+    pPlug->m_pConfigRom = &configRom;
+    pPlug->m_plugManager = &plugManager;
+    bool result;
+    result  = deser.read( basePath + "m_subunitType", pPlug->m_subunitType );
+    result &= deser.read( basePath + "m_subunitId", pPlug->m_subunitId );
+    // XXX ...
+
+    if ( !result ) {
+        delete pPlug;
+        return 0;
+    }
+
+    return pPlug;
+}
+
-/////////////////////////////////////////
-/////////////////////////////////////////

trunk/libfreebob/src/bebob/bebob_avplug.h

@@ -30 +30 @@
-#include "libfreebob/xmlparser.h"
-
+#include "libutil/serialize.h"
+
-#include "debugmodule/debugmodule.h"
+
+#include <glibmm/ustring.h>
-
-class Ieee1394Service;
@@ -155 +159 @@
-    { return m_clusterInfos; }
-
+    bool serialize( Glib::ustring basePath, Util::IOSerialize& ser );
+    static AvPlug* deserialize( Glib::ustring basePath,
+                                Util::IODeserialize& deser,
+                                Ieee1394Service& ieee1394Service,
+                                ConfigRom& configRom,
+                                AvPlugManager& plugManager );
-protected:
-    bool discoverPlugType();
@@ -195 +205 @@
-
-    EAvPlugDirection toggleDirection( EAvPlugDirection direction ) const;
+
+private:
+    AvPlug();
-
-private: