Changeset 516

Timestamp:

08/10/07 12:07:16 (16 years ago)

Author:

wagi

Message:

- some de/serialing bugs found and fixed
- caching enabled for bebob devices

(finally online again! big thanks to my free wireless internet provider. s/he is finally back from
her/his holiday :)

Files:

• trunk/libffado/src/bebob/bebob_avdevice.cpp (modified) (7 diffs)
• trunk/libffado/src/bebob/bebob_avdevice.h (modified) (2 diffs)
• trunk/libffado/src/bebob/bebob_avdevice_subunit.cpp (modified) (3 diffs)
• trunk/libffado/src/bebob/bebob_avplug.cpp (modified) (3 diffs)
• trunk/libffado/src/bebob/bebob_functionblock.cpp (modified) (1 diff)
• trunk/libffado/src/bounce/bounce_avdevice.h (modified) (1 diff)
• trunk/libffado/src/devicemanager.cpp (modified) (7 diffs)
• trunk/libffado/src/devicemanager.h (modified) (1 diff)
• trunk/libffado/src/dice/dice_avdevice.h (modified) (2 diffs)
• trunk/libffado/src/iavdevice.h (modified) (1 diff)
• trunk/libffado/src/libutil/OptionContainer.cpp (modified) (1 diff)
• trunk/libffado/src/libutil/serialize.cpp (modified) (10 diffs)
• trunk/libffado/src/libutil/serialize.h (modified) (5 diffs)
• trunk/libffado/src/maudio/maudio_avdevice.h (modified) (2 diffs)
• trunk/libffado/src/metrichalo/mh_avdevice.h (modified) (2 diffs)
• trunk/libffado/src/motu/motu_avdevice.h (modified) (2 diffs)
• trunk/libffado/src/rme/rme_avdevice.h (modified) (2 diffs)
• trunk/libffado/src/ser.cpp (modified) (1 diff)

trunk/libffado/src/bebob/bebob_avdevice.cpp

@@ -792 +792 @@
-
-int
-
+
+
-    AvPlug* inputPlug = getPlugById( m_pcrPlugs, AvPlug::eAPD_Input, 0 );
-    if ( !inputPlug ) {
@@ -814 +815 @@
-
-int
-
-
-*m_p
+ Ieee1394Service& ieee1394Service, int nodeId 
+
+ieee
-    UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR,
-m_
+
-    extStreamFormatCmd.setPlugAddress( PlugAddress( PlugAddress::ePD_Input,
-                                                    PlugAddress::ePAM_Unit,
-                                                    unitPlugAddress ) );
-
-m_
+
-    extStreamFormatCmd.setCommandType( AVCCommand::eCT_Status );
-    extStreamFormatCmd.setVerbose( true );
@@ -848 +849 @@
-
-int
-
-
-
+
+
+
+
+
-    UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR,
-m_
+
-    extPlugInfoCmd.setPlugAddress( PlugAddress( ePlugDirection,
-                                                PlugAddress::ePAM_Unit,
-                                                unitPlugAddress ) );
-m_
+
-    extPlugInfoCmd.setCommandType( AVCCommand::eCT_Status );
-    extPlugInfoCmd.setVerbose( true );
@@ -883 +886 @@
-
-int
-
-
-
+
+
+
+
-    SignalUnitAddress signalUnitAddr;
-    signalUnitAddr.m_plugId = 0x01;
-    signalSourceCmd.setSignalDestination( signalUnitAddr );
-m_
+
-    signalSourceCmd.setSubunitType( AVCCommand::eST_Unit  );
-    signalSourceCmd.setSubunitId( 0xff );
@@ -919 +923 @@
-
-int
-
+ Ieee1394Service& ieee1394Service, int nodeId 
-{
-    // create a unique configuration id.
-    int id = 0;
-
-
-
-
+ ieee1394Service, nodeId 
+ieee1394Service, nodeId, 
+ieee1394Service, nodeId, 
+ ieee1394Service, nodeId 
-
-    return id;
@@ -1526 +1530 @@
-        Glib::ustring description;
-
-
-
-
+
+
+
+
+
+
+
-
-        if ( result ) {
@@ -1600 +1608 @@
-                       Ieee1394Service& ieee1394Service )
-{
-
-    ConfigRom *configRom =
-        ConfigRom::deserialize( basePath + "m_pConfigRom/", deser, ieee1394Service );

trunk/libffado/src/bebob/bebob_avdevice.h

@@ -69 +69 @@
-
-    static bool probe( ConfigRom& configRom );
+    static int getConfigurationId( Ieee1394Service& ieee1394Service, int nodeId );
-    virtual bool discover();
-
-    virtual bool setSamplingFrequency( ESamplingFrequency samplingFrequency );
-    virtual int getSamplingFrequency( );
-    virtual int getConfigurationId( );
-
-    virtual int getStreamCount();
@@ -174 +174 @@
-                                           AvDevice& avDevice,
-                                           SyncInfoVector& vec );
-
-
-
+
+
+
+
+
+
-
-protected:

trunk/libffado/src/bebob/bebob_avdevice_subunit.cpp

@@ -211 +211 @@
-    bool result;
-    AVCCommand::ESubunitType sbType;
+
+    if ( !deser.isExisting( basePath + "m_sbType" ) ) {
+        return 0;
+    }
+
-    result  = deser.read( basePath + "m_sbType", sbType );
-
@@ -271 +276 @@
-{
-    debugOutput(DEBUG_LEVEL_NORMAL, "Discovering Audio Subunit...\n");
-
+
-    if ( !AvDeviceSubunit::discover() ) {
-        return false;
@@ -347 +352 @@
-#ifdef DEBUG
-    if (getDebugLevel() >= DEBUG_LEVEL_NORMAL) {
-
+
-        for ( FunctionBlockVector::iterator it = m_functions.begin();
-            it != m_functions.end();

trunk/libffado/src/bebob/bebob_avplug.cpp

@@ -1713 +1713 @@
-                     AvPlugManager& plugManager )
-{
+    if ( !deser.isExisting( basePath + "m_subunitType" ) ) {
+        return 0;
+    }
+
-    AvPlug* pPlug = new AvPlug;
-    if ( !pPlug ) {
@@ -1981 +1985 @@
-                    strstrm << plug->getFunctionBlockType();
-            }
-
+
-            if ( plug->getPlugDirection() == AvPlug::eAPD_Input ) {
-                printf( "\t\"(%d) %s\" -> \"(%s, ID %d)\"\n",
@@ -2213 +2217 @@
-                               AvDevice& avDevice )
-{
+    if ( !deser.isExisting( basePath + "m_srcPlug" ) ) {
+        return 0;
+    }
+
-    AvPlugConnection* pConnection = new AvPlugConnection;
-    if ( !pConnection ) {

trunk/libffado/src/bebob/bebob_functionblock.cpp

@@ -188 +188 @@
-        strstrm << basePath << i;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        } else {
-            bFinished = true;

trunk/libffado/src/bounce/bounce_avdevice.h

@@ -75 +75 @@
-
-    static bool probe( ConfigRom& configRom );
+    static int getConfigurationId( );
-    virtual bool discover();
-
-    virtual bool setSamplingFrequency( ESamplingFrequency samplingFrequency );
-    virtual int getSamplingFrequency( );
-    virtual int getConfigurationId( );
-
-    virtual bool prepare();

trunk/libffado/src/devicemanager.cpp

@@ -216 +216 @@
-                // such this case and we can safely skip it. But it might
-                // be there is a real software problem on our side.
-
+e
-                debugOutput( DEBUG_LEVEL_NORMAL,
-                             "Could not read config rom from device (node id %d). "
@@ -224 +224 @@
-            }
-
-
-
+
+
+
+
+
+
+
+
+
-            if ( avDevice ) {
-                debugOutput( DEBUG_LEVEL_NORMAL,
-iscover: d
+
-                             nodeId );
-
-                avDevice->setVerboseLevel( m_verboseLevel );
-
-
-
-
-
+
+
+
+
+
+
-                }
-
@@ -256 +265 @@
-                if ( m_verboseLevel >= DEBUG_LEVEL_VERBOSE ) {
-                    avDevice->showDevice();
+                }
+
+                if ( !isFromCache ) {
+                    if ( !saveCache( avDevice ) ) {
+                        debugWarning( "Could not create cached version of AVC model\n" );
+                    }
-                }
-
@@ -291 +306 @@
-        if ( avDevice ) {
-            debugOutput( DEBUG_LEVEL_NORMAL,
-iscover: d
+
-                         nodeId );
-
@@ -297 +312 @@
-
-            if ( !avDevice->discover() ) {
-discover: 
+
-                delete avDevice;
-                return false;
@@ -542 +557 @@
-
-    char* configId;
-
+
+
-    if ( !configId ) {
-        debugError( "Could not create id string\n" );
@@ -552 +568 @@
-
-    Util::XMLSerialize ser( sFileName );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/libffado/src/devicemanager.h

@@ -70 +70 @@
-
-    bool buildCache();
-bool loadCache( Glib::ustring cachePath = ""
+IAvDevice* loadFromCache( const ConfigRom& configRom
-
-    Streaming::StreamProcessor *getSyncSource();

trunk/libffado/src/dice/dice_avdevice.h

@@ -62 +62 @@
-
-    static bool probe( ConfigRom& configRom );
+    static int getConfigurationId( );
-    virtual bool discover();
-
@@ -68 +69 @@
-    virtual bool setSamplingFrequency( ESamplingFrequency samplingFrequency );
-    virtual int getSamplingFrequency( );
-    virtual int getConfigurationId( );
-
-    virtual int getStreamCount();

trunk/libffado/src/iavdevice.h

@@ -75 +75 @@
-     */
-    virtual int getSamplingFrequency( ) = 0;
-
-    /**
-     * @brief get a unique configuration identifier for current device setup
-     *
-     * Since each different setup (such as different sample frequency)
-     * can change the corresponding AV/C model, it is necessary to 
-     * distinguish between those models in case where caching of 
-     * AV/C models is enabled.
-     *
-     * @return a unique configuration identifier as integer
-     */
-    virtual int getConfigurationId( ) = 0;
-
-    /**

trunk/libffado/src/libutil/OptionContainer.cpp

@@ -445 +445 @@
-        strstrm << basePath << "/" << "Option" << i;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        } else {
-            bFinished = true;

trunk/libffado/src/libutil/serialize.cpp

@@ -47 +47 @@
-/////////////////////////////////
-
+IMPL_DEBUG_MODULE( Util::XMLSerialize,   XMLSerialize,   DEBUG_LEVEL_NORMAL );
+IMPL_DEBUG_MODULE( Util::XMLDeserialize, XMLDeserialize, DEBUG_LEVEL_NORMAL );
+
-Util::XMLSerialize::XMLSerialize( Glib::ustring fileName )
-    : IOSerialize()
-    , m_filepath( fileName )
+    , m_verboseLevel( 0 )
-{
-    try {
@@ -58 +62 @@
-}
-
+
+Util::XMLSerialize::XMLSerialize( Glib::ustring fileName, int verboseLevel )
+    : IOSerialize()
+    , m_filepath( fileName )
+    , m_verboseLevel( verboseLevel )
+{
+    try {
+        m_doc.create_root_node( "ffado_cache" );
+    } catch ( const exception& ex ) {
+        cout << "Exception caught: " << ex.what();
+    }
+}
-
-Util::XMLSerialize::~XMLSerialize()
@@ -74 +90 @@
-
-{
+    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "write %s = %d\n",
+                 strMemberName.c_str(), value );
+
-    vector<string> tokens;
-    tokenize( strMemberName, tokens, "/" );
-
-    if ( tokens.size() == 0 ) {
+        debugWarning( "token size is 0\n" );
-        return false;
-    }
@@ -98 +118 @@
-                           Glib::ustring str)
-{
+    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "write %s = %s\n",
+                 strMemberName.c_str(), str.c_str() );
+
-    vector<string> tokens;
-    tokenize( strMemberName, tokens, "/" );
-
-    if ( tokens.size() == 0 ) {
+        debugWarning( "token size is 0\n" );
-        return false;
-    }
@@ -160 +184 @@
-    : IODeserialize()
-    , m_filepath( fileName )
+    , m_verboseLevel( 0 )
-{
-    try {
@@ -171 +196 @@
-}
-
+Util::XMLDeserialize::XMLDeserialize( Glib::ustring fileName, int verboseLevel )
+    : IODeserialize()
+    , m_filepath( fileName )
+    , m_verboseLevel( verboseLevel )
+{
+    try {
+        m_parser.set_substitute_entities(); //We just want the text to
+                                            //be resolved/unescaped
+                                            //automatically.
+        m_parser.parse_file( m_filepath );
+    } catch ( const exception& ex ) {
+        cout << "Exception caught: " << ex.what();
+    }
+}
-
-Util::XMLDeserialize::~XMLDeserialize()
@@ -181 +220 @@
-
-{
+    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "lookup %s\n", strMemberName.c_str() );
+
-    xmlpp::Document *pDoc=m_parser.get_document();
-    if(!pDoc) {
+        debugWarning( "no document found\n" );
-        return false;
-    }
-    xmlpp::Node* pNode = pDoc->get_root_node();
+
+    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "pNode = %s\n", pNode->get_name().c_str() );
-
-    xmlpp::NodeSet nodeSet = pNode->find( strMemberName );
@@ -198 +242 @@
-            value = strtoll( pElement->get_child_text()->get_content().c_str(),
-                             &tail, 0 );
+            debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "found %s = %d\n",
+                         strMemberName.c_str(), value );
-            return true;
-        }
-
-
-
+
+
+
+
+
-    return false;
-}
@@ -210 +258 @@
-                            Glib::ustring& str )
-{
+    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "lookup %s\n", strMemberName.c_str() );
+
-    xmlpp::Document *pDoc=m_parser.get_document();
-    if(!pDoc) {
+        debugWarning( "no document found\n" );
-        return false;
-    }
@@ -222 +273 @@
-    {
-        const xmlpp::Element* pElement = dynamic_cast< const xmlpp::Element* >( *it );
-
-
+
+
+
+
+
+
+
+
-            return true;
-        }
-
-
-
+
+
+
+
+
-    return false;
-}

trunk/libffado/src/libutil/serialize.h

@@ -24 +24 @@
-#ifndef bebob_serialize_h
-#define bebob_serialize_h
+
+#include "debugmodule/debugmodule.h"
-
-#include <libxml++/libxml++.h>
@@ -62 +64 @@
-    public:
-        XMLSerialize( Glib::ustring fileName );
+        XMLSerialize( Glib::ustring fileName, int verboseLevel );
-        virtual ~XMLSerialize();
-
@@ -71 +74 @@
-        Glib::ustring    m_filepath;
-        xmlpp::Document  m_doc;
+        int              m_verboseLevel;
+
+        DECLARE_DEBUG_MODULE;
-
-        xmlpp::Node* getNodePath( xmlpp::Node* pRootNode,
@@ -79 +85 @@
-    public:
-        XMLDeserialize( Glib::ustring fileName );
+        XMLDeserialize( Glib::ustring fileName, int verboseLevel );
-        virtual ~XMLDeserialize();
-
@@ -91 +98 @@
-        Glib::ustring    m_filepath;
-        xmlpp::DomParser m_parser;
+        int              m_verboseLevel;
+
+        DECLARE_DEBUG_MODULE;
-    };
-

trunk/libffado/src/maudio/maudio_avdevice.h

@@ -59 +59 @@
-
-    static bool probe( ConfigRom& configRom );
+    static int getConfigurationId( );
-    virtual bool discover();
-
@@ -65 +66 @@
-    virtual bool setSamplingFrequency( ESamplingFrequency samplingFrequency );
-    virtual int getSamplingFrequency( );
-    virtual int getConfigurationId( );
-
-    virtual bool prepare();

trunk/libffado/src/metrichalo/mh_avdevice.h

@@ -53 +53 @@
-
-    static bool probe( ConfigRom& configRom );
+    static int getConfigurationId();
-    virtual bool discover();
-
@@ -59 +60 @@
-    virtual bool setSamplingFrequency( ESamplingFrequency samplingFrequency );
-    virtual int getSamplingFrequency( );
-    virtual int getConfigurationId();
-
-    virtual int getStreamCount();

trunk/libffado/src/motu/motu_avdevice.h

@@ -100 +100 @@
-
-    static bool probe( ConfigRom& configRom );
+    static int getConfigurationId( );
-    virtual bool discover();
-
@@ -106 +107 @@
-    virtual bool setSamplingFrequency( ESamplingFrequency samplingFrequency );
-    virtual int getSamplingFrequency( );
-    virtual int getConfigurationId( );
-
-    virtual int getStreamCount();

trunk/libffado/src/rme/rme_avdevice.h

@@ -55 +55 @@
-
-    static bool probe( ConfigRom& configRom );
+    static int getConfigurationId( );
-    virtual bool discover();
-
@@ -61 +62 @@
-    virtual bool setSamplingFrequency( ESamplingFrequency samplingFrequency );
-    virtual int getSamplingFrequency( );
-    virtual int getConfigurationId( );
-
-    virtual int getStreamCount();

trunk/libffado/src/ser.cpp

@@ -49 +49 @@
-
-    devMgr.setVerboseLevel( 4 );
-
+
+
-}
-