Changeset 368 for trunk

Timestamp:

01/04/07 15:31:11 (16 years ago)

Author:

wagi

Message:

ConfigRom::serialize: no prefix needed for member
ConfigRom::deserialize: ieee1394service argument

no prefix needed for member
return 0 if deserializing fails

AvDevice::AvDevice?: new ctor
vDevice::serialize: comment removed
AvDevice::deserialize: config rom deserializing code added

Files:

• trunk/libfreebob/src/bebob/bebob_avdevice.cpp (modified) (5 diffs)
• trunk/libfreebob/src/bebob/bebob_avdevice.h (modified) (1 diff)
• trunk/libfreebob/src/configrom.cpp (modified) (2 diffs)
• trunk/libfreebob/src/configrom.h (modified) (1 diff)
• trunk/libfreebob/src/devicemanager.cpp (modified) (2 diffs)

trunk/libfreebob/src/bebob/bebob_avdevice.cpp

@@ -50 +50 @@
-    , m_plugManager( verboseLevel )
-    , m_activeSyncInfo( 0 )
-0
+ 0 
-    , m_receiveProcessor ( 0 )
-    , m_receiveProcessorBandwidth ( -1 )
@@ -61 +61 @@
-}
-
+AvDevice::AvDevice()
+    : m_pConfigRom( 0 )
+    , m_1394Service( 0 )
+    , m_nodeId( -1 )
+    , m_verboseLevel( 0 )
+    , m_plugManager( 0 )
+    , m_activeSyncInfo( 0 )
+    , m_id( 0 )
+    , m_receiveProcessor ( 0 )
+    , m_receiveProcessorBandwidth ( -1 )
+    , m_transmitProcessor ( 0 )
+    , m_transmitProcessorBandwidth ( -1 )
+{
+}
+
-AvDevice::~AvDevice()
-{
@@ -110 +125 @@
-    {0x000a92, 0x00010066},  // Presonous FirePOD
-
- 
+
-    {0x000aac, 0x00000004},  // TerraTec Electronic GmbH, Phase X24 FW (model version 4)
-    {0x000aac, 0x00000007},  // TerraTec Electronic GmbH, Phase X24 FW (model version 7)
@@ -1219 +1234 @@
-AvDevice::serialize( Glib::ustring basePath, Util::IOSerialize& ser )
-{
-    // create base path string
-    /*
-    char* buf;
-    asprintf( &buf, "%08x%08x",
-              ( unsigned int ) ( m_pConfigRom->getGuid() >> 32 ),
-              ( unsigned int ) ( m_pConfigRom->getGuid() & 0xffffffff ) );
-    std::string avDevicePath = basePath
-                               + m_pConfigRom->getVendorName() + "/"
-                               + m_pConfigRom->getModelName() + "/"
-                               + buf;
-    free( buf );
-    */
-
-    bool result;
-    result = m_pConfigRom->serialize( basePath + "m_pConfigRom/", ser );
@@ -1240 +1242 @@
-AvDevice*
-AvDevice::deserialize( Glib::ustring basePath,
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/libfreebob/src/bebob/bebob_avdevice.h

@@ -101 +101 @@
-    bool serialize( Glib::ustring basePath, Util::IOSerialize& ser );
-    static AvDevice* deserialize( Glib::ustring basePath,
-Ieee1394Service& ieee1394Service
-                                  Util::IODeserialize& deser
+Util::IODeserialize& deser
+                                 Ieee1394Service& ieee1394Service
-
-protected:
+    AvDevice();
+
-    bool enumerateSubUnits();
-

trunk/libfreebob/src/configrom.cpp

@@ -505 +505 @@
-{
-    bool result;
-/
-/
-/
-/
-/
-/
-/
-/
-/
-/
-/
-/
-/
-/
-/
-/
-/
-/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return result;
-}
-
-ConfigRom*
-
+, Ieee1394Service& ieee1394Service
-{
-    ConfigRom* pConfigRom = new ConfigRom;
@@ -534 +534 @@
-    }
-
+    pConfigRom->m_1394Service = &ieee1394Service;
+
-    bool result;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    return pConfigRom;

trunk/libfreebob/src/configrom.h

@@ -74 +74 @@
-
-    bool serialize( Glib::ustring path, Util::IOSerialize& ser );
-
+
+
+
-
- protected:

trunk/libfreebob/src/devicemanager.cpp

@@ -427 +427 @@
-        pBeBoBDevice = BeBoB::AvDevice::deserialize(
-            "BeBoB/" + strstrm.str() + "/",
-
-
+
+
+
-        ++i;
-        if ( pBeBoBDevice ) {
@@ -440 +441 @@
-                    pBeBoBDevice->getConfigRom().setNodeId( pConfigRom->getNodeId() );
-                    // m_avDevices.push_back( pBeBoBDevice );
+
-                }
-            }