Changeset 372

Timestamp:

01/07/07 07:08:53 (16 years ago)

Author:

wagi

Message:

AvPlug::serialize: finished implementation (untested yet)
AvPlug::deserialize: likewise
AvPlug::deserializeUpdate: new function. second stage of deserializing
IODeserialize::isExisting: new function

Files:

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

trunk/libfreebob/src/bebob/bebob_avdevice.cpp

@@ -1273 +1273 @@
-}
-
+static bool
+deserializeUpdatePlugs( Glib::ustring basePath,
+                        Util::IODeserialize& deser,
+                        AvPlugVector& vec )
+{
+    bool result = true;
+    for ( AvPlugVector::iterator it = vec.begin();
+          it != vec.end();
+          ++it )
+    {
+        AvPlug* pPlug = *it;
+        result &= pPlug->deserializeUpdate( basePath, deser );
+    }
+    return result;
+}
+
-bool
-AvDevice::serialize( Glib::ustring basePath, Util::IOSerialize& ser )
@@ -1287 +1303 @@
-    return result;
-}
-
-
-AvDevice*
@@ -1311 +1326 @@
-        result &= deserializeVector<AvPlug>( basePath + "PCRPlug", deser, ieee1394Service, *pDev->m_pConfigRom.get(), pDev->m_plugManager, pDev->m_pcrPlugs );
-        result &= deserializeVector<AvPlug>( basePath + "ExternalPlug", deser, ieee1394Service, *pDev->m_pConfigRom.get(), pDev->m_plugManager, pDev->m_externalPlugs );
+        result &= deserializeUpdatePlugs( basePath + "PCRPlug", deser, pDev->m_pcrPlugs );
+        result &= deserializeUpdatePlugs( basePath + "ExternalPlug", deser, pDev->m_externalPlugs );
+
-
-        // XXX ...

trunk/libfreebob/src/bebob/bebob_avdevice.h

@@ -147 +147 @@
-protected:
-    std::auto_ptr<ConfigRom>( m_pConfigRom );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-    // streaming stuff

trunk/libfreebob/src/bebob/bebob_avplug.cpp

@@ -24 +24 @@
-#include "libfreebobavc/ieee1394service.h"
-#include "libfreebobavc/avc_serialize.h"
+
+#include <sstream>
-
-namespace BeBoB {
@@ -1432 +1434 @@
-
-bool
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    bool result;
-    result  = ser.write( basePath + "m_subunitType", m_subunitType );
-    result &= ser.write( basePath + "m_subunitId", m_subunitId );
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    return result;
@@ -1460 +1718 @@
-    result  = deser.read( basePath + "m_subunitType", pPlug->m_subunitType );
-    result &= deser.read( basePath + "m_subunitId", pPlug->m_subunitId );
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if ( !result ) {
@@ -1468 +1741 @@
-
-    return pPlug;
+}
+
+bool
+AvPlug::deserializeUpdate( Glib::ustring basePath,
+                           Util::IODeserialize& deser )
+{
+    bool result;
+    result  = deserializeAvPlugVector( basePath + "m_inputConnections", deser, m_inputConnections );
+    result &= deserializeAvPlugVector( basePath + "m_outputConnections", deser, m_outputConnections );
+    return result;
-}
-
@@ -1759 +2042 @@
-}
-
+AvPlug*
+AvPlugManager::getPlug( int iGlobalId ) const
+{
+    for ( AvPlugVector::const_iterator it = m_plugs.begin();
+          it !=  m_plugs.end();
+          ++it )
+    {
+        AvPlug* pPlug = *it;
+        if ( pPlug->getGlobalId() == iGlobalId ) {
+            return pPlug;
+        }
+    }
+
+    return 0;
+}
+
-AvPlugVector
-AvPlugManager::getPlugsByType( AVCCommand::ESubunitType subunitType,

trunk/libfreebob/src/bebob/bebob_avplug.h

@@ -138 +138 @@
-    void showPlug() const;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    static AvPlug* deserialize( Glib::ustring basePath,
-                                Util::IODeserialize& deser,
@@ -165 +144 @@
-                                ConfigRom& configRom,
-                                AvPlugManager& plugManager );
+    bool deserializeUpdate( Glib::ustring basePath,
+                            Util::IODeserialize& deser );
+
+ public:
+    struct ChannelInfo {
+        stream_position_t          m_streamPosition;
+        stream_position_location_t m_location;
+        Glib::ustring              m_name;
+    };
+    typedef std::vector<ChannelInfo> ChannelInfoVector;
+
+    struct ClusterInfo {
+        int                      m_index;
+        port_type_t              m_portType;
+        Glib::ustring            m_name;
+
+        nr_of_channels_t         m_nrOfChannels;
+        ChannelInfoVector        m_channelInfos;
+        stream_format_t          m_streamFormat;
+    };
+    typedef std::vector<ClusterInfo> ClusterInfoVector;
+
+    ClusterInfoVector& getClusterInfos()
+        { return m_clusterInfos; }
+
-protected:
+    AvPlug();
+
-    bool discoverPlugType();
-    bool discoverName();
@@ -206 +212 @@
-    EAvPlugDirection toggleDirection( EAvPlugDirection direction ) const;
-
+    const ClusterInfo* getClusterInfoByIndex( int index ) const;
+
+    bool serializeChannelInfos( Glib::ustring basePath,
+                                Util::IOSerialize& ser,
+                                const ClusterInfo& clusterInfo ) const;
+    bool deserializeChannelInfos( Glib::ustring basePath,
+                                  Util::IODeserialize& deser,
+                                  ClusterInfo& clusterInfo );
+
+    bool serializeClusterInfos( Glib::ustring basePath,
+                                Util::IOSerialize& ser ) const;
+    bool deserializeClusterInfos( Glib::ustring basePath,
+                                  Util::IODeserialize& deser );
+
+    bool serializeFormatInfos( Glib::ustring basePath,
+                               Util::IOSerialize& ser ) const;
+    bool deserializeFormatInfos( Glib::ustring basePath,
+                                 Util::IODeserialize& deser );
+
+    bool serializeAvPlugVector( Glib::ustring basePath,
+                                Util::IOSerialize& ser,
+                                const AvPlugVector& vec) const;
+    bool deserializeAvPlugVector( Glib::ustring basePath,
+                                  Util::IODeserialize& deser,
+                                  AvPlugVector& vec );
+
-private:
-    AvPlug();
-
-private:
-    Ieee1394Service*             m_1394Service;
-    ConfigRom*                   m_pConfigRom;
-    AVCCommand::ESubunitType     m_subunitType;
-    subunit_id_t                 m_subunitId;
-    function_block_type_t        m_functionBlockType;
-    function_block_id_t          m_functionBlockId;
-    EAvPlugAddressType           m_addressType;
-    EAvPlugDirection             m_direction;
-    plug_id_t                    m_id;
-
-    // Info plug type
-    EAvPlugType m_infoPlugType;
-
-    // Number of channels
-    nr_of_channels_t             m_nrOfChannels;
-
-    // Plug name
-    std::string                  m_name;
-
-    // Channel & Cluster Info
-
-    ClusterInfoVector        m_clusterInfos;
-
-    // Sampling frequency
-    sampling_frequency_t m_samplingFrequency;
-
-    // Supported stream formats
-    struct FormatInfo {
@@ -253 +256 @@
-    typedef std::vector<FormatInfo> FormatInfoVector;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    DECLARE_DEBUG_MODULE;
@@ -294 +305 @@
-                     AvPlug::EAvPlugDirection plugDirection,
-                     plug_id_t plugId ) const;
+    AvPlug* getPlug( int iGlobalId ) const;
-    AvPlugVector getPlugsByType( AVCCommand::ESubunitType subunitType,
-                                 subunit_id_t subunitId,
@@ -314 +326 @@
-    virtual ~AvPlugCluster();
-
-
-
-
+
+
-};
-

trunk/libfreebob/src/libutil/serialize.cpp

@@ -220 +220 @@
-    return false;
-}
+
+bool
+Util::XMLDeserialize::isExisting( std::string strMemberName )
+{
+
+    xmlpp::Node* pNode = m_parser.get_document()->get_root_node();
+    xmlpp::NodeSet nodeSet = pNode->find( strMemberName );
+    return nodeSet.size() > 0;
+}

trunk/libfreebob/src/libutil/serialize.h

@@ -52 +52 @@
-
-        template <typename T> bool read( std::string strMemberName, T& value );
+
+        virtual bool isExisting( std::string strMemberName ) = 0;
-    };
-
@@ -80 +82 @@
-        virtual bool read( std::string strMemberName,
-                           Glib::ustring& str );
+
+        virtual bool isExisting( std::string strMemberName );
+
-    private:
-        Glib::ustring    m_filepath;