Changeset 379

Timestamp:

01/21/07 12:22:41 (17 years ago)

Author:

wagi

Message:

AvDevice?: all members are de/serialed now

Files:

• trunk/libfreebob/src/bebob/bebob_avdevice.cpp (modified) (4 diffs)
• trunk/libfreebob/src/bebob/bebob_avdevice.h (modified) (3 diffs)
• trunk/libfreebob/src/libfreebobavc/avc_function_block.h (modified) (3 diffs)

trunk/libfreebob/src/bebob/bebob_avdevice.cpp

@@ -1232 +1232 @@
-}
-
+template <typename T> bool serializeVector( Glib::ustring path,
+                                            Util::IOSerialize& ser,
+                                            const T& vec )
+{
+    bool result = true; // if vec.size() == 0
+    int i = 0;
+    for ( typename T::const_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,
+                                                           AvDevice& avDevice,
+                                                           VT& vec )
+{
+    int i = 0;
+    bool bFinished = false;
+    do {
+        std::ostringstream strstrm;
+        strstrm << path << i << "/";
+        T* ptr = T::deserialize( strstrm.str(),
+                                 deser,
+                                 avDevice );
+        if ( ptr ) {
+            vec.push_back( ptr );
+            i++;
+        } else {
+            bFinished = true;
+        }
+    } while ( !bFinished );
+
+    return true;
+}
+
+bool
+AvDevice::serializeSyncInfoVector( Glib::ustring basePath,
+                                   Util::IOSerialize& ser,
+                                   const SyncInfoVector& vec )
+{
+    bool result = true;
+    int i = 0;
+
+    for ( SyncInfoVector::const_iterator it = vec.begin();
+          it != vec.end();
+          ++it )
+    {
+        const SyncInfo& info = *it;
+
+        std::ostringstream strstrm;
+        strstrm << basePath << i << "/";
+
+        result &= ser.write( strstrm.str() + "m_source", info.m_source->getGlobalId() );
+        result &= ser.write( strstrm.str() + "m_destination", info.m_destination->getGlobalId() );
+        result &= ser.write( strstrm.str() + "m_description", Glib::ustring( info.m_description ) );
+
+        i++;
+    }
+
+    return result;
+}
+
+bool
+AvDevice::deserializeSyncInfoVector( Glib::ustring basePath,
+                                     Util::IODeserialize& deser,
+                                     AvDevice& avDevice,
+                                     SyncInfoVector& vec )
+{
+    int i = 0;
+    bool bFinished = false;
+    do {
+        bool result;
+        std::ostringstream strstrm;
+        strstrm << basePath << i << "/";
+
+        plug_id_t sourceId;
+        plug_id_t destinationId;
+        Glib::ustring description;
+
+        result  = deser.read( strstrm.str() + "m_source", sourceId );
+        result &= deser.read( strstrm.str() + "m_destination", destinationId );
+        result &= deser.read( strstrm.str() + "m_description", description );
+
+        if ( result ) {
+            SyncInfo syncInfo;
+            syncInfo.m_source = avDevice.getPlugManager().getPlug( sourceId );
+            syncInfo.m_destination = avDevice.getPlugManager().getPlug( destinationId );
+            syncInfo.m_description = description;
+
+            vec.push_back( syncInfo );
+            i++;
+        } else {
+            bFinished = true;
+        }
+    } while ( !bFinished );
+
+    return true;
+}
+
-static bool
-deserializeAvPlugUpdateConnections( Glib::ustring path,
@@ -1249 +1352 @@
-
-bool
-
-basePath, 
+ basePath,
+
-{
-    bool result;
@@ -1258 +1361 @@
-    result &= serializeVector( basePath + "PlugConnection", ser, m_plugConnections );
-    result &= serializeVector( basePath + "Subunit", ser, m_subunits );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    return result;
@@ -1292 +1409 @@
-        result &= deserializeVector<AvPlugConnection>( basePath + "PlugConnnection", deser, *pDev, pDev->m_plugConnections );
-        result &= deserializeVector<AvDeviceSubunit>( basePath + "Subunit",  deser, *pDev, pDev->m_subunits );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-

trunk/libfreebob/src/bebob/bebob_avdevice.h

@@ -89 +89 @@
-            , m_description( description )
-            {}
+        SyncInfo()
+            : m_source( 0 )
+            , m_destination( 0 )
+            , m_description( "" )
+            {}
-        AvPlug*     m_source;
-        AvPlug*     m_destination;
@@ -147 +152 @@
-                                           AvPlugVector& prhs,
-                                           std::string syncDescription );
+
+    static bool serializeSyncInfoVector( Glib::ustring basePath,
+                                         Util::IOSerialize& ser,
+                                         const SyncInfoVector& vec );
+    static bool deserializeSyncInfoVector( Glib::ustring basePath,
+                                           Util::IODeserialize& deser,
+                                           AvDevice& avDevice,
+                                           SyncInfoVector& vec );
-protected:
-    std::auto_ptr<ConfigRom>( m_pConfigRom );
@@ -170 +183 @@
-};
-
-template <typename T> bool serializeVector( Glib::ustring path,
-                                            Util::IOSerialize& ser,
-                                            const T& vec )
-{
-    bool result = true; // if vec.size() == 0
-    int i = 0;
-    for ( typename T::const_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,
-                                                           AvDevice& avDevice,
-                                                           VT& vec )
-{
-    int i = 0;
-    bool bFinished = false;
-    do {
-        std::ostringstream strstrm;
-        strstrm << path << i << "/";
-        T* ptr = T::deserialize( strstrm.str(),
-                                 deser,
-                                 avDevice );
-        if ( ptr ) {
-            vec.push_back( ptr );
-            i++;
-        } else {
-            bFinished = true;
-        }
-    } while ( !bFinished );
-
-    return true;
-}
-
-}
-

trunk/libfreebob/src/libfreebobavc/avc_function_block.h

@@ -1 +1 @@
-/* avc_function_block.h
-
+,07
- *
- * This file is part of FreeBoB.
@@ -165 +165 @@
-    // Control selector encoding
-    enum EControlSelectorEncoding {
-       
+        
-        eCSE_Processing_Enable          = 0x01,
-        eCSE_Processing_Mode            = 0x02,
@@ -200 +200 @@
-    // CODEC type endcoding
-    enum ECodecTypeEncoding {
-       
+        
-        eCTE_Ac3Decoder                 = 0x01,
-        eCTE_MpegDecoder                = 0x02,