Changeset 365

Timestamp:

01/03/07 14:37:50 (16 years ago)

Author:

wagi

Message:

src/libfreebobavc/serialize* moved to src/libfreebob/avc_serialize*, all includes adapted
src/bebob/bebob_serialize* moved to src/libutil/serialize*
src/libutil/serialize: use Glib::ustring instead of std::string.
src/configrom: serialize and deserialize added (not finished)
src/devicemanager: load and save cached functionality added (not finished)

various small whitespace updates (emacs lässt grüssen :))

Files:

• trunk/libfreebob/config.h.in (modified) (1 diff)
• trunk/libfreebob/src/bebob/bebob_avdevice.cpp (modified) (22 diffs)
• trunk/libfreebob/src/bebob/bebob_avdevice.h (modified) (7 diffs)
• trunk/libfreebob/src/bebob/bebob_avdevice_subunit.cpp (modified) (1 diff)
• trunk/libfreebob/src/bebob/bebob_avplug.cpp (modified) (1 diff)
• trunk/libfreebob/src/bebob/bebob_dl_codes.h (modified) (1 diff)
• trunk/libfreebob/src/bebob/bebob_dl_mgr.cpp (modified) (1 diff)
• trunk/libfreebob/src/bounce/bounce_avdevice.cpp (modified) (14 diffs)
• trunk/libfreebob/src/configrom.cpp (modified) (4 diffs)
• trunk/libfreebob/src/configrom.h (modified) (5 diffs)
• trunk/libfreebob/src/devicemanager.cpp (modified) (5 diffs)
• trunk/libfreebob/src/devicemanager.h (modified) (2 diffs)
• trunk/libfreebob/src/libfreebobavc/avc_connect.cpp (modified) (1 diff)
• trunk/libfreebob/src/libfreebobavc/avc_extended_cmd_generic.cpp (modified) (1 diff)
• trunk/libfreebob/src/libfreebobavc/avc_extended_plug_info.cpp (modified) (2 diffs)
• trunk/libfreebob/src/libfreebobavc/avc_extended_stream_format.cpp (modified) (1 diff)
• trunk/libfreebob/src/libfreebobavc/avc_extended_subunit_info.cpp (modified) (1 diff)
• trunk/libfreebob/src/libfreebobavc/avc_function_block.cpp (modified) (1 diff)
• trunk/libfreebob/src/libfreebobavc/avc_generic.cpp (modified) (5 diffs)
• trunk/libfreebob/src/libfreebobavc/avc_plug_info.cpp (modified) (1 diff)
• trunk/libfreebob/src/libfreebobavc/avc_serialize.cpp (moved) (moved from trunk/libfreebob/src/libfreebobavc/serialize.cpp) (4 diffs)
• trunk/libfreebob/src/libfreebobavc/avc_serialize.h (moved) (moved from trunk/libfreebob/src/libfreebobavc/serialize.h) (1 diff)
• trunk/libfreebob/src/libfreebobavc/avc_signal_source.cpp (modified) (1 diff)
• trunk/libfreebob/src/libfreebobavc/avc_subunit_info.cpp (modified) (1 diff)
• trunk/libfreebob/src/libfreebobavc/avc_unit_info.cpp (modified) (1 diff)
• trunk/libfreebob/src/libutil/serialize.cpp (moved) (moved from trunk/libfreebob/src/bebob/bebob_serialize.cpp) (10 diffs)
• trunk/libfreebob/src/libutil/serialize.h (moved) (moved from trunk/libfreebob/src/bebob/bebob_serialize.h) (5 diffs)
• trunk/libfreebob/src/libutil/unittests.cpp (moved) (moved from trunk/libfreebob/src/bebob/bebob_unittests.cpp) (2 diffs)
• trunk/libfreebob/src/Makefile.am (modified) (4 diffs)
• trunk/libfreebob/src/ser.cpp (added)
• trunk/libfreebob/tests/test-extplugcmd.cpp (modified) (1 diff)
• trunk/libfreebob/tests/test-mixer.cpp (modified) (1 diff)
• trunk/libfreebob/tests/test-volume.cpp (modified) (1 diff)

trunk/libfreebob/config.h.in

@@ -84 +84 @@
-#undef const
-
-
+ int
-#undef size_t
-

trunk/libfreebob/src/bebob/bebob_avdevice.cpp

@@ -27 +27 @@
-#include "libfreebobavc/avc_subunit_info.h"
-#include "libfreebobavc/avc_extended_stream_format.h"
-
+avc_
-#include "libfreebobavc/ieee1394service.h"
-#include "libfreebobavc/avc_definitions.h"
@@ -44 +44 @@
-                    int nodeId,
-                    int verboseLevel )
-c
+pC
-    , m_1394Service( &ieee1394service )
-    , m_nodeId( nodeId )
@@ -92 +92 @@
-AvDevice::getConfigRom() const
-{
-c
+pC
-}
-
@@ -544 +544 @@
-                return false;
-            }
-
+
-            m_subunits.push_back( subunit );
-            audioSubunitFound=true;
-
+
-            break;
-        case AVCCommand::eST_Music:
@@ -556 +556 @@
-                return false;
-            }
-
+
-            m_subunits.push_back( subunit );
-            musicSubunitFound=true;
-
+
-            break;
-        default:
@@ -938 +938 @@
-    }
-
- 
+
-        FreebobStreaming::AmdtpAudioPort::E_Capture)) {
-        debugFatal("Could not add plug to processor!\n");
@@ -953 +953 @@
-//                                   samplerate,
-//                                   inputPlug->getNrOfChannels());
-         
+
-//         if(!m_receiveProcessor2->init()) {
-//             debugFatal("Could not initialize snooping receive processor!\n");
-//             return false;
-//         }
- 
+
-//             FreebobStreaming::AmdtpAudioPort::E_Capture)) {
-//             debugFatal("Could not add plug to processor!\n");
@@ -970 +970 @@
-                                samplerate,
-                                inputPlug->getNrOfChannels());
-
+
-        if(!m_transmitProcessor->init()) {
-            debugFatal("Could not initialize transmit processor!\n");
-            return false;
-
-
-
+
+
+
-        // FIXME: do this the proper way!
-        m_transmitProcessor->syncmaster=m_receiveProcessor;
-
- 
+
+
-            FreebobStreaming::AmdtpAudioPort::E_Playback)) {
-            debugFatal("Could not add plug to processor!\n");
@@ -992 +992 @@
-bool
-AvDevice::addPlugToProcessor(
- 
- 
+
+
-    FreebobStreaming::AmdtpAudioPort::E_Direction direction) {
-
@@ -1010 +1010 @@
-            const AvPlug::ChannelInfo* channelInfo = &( *it );
-            std::ostringstream portname;
-
+
-            portname << "dev" << m_id << "_" << channelInfo->m_name;
-
+
-            FreebobStreaming::Port *p=NULL;
-            switch(clusterInfo->m_portType) {
@@ -1022 +1022 @@
-                p=new FreebobStreaming::AmdtpAudioPort(
-                        portname.str(),
- 
+
-                        // \todo: streaming backend expects indexing starting from 0
-                        // but bebob reports it starting from 1. Decide where
-                        // and how to handle this (pp: here)
- 
- 
- 
+
+
+
-                        clusterInfo->m_portType
-                );
@@ -1036 +1036 @@
-                p=new FreebobStreaming::AmdtpMidiPort(
-                        portname.str(),
- 
+
-                        // \todo: streaming backend expects indexing starting from 0
-                        // but bebob reports it starting from 1. Decide where
-                        // and how to handle this (pp: here)
- 
- 
- 
+
+
+
-                        clusterInfo->m_portType
-                );
@@ -1061 +1061 @@
-                debugOutput(DEBUG_LEVEL_VERBOSE, "Skipped port %s\n",channelInfo->m_name.c_str());
-            } else {
-
+
-                if (!processor->addPort(p)) {
-                    debugWarning("Could not register port with stream processor\n");
@@ -1072 +1072 @@
-}
-
- 
+
-AvDevice::getStreamCount() {
-    return 2; // one receive, one transmit
@@ -1099 +1099 @@
-    int plug=0;
-    int hostplug=-1;
-
+
-//     if (m_snoopMode) {
-     
+
-//         switch (i) {
-//         case 0:
-//             // snooping doesn't use CMP, but obtains the info of the channel
-//             // from the target plug
-             
+
-//             // TODO: get isochannel from plug
-             
+
-//             // set the channel obtained by the connection management
-//             m_receiveProcessor->setChannel(iso_channel);
@@ -1115 +1115 @@
-//             // snooping doesn't use CMP, but obtains the info of the channel
-//             // from the target plug
-             
+
-//             // TODO: get isochannel from plug
-             
+
-//             // set the channel obtained by the connection management
-//             m_receiveProcessor2->setChannel(iso_channel);
- 
+
-//             break;
-//         default:
@@ -1126 +1126 @@
-//         }
-//     } else {
-
+
-        switch (i) {
-        case 0:
-            // do connection management: make connection
-            iso_channel = iec61883_cmp_connect(
- 
- 
+
+
-                &plug,
- 
- 
+
+
-                &m_receiveProcessorBandwidth);
-
+
-            // set the channel obtained by the connection management
-            m_receiveProcessor->setChannel(iso_channel);
@@ -1144 +1144 @@
-            // do connection management: make connection
-            iso_channel = iec61883_cmp_connect(
- 
- 
- 
- 
+
+
+
+
-                &plug,
-                &m_transmitProcessorBandwidth);
-
+
-            // set the channel obtained by the connection management
-            m_transmitProcessor->setChannel(iso_channel);
@@ -1158 +1158 @@
-        }
-//     }
-
+
-    return 0;
-
@@ -1173 +1173 @@
-//         case 0:
-//             // do connection management: break connection
-     
+
-//             break;
-//         case 1:
-//             // do connection management: break connection
- 
+
-//             break;
-//         default:
@@ -1187 +1187 @@
-            // do connection management: break connection
-            iec61883_cmp_disconnect(
- 
- 
+
+
-                plug,
- 
- 
+
+
-                m_receiveProcessor->getChannel(),
-                m_receiveProcessorBandwidth);
-
+
-            break;
-        case 1:
-            // do connection management: break connection
-            iec61883_cmp_disconnect(
- 
- 
- 
- 
+
+
+
+
-                plug,
-                m_transmitProcessor->getChannel(),
@@ -1212 +1212 @@
-        }
-//     }
-
+
-    return 0;
-}
-
+bool
+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 );
+
+    return result;
+}
+
+AvDevice*
+AvDevice::deserialize( Glib::ustring basePath,
+                       Ieee1394Service& ieee1394Service,
+                       Util::IODeserialize& deser )
+{
+
+    return 0;
+}
-
-} // end of namespace

trunk/libfreebob/src/bebob/bebob_avdevice.h

@@ -36 +36 @@
-#include "libstreaming/AmdtpPortInfo.h"
-
+#include "libutil/serialize.h"
+
-#include "iavdevice.h"
-
@@ -47 +49 @@
-public:
-    AvDevice( std::auto_ptr<ConfigRom>( configRom ),
-
+    
-              int nodeId,
-
+    
-    virtual ~AvDevice();
-
@@ -72 +74 @@
-
-    Ieee1394Service* get1394Service()
-
+    
-
-    AvPlugManager& getPlugManager()
-
+    
-
-    struct SyncInfo {
@@ -85 +87 @@
-            , m_description( description )
-            {}
-
-
+    
+    
-        std::string m_description;
-    };
@@ -96 +98 @@
-        { return m_activeSyncInfo; }
-    bool setActiveSync( const SyncInfo& syncInfo );
+
+    bool serialize( Glib::ustring basePath, Util::IOSerialize& ser );
+    static AvDevice* deserialize( Glib::ustring basePath,
+                                  Ieee1394Service& ieee1394Service,
+                                  Util::IODeserialize& deser );
-
-protected:
@@ -124 +131 @@
-                 AvPlug::EAvPlugType type);
-
- 
+
-                             FreebobStreaming::AmdtpAudioPort::E_Direction direction);
-
@@ -137 +144 @@
-                                           std::string syncDescription );
-protected:
-c
+pC
-    Ieee1394Service* m_1394Service;
-    int              m_nodeId;

trunk/libfreebob/src/bebob/bebob_avdevice_subunit.cpp

@@ -27 +27 @@
-#include "libfreebobavc/avc_plug_info.h"
-#include "libfreebobavc/avc_extended_stream_format.h"
-
+avc_
-
-namespace BeBoB {

trunk/libfreebob/src/bebob/bebob_avplug.cpp

@@ -22 +22 @@
-
-#include "libfreebobavc/ieee1394service.h"
-
+avc_
-
-namespace BeBoB {

trunk/libfreebob/src/bebob/bebob_dl_codes.h

@@ -24 +24 @@
-#include "fbtypes.h"
-
-
+avc_
-
-namespace BeBoB {

trunk/libfreebob/src/bebob/bebob_dl_mgr.cpp

@@ -25 +25 @@
-#include "configrom.h"
-#include "libfreebobavc/ieee1394service.h"
-
+avc_
-
-#include <netinet/in.h>

trunk/libfreebob/src/bounce/bounce_avdevice.cpp

@@ -27 +27 @@
-#include "libfreebobavc/avc_subunit_info.h"
-#include "libfreebobavc/avc_extended_stream_format.h"
-
+avc_
-#include "libfreebobavc/ieee1394service.h"
-#include "libfreebobavc/avc_definitions.h"
@@ -33 +33 @@
-#include "debugmodule/debugmodule.h"
-
-    
+
-#include <sstream>
-#include <stdint.h>
@@ -61 +61 @@
-{
-    setDebugLevel( verboseLevel );
-
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Created Bounce::BounceDevice (NodeID %d)\n",
-                 nodeId );
@@ -84 +84 @@
-static VendorModelEntry supportedDeviceList[] =
-{
-  
+
-};
-
@@ -98 +98 @@
-    {
-        if ( ( supportedDeviceList[i].vendor_id == vendorId )
- 
+
-           )
-        {
@@ -114 +114 @@
-        quadlet_t request[6];
-        quadlet_t *resp;
-
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Discovering...\n" );
-
-        std::string vendor=std::string(FREEBOB_BOUNCE_SERVER_VENDORNAME);
-        std::string model=std::string(FREEBOB_BOUNCE_SERVER_MODELNAME);
-
+
-        if (!(m_configRom->getVendorName().compare(0,vendor.length(),vendor,0,vendor.length())==0)
-            || !(m_configRom->getModelName().compare(0,model.length(),model,0,model.length())==0)) {
@@ -178 +178 @@
-BounceDevice::addXmlDescription( xmlNodePtr deviceNode )
-{
-
+
-    return false;
-
@@ -187 +187 @@
-bool
-BounceDevice::addPortsToProcessor(
- 
+
-        FreebobStreaming::AmdtpAudioPort::E_Direction direction) {
-
+
-    debugOutput(DEBUG_LEVEL_VERBOSE,"Adding ports to processor\n");
-
+
-    int i=0;
-    for (i=0;i<BOUNCE_NR_OF_CHANNELS;i++) {
-        char *buff;
-        asprintf(&buff,"dev%d%s_Port%d",m_id,direction==FreebobStreaming::AmdtpAudioPort::E_Playback?"p":"c",i);
-
+
-        FreebobStreaming::Port *p=NULL;
-        p=new FreebobStreaming::AmdtpAudioPort(
-                buff,
- 
+
-                // \todo: streaming backend expects indexing starting from 0
-                // but bebob reports it starting from 1. Decide where
-                // and how to handle this (pp: here)
- 
- 
- 
+
+
+
-                0
-        );
-
+
-        if (!p) {
-            debugOutput(DEBUG_LEVEL_VERBOSE, "Skipped port %s\n",buff);
-        } else {
-
+
-            if (!processor->addPort(p)) {
-                debugWarning("Could not register port with stream processor\n");
@@ -220 +220 @@
-            } else {
-                debugOutput(DEBUG_LEVEL_VERBOSE, "Added port %s\n",buff);
-
+
-            }
-        }
-
+
-        free(buff);
-
+
-     }
-
@@ -240 +240 @@
-                                 m_samplerate,
-                                 BOUNCE_NR_OF_CHANNELS);
-
+
-        if(!m_receiveProcessor->init()) {
-                debugFatal("Could not initialize receive processor!\n");
-                return false;
-
-
-
- 
+
+
+
+
-                FreebobStreaming::AmdtpAudioPort::E_Capture)) {
-                debugFatal("Could not add ports to processor!\n");
@@ -258 +258 @@
-                                 m_samplerate,
-                                 BOUNCE_NR_OF_CHANNELS);
-
+
-        m_transmitProcessor->setVerboseLevel(getDebugLevel());
-
+
-        if(!m_transmitProcessor->init()) {
-                debugFatal("Could not initialize transmit processor!\n");
-                return false;
-
-
-
- 
+
+
+
+
-                FreebobStreaming::AmdtpAudioPort::E_Playback)) {
-                debugFatal("Could not add ports to processor!\n");
-                return false;
-        }
-
+
-        return true;
-}
-
- 
+
-BounceDevice::getStreamCount() {
-        return 2; // one receive, one transmit
@@ -299 +299 @@
-//      int plug=0;
-//      int hostplug=-1;
-     
+
-        switch (i) {
-        case 0:
-//              // do connection management: make connection
-//              iso_channel = iec61883_cmp_connect(
- 
- 
+
+
-//                      &plug,
- 
- 
+
+
-//                      &m_receiveProcessorBandwidth);
-             
+
-//              // set the channel obtained by the connection management
-                m_receiveProcessor->setChannel(1);
@@ -317 +317 @@
-//              // do connection management: make connection
-//              iso_channel = iec61883_cmp_connect(
- 
- 
- 
- 
+
+
+
+
-//                      &plug,
-//                      &m_transmitProcessorBandwidth);
-             
+
-//              // set the channel obtained by the connection management
-// //           m_receiveProcessor2->setChannel(iso_channel);
@@ -342 +342 @@
-//      int plug=0;
-//      int hostplug=-1;
- 
+
-//      switch (i) {
-//      case 0:
-//              // do connection management: break connection
-//              iec61883_cmp_disconnect(
- 
- 
+
+
-//                      plug,
- 
- 
+
+
-//                      m_receiveProcessor->getChannel(),
-//                      m_receiveProcessorBandwidth);
- 
+
-//              break;
-//      case 1:
-//              // do connection management: break connection
-//              iec61883_cmp_disconnect(
- 
- 
- 
- 
+
+
+
+
-//                      plug,
-//                      m_transmitProcessor->getChannel(),
-//                      m_transmitProcessorBandwidth);
- 
+
-//              // set the channel obtained by the connection management
-// //           m_receiveProcessor2->setChannel(iso_channel);

trunk/libfreebob/src/configrom.cpp

@@ -81 +81 @@
-}
-
+ConfigRom::ConfigRom()
+    : m_1394Service( 0 )
+    , m_nodeId( -1 )
+    , m_avcDevice( false )
+    , m_guid( 0 )
+    , m_vendorName( "" )
+    , m_modelName( "" )
+    , m_vendorId( 0 )
+    , m_modelId( 0 )
+    , m_unit_specifier_id( 0 )
+    , m_unit_version( 0 )
+    , m_isIsoResourceManager( false )
+    , m_isCycleMasterCapable( false )
+    , m_isSupportIsoOperations( false )
+    , m_isBusManagerCapable( false )
+    , m_cycleClkAcc( 0 )
+    , m_maxRec( 0 )
+    , m_nodeVendorId( 0 )
+    , m_chipIdHi( 0 )
+    , m_chipIdLow( 0 )
+    , m_vendorNameKv( 0 )
+    , m_modelNameKv( 0 )
+    , m_csr( 0 )
+{
+}
+
-ConfigRom::~ConfigRom()
-{
+}
+
+bool
+ConfigRom::operator == ( const ConfigRom& rhs )
+{
+    return m_guid == rhs.m_guid;
-}
-
@@ -347 +379 @@
-}
-
-std::
+Glib::u
-ConfigRom::getModelName() const
-{
@@ -353 +385 @@
-}
-
-std::
+Glib::u
-ConfigRom::getVendorName() const
-{
@@ -468 +500 @@
-    return 1 << ( m_maxRec + 1 );
-}
+
+bool
+ConfigRom::serialize( Glib::ustring path, Util::IOSerialize& ser )
+{
+    bool result;
+    result  = ser.write( path + "/m_nodeId", m_nodeId );
+    result &= ser.write( path + "/m_avcDevice",  m_avcDevice );
+    result &= ser.write( path + "/m_guid", m_guid );
+    result &= ser.write( path + "/m_vendorName", Glib::ustring( m_vendorName ) );
+    result &= ser.write( path + "/m_modelName", Glib::ustring( m_modelName ) );
+    result &= ser.write( path + "/m_vendorId", m_vendorId );
+    result &= ser.write( path + "/m_modelId", m_modelId );
+    result &= ser.write( path + "/m_unit_specifier_id", m_unit_specifier_id );
+    result &= ser.write( path + "/m_unit_version",  m_unit_version );
+    result &= ser.write( path + "/m_isIsoResourceManager", m_isIsoResourceManager );
+    result &= ser.write( path + "/m_isCycleMasterCapable", m_isCycleMasterCapable );
+    result &= ser.write( path + "/m_isSupportIsoOperations", m_isSupportIsoOperations );
+    result &= ser.write( path + "/m_isBusManagerCapable", m_isBusManagerCapable );
+    result &= ser.write( path + "/m_cycleClkAcc", m_cycleClkAcc );
+    result &= ser.write( path + "/m_maxRec", m_maxRec );
+    result &= ser.write( path + "/m_nodeVendorId", m_nodeVendorId );
+    result &= ser.write( path + "/m_chipIdHi", m_chipIdHi );
+    result &= ser.write( path + "/m_chipIdLow", m_chipIdLow );
+    return result;
+}
+
+ConfigRom*
+ConfigRom::deserialize( Glib::ustring path, Util::IODeserialize& deser )
+{
+    ConfigRom* pConfigRom = new ConfigRom;
+    if ( !pConfigRom ) {
+        return 0;
+    }
+
+    bool result;
+    result  = deser.read( path + "/m_nodeId", pConfigRom->m_nodeId );
+    result &= deser.read( path + "/m_avcDevice", pConfigRom->m_avcDevice );
+    result &= deser.read( path + "/m_guid", pConfigRom->m_guid );
+    result &= deser.read( path + "/m_vendorName", pConfigRom->m_vendorName );
+    result &= deser.read( path + "/m_modelName", pConfigRom->m_modelName );
+    result &= deser.read( path + "/m_vendorId", pConfigRom->m_vendorId );
+    result &= deser.read( path + "/m_modelId", pConfigRom->m_modelId );
+    result &= deser.read( path + "/m_unit_specifier_id", pConfigRom->m_unit_specifier_id );
+    result &= deser.read( path + "/m_unit_version", pConfigRom->m_unit_version );
+    result &= deser.read( path + "/m_isIsoResourceManager", pConfigRom->m_isIsoResourceManager );
+    result &= deser.read( path + "/m_isCycleMasterCapable", pConfigRom->m_isCycleMasterCapable );
+    result &= deser.read( path + "/m_isSupportIsoOperations", pConfigRom->m_isSupportIsoOperations );
+    result &= deser.read( path + "/m_isBusManagerCapable", pConfigRom->m_isBusManagerCapable );
+    result &= deser.read( path + "/m_cycleClkAcc", pConfigRom->m_cycleClkAcc );
+    result &= deser.read( path + "/m_maxRec", pConfigRom->m_maxRec );
+    result &= deser.read( path + "/m_nodeVendorId", pConfigRom->m_nodeVendorId );
+    result &= deser.read( path + "/m_chipIdHi", pConfigRom->m_chipIdHi );
+    result &= deser.read( path + "/m_chipIdLow", pConfigRom->m_chipIdLow );
+
+    return pConfigRom;
+}
+
+bool
+ConfigRom::setNodeId( fb_nodeid_t nodeId )
+{
+    m_nodeId = nodeId;
+    return true;
+}

trunk/libfreebob/src/configrom.h

@@ -25 +25 @@
-#include "csr1212.h"
-
+#include "libutil/serialize.h"
-#include "debugmodule/debugmodule.h"
-
@@ -38 +39 @@
-    bool initialize();
-
+    bool operator == ( const ConfigRom& rhs );
+
-    const fb_nodeid_t getNodeId() const;
-    const fb_octlet_t getGuid() const;
-std::
-std::
-
+Glib::u
+Glib::u
+
-    const unsigned int getModelId() const;
-    const unsigned int getVendorId() const;
@@ -66 +69 @@
-
-    bool updatedNodeId();
+    bool setNodeId( fb_nodeid_t nodeId );
-
-    void printConfigRom() const;
+
+    bool serialize( Glib::ustring path, Util::IOSerialize& ser );
+    static ConfigRom* deserialize( Glib::ustring path, Util::IODeserialize& deser );
-
- protected:
@@ -80 +87 @@
-    bool             m_avcDevice;
-    fb_octlet_t      m_guid;
-std::string  
-std::string  
+Glib::ustring
+Glib::ustring
-    unsigned int     m_vendorId;
-    unsigned int     m_modelId;
@@ -102 +109 @@
-
-private:
-
+
+
-
-    DECLARE_DEBUG_MODULE;

trunk/libfreebob/src/devicemanager.cpp

@@ -107 +107 @@
-    {
-        debugOutput( DEBUG_LEVEL_VERBOSE, "Probing node %d...\n", nodeId );
-
+
-        std::auto_ptr<ConfigRom> configRom =
-            std::auto_ptr<ConfigRom>( new ConfigRom( *m_1394Service,
@@ -241 +241 @@
-}
-
- 
+
-DeviceManager::getAvDeviceCount( )
-{
@@ -341 +341 @@
-            xmlFreeDoc( doc );
-            xmlCleanupParser();
-
+
-            free(result);
-            return 0;
@@ -355 +355 @@
-            return 0;
-        }
-
+
-        free(result);
-    }
@@ -368 +368 @@
-}
-
+bool
+DeviceManager::saveCache( Glib::ustring fileName )
+{
+    int i = 0;
+    for ( IAvDeviceVectorIterator it = m_avDevices.begin();
+          it != m_avDevices.end();
+          ++it )
+    {
+        IAvDevice* pAvDevice = *it;
+        BeBoB::AvDevice* pBeBoBDevice = reinterpret_cast< BeBoB::AvDevice* >( pAvDevice );
+        if ( pBeBoBDevice ) {
+            Util::XMLSerialize ser( fileName );
+            std::string idx = "id" + i;
+            Glib::ustring basePath = "BeBoB/" + idx + "/";
+            i++;
+            pBeBoBDevice->serialize( basePath, ser );
+            std::cout << "a bebob device serialized" << std::endl;
+            return true;
+        }
+    }
+    return true;
+}
+
+bool
+DeviceManager::loadCache( Glib::ustring fileName )
+{
+    Util::XMLDeserialize deser( fileName );
+    BeBoB::AvDevice* pBeBoBDevice = 0;
+    int i = 0;
+
+    typedef std::vector<ConfigRom*> ConfigRomVector;
+    ConfigRomVector configRoms;
+
+    for ( fb_nodeid_t nodeId = 0;
+          nodeId < m_1394Service->getNodeCount();
+          ++nodeId )
+    {
+        ConfigRom* pConfigRom  =  new ConfigRom( *m_1394Service, nodeId );
+        if ( !pConfigRom->initialize() ) {
+            // \todo If a PHY on the bus is in power safe mode then
+            // the config rom is missing. So this might be just
+            // such this case and we can safely skip it. But it might
+            // be there is a real software problem on our side.
+            // This should be handled more carefuly.
+            debugOutput( DEBUG_LEVEL_NORMAL,
+                         "Could not read config rom from device (node id %d). "
+                         "Skip device discovering for this node\n",
+                         nodeId );
+            delete pConfigRom;
+            continue;
+        }
+        configRoms.push_back( pConfigRom );
+    }
+
+    do {
+        std::string idx = "id" + i;
+        pBeBoBDevice = BeBoB::AvDevice::deserialize(
+            "BeBoB/" + idx + "/",
+            *m_1394Service,
+            deser );
+        ++i;
+        if ( pBeBoBDevice ) {
+            for (ConfigRomVector::iterator it = configRoms.begin();
+                 it != configRoms.end();
+                 ++it )
+            {
+                ConfigRom* pConfigRom = *it;
+
+                if ( pBeBoBDevice->getConfigRom() == *pConfigRom ) {
+                    pBeBoBDevice->getConfigRom().setNodeId( pConfigRom->getNodeId() );
+                    // m_avDevices.push_back( pBeBoBDevice );
+                }
+            }
+        }
+    } while ( pBeBoBDevice );
+
+    return true;
+}

trunk/libfreebob/src/devicemanager.h

@@ -26 +26 @@
-#include "libfreebob/xmlparser.h"
-
+#include <glibmm/ustring.h>
+
-#include <vector>
-
@@ -52 +54 @@
-
-    IAvDevice* getAvDevice( int nodeId );
-       
-       
+    
+    
-
-    xmlDocPtr getXmlDescription();
+
+    bool saveCache( Glib::ustring fileName );
+    bool loadCache( Glib::ustring fileName );
-
-protected:

trunk/libfreebob/src/libfreebobavc/avc_connect.cpp

@@ -20 +20 @@
-
-#include "avc_connect.h"
-
+avc_
-#include "ieee1394service.h"
-

trunk/libfreebob/src/libfreebobavc/avc_extended_cmd_generic.cpp

@@ -20 +20 @@
-
-#include "avc_extended_cmd_generic.h"
-
+avc_
-#include "ieee1394service.h"
-

trunk/libfreebob/src/libfreebobavc/avc_extended_plug_info.cpp

@@ -20 +20 @@
-
-#include "avc_extended_plug_info.h"
-
+avc_
-#include "ieee1394service.h"
-
@@ -627 +627 @@
-
-    free(buf);
-
+
-    switch ( m_infoType ) {
-    case eIT_PlugType:

trunk/libfreebob/src/libfreebobavc/avc_extended_stream_format.cpp

@@ -20 +20 @@
-
-#include "avc_extended_stream_format.h"
-
+avc_
-#include "ieee1394service.h"
-

trunk/libfreebob/src/libfreebobavc/avc_extended_subunit_info.cpp

@@ -20 +20 @@
-
-#include "avc_extended_subunit_info.h"
-
+avc_
-#include "ieee1394service.h"
-

trunk/libfreebob/src/libfreebobavc/avc_function_block.cpp

@@ -20 +20 @@
-
-#include "avc_function_block.h"
-
+avc_
-#include "ieee1394service.h"
-

trunk/libfreebob/src/libfreebobavc/avc_generic.cpp

@@ -20 +20 @@
-
-#include "avc_generic.h"
-
+avc_
-#include "ieee1394service.h"
-
@@ -177 +177 @@
-        debugOutput( DEBUG_LEVEL_VERY_VERBOSE,  "  Request:");
-        showFcpFrame( m_fcpFrame, fcpFrameSize );
-
+
-        StringSerializer se_dbg;
-        serialize( se_dbg );
-
- 
+
+
-                         se_dbg.getString().c_str());
-    }
@@ -211 +211 @@
-            StringSerializer se_dbg;
-            serialize( se_dbg );
-
- 
+
+
-                             se_dbg.getString().c_str());
-        }
@@ -219 +219 @@
-            debugWarning( "unexpected response received (0x%x)\n", m_eResponse );
-            debugOutput( DEBUG_LEVEL_VERY_VERBOSE,"  Response:");
-
+
-            BufferDeserialize de( buf, resp_len );
-            deserialize( de );
@@ -229 +229 @@
-           debugWarning( "no response\n" );
-    }
-
+
-    debugOutputShort( DEBUG_LEVEL_VERY_VERBOSE, "\n" );
-

trunk/libfreebob/src/libfreebobavc/avc_plug_info.cpp

@@ -20 +20 @@
-
-#include "avc_plug_info.h"
-
+avc_
-#include "ieee1394service.h"
-

trunk/libfreebob/src/libfreebobavc/avc_serialize.cpp

@@ -1 @@
-
-
+avc_
+,07
- *
- * This file is part of FreeBoB.
@@ -19 +19 @@
- */
-
-
+avc_
-
-#include <iostream>
@@ -50 +50 @@
-    char* result;
-    asprintf( &result, "  %3d:\t0x%02x\t%s\n", m_cnt, d, name );
-
+
-    m_string += result;
-    free( result );
-
+
-    m_cnt += sizeof( byte_t );
-
@@ -64 +64 @@
-    char* result;
-    asprintf( &result, "  %3d:\t0x%08x\t%s\n", m_cnt, d, name );
-
+
-    m_string += result;
-    free( result );
-
+
-    m_cnt += sizeof( quadlet_t );
-    return true;

trunk/libfreebob/src/libfreebobavc/avc_serialize.h

@@ -1 @@
-
-
+avc_
+,07
- *
- * This file is part of FreeBoB.

trunk/libfreebob/src/libfreebobavc/avc_signal_source.cpp

@@ -20 +20 @@
-
-#include "avc_signal_source.h"
-
+avc_
-#include "ieee1394service.h"
-

trunk/libfreebob/src/libfreebobavc/avc_subunit_info.cpp

@@ -20 +20 @@
-
-#include "avc_subunit_info.h"
-
+avc_
-#include "ieee1394service.h"
-

trunk/libfreebob/src/libfreebobavc/avc_unit_info.cpp

@@ -20 +20 @@
-
-#include "avc_unit_info.h"
-
+avc_
-#include "ieee1394service.h"
-

trunk/libfreebob/src/libutil/serialize.cpp

@@ -1 @@
-bebob_
-
+
+,07
- *
- * This file is part of FreeBoB.
@@ -19 +19 @@
- */
-
-bebob_
+
-
-using namespace std;
@@ -44 +44 @@
-/////////////////////////////////
-
-BeBoB::XMLSerialize::XMLSerialize( const char* pF
+Util::XMLSerialize::XMLSerialize( Glib::ustring f
-    : IOSerialize()
-pF
+f
-{
-    try {
@@ -56 +56 @@
-
-
-BeBoB
+Util
-{
-    try {
@@ -67 +67 @@
-
-bool
-BeBoB::XMLSerialize::write( const char* p
- 
+Util::XMLSerialize::write( std::string str
+
-
-{
-    vector<string> tokens;
-
-
+
-
-    if ( tokens.size() == 0 ) {
@@ -93 +92 @@
-
-bool
-BeBoB::XMLSerialize::write( const char* p
- 
+Util::XMLSerialize::write( std::string str
+
-{
-    vector<string> tokens;
-
-
+
-
-    if ( tokens.size() == 0 ) {
@@ -115 +113 @@
-
-xmlpp::Node*
-
+
+
-{
-    // returns the correct node on which the new element has to be added.
@@ -155 +154 @@
-/***********************************/
-
-BeBoB::XMLDeserialize::XMLDeserialize( const char* pF
+Util::XMLDeserialize::XMLDeserialize( Glib::ustring f
-    : IODeserialize()
-pF
+f
-{
-    try {
@@ -170 +169 @@
-
-
-BeBoB
-
-
-
-
-BeBoB::XMLDeserialize::read( const char* p
- 
+Util
+
+
+
+
+Util::XMLDeserialize::read( std::string str
+
-
-{
-    xmlpp::Node* pNode = m_parser.get_document()->get_root_node();
-
-p
+str
-    for ( xmlpp::NodeSet::iterator it = nodeSet.begin();
-          it != nodeSet.end();
-          ++it )
-    {
-
+
+
-        if ( pElement && pElement->has_child_text() ) {
-            char* tail;
-
+
+
-            return true;
-        }
@@ -199 +200 @@
-
-bool
-BeBoB::XMLDeserialize::read( const char* p
- 
+Util::XMLDeserialize::read( std::string str
+
-{
-    xmlpp::Node* pNode = m_parser.get_document()->get_root_node();
-
-p
+str
-    for ( xmlpp::NodeSet::iterator it = nodeSet.begin();
-          it != nodeSet.end();

trunk/libfreebob/src/libutil/serialize.h

@@ -1 @@
-bebob_
-6
+
+7
- *
- * This file is part of FreeBoB.
@@ -26 +26 @@
-#include <iostream>
-
-
-
-
-
-
+
-
-   virtual bool write( const char* pMemberName,
-                       long long value ) = 0;
-virtual bool write( const char* pMemberName,
-                   Glib::ustring str) = 0;
+class IOSerialize {
+public:
+ IOSerialize() {}
+virtual ~IOSerialize() {}
-
-
-
+
+
+
+
+
+
+
-
-    class IODeserialize {
@@ -45 +46 @@
-        virtual ~IODeserialize() {}
-
-const char* p
+std::string str
-                           long long& value ) = 0;
-const char* p
+std::string str
-                           Glib::ustring& str ) = 0;
-
-const char* p
+std::string str
-    };
-
-    class XMLSerialize: public IOSerialize {
-    public:
-const char* pF
+Glib::ustring f
-        virtual ~XMLSerialize();
-
-const char* p
+std::string str
-                            long long value );
-const char* p
+std::string str
-                            Glib::ustring str);
-    private:
@@ -66 +67 @@
-        xmlpp::Document  m_doc;
-
-
+
+
-    };
-
-    class XMLDeserialize: public IODeserialize {
-    public:
-const char* pF
+Glib::ustring f
-        virtual ~XMLDeserialize();
-
-const char* p
+std::string str
-                           long long& value );
-const char* p
+std::string str
-                           Glib::ustring& str );
-    private:
@@ -84 +86 @@
-
-
-    
+
-
-
+
+
-    {
-p
+str
-    }
-
-
+
+
-    {
-       
-p
+        
+str
-        value = static_cast<T>( tmp );
-        return result;

trunk/libfreebob/src/libutil/unittests.cpp

@@ -1 @@
-bebob_
-
+
+,07
- *
- * This file is part of FreeBoB.
@@ -19 +19 @@
- */
-
-bebob_
+
-#include <libraw1394/raw1394.h>
-
-#include <stdio.h>
-
-BeBoB
+Util
-
-///////////////////////////////////////

trunk/libfreebob/src/Makefile.am

@@ -60 +60 @@
-        bebob/bebob_dl_bcd.h                            \
-        bebob/bebob_dl_bcd.cpp                          \
-        bebob/bebob_serialize.h                         \
-        bebob/bebob_serialize.cpp                       \
-        motu/motu_avdevice.cpp                          \
-        motu/motu_avdevice.h                            \
@@ -84 +82 @@
-        libfreebobavc/avc_unit_info.cpp                 \
-        libfreebobavc/ieee1394service.cpp               \
-
+avc_
-        libfreebobavc/avc_connect.h                     \
-        libfreebobavc/avc_definitions.h                 \
@@ -97 +95 @@
-        libfreebobavc/avc_unit_info.h                   \
-        libfreebobavc/ieee1394service.h                 \
-
+avc_
-        debugmodule/debugmodule.h                       \
-        debugmodule/debugmodule.cpp                     \
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-libfreebob_la_LDFLAGS =                                 \
@@ -143 +144 @@
-        maudio/fwap.xml
-
-bin_PROGRAMS = freebob_downloader freebob_sync
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
-
-test_dll_SOURCES = libutil/test-dll.cpp
-
+$(top_builddir)/src/
-
-test_debugmodule_SOURCES = debugmodule/test_debugmodule.cpp
-
+$(top_builddir)/src/
-
-
-
-
+
+
-
+test_ser_SOURCES = ser.cpp
+test_ser_LDADD = $(top_builddir)/src/libfreebob.la

trunk/libfreebob/tests/test-extplugcmd.cpp

@@ -21 +21 @@
-#include "libfreebobavc/avc_extended_plug_info.h"
-#include "libfreebobavc/avc_plug_info.h"
-
+avc_
-#include "libfreebobavc/ieee1394service.h"
-

trunk/libfreebob/tests/test-mixer.cpp

@@ -20 +20 @@
-
-#include "libfreebobavc/avc_function_block.h"
-
+avc_
-#include "libfreebobavc/ieee1394service.h"
-

trunk/libfreebob/tests/test-volume.cpp

@@ -20 +20 @@
-
-#include "libfreebobavc/avc_function_block.h"
-
+avc_
-#include "libfreebobavc/ieee1394service.h"
-