Changeset 637

Timestamp:

09/09/07 05:02:46 (16 years ago)

Author:

wagi

Message:

- some code cleanup (whitespace, unnecessary ';' removed, code indention, ...)
- loadFromCache: problem identified why it doesn't work. The PCPLugs and ExternaPlugs? in
AVC::Unit are not deserialized.

Files:

• trunk/libffado/src/bebob/bebob_avdevice.cpp (modified) (1 diff)
• trunk/libffado/src/libavc/general/avc_plug.cpp (modified) (43 diffs)
• trunk/libffado/src/libavc/general/avc_plug.h (modified) (8 diffs)
• trunk/libffado/src/libavc/general/avc_unit.cpp (modified) (3 diffs)

trunk/libffado/src/bebob/bebob_avdevice.cpp

@@ -407 +407 @@
-    }
-
+    // XXX only for testing purpose here. Can be removed when loadFromCache works
+    AVC::Plug* inputPlug = getPlugById( m_pcrPlugs, Plug::eAPD_Input, 0 );
+    if ( !inputPlug ) {
+        debugError( "loadFromCache: Could not retrieve iso input plug 0\n" );
+    }
+
-    return result;
-}

trunk/libffado/src/libavc/general/avc_plug.cpp

@@ -124 +124 @@
-Plug::getSubunitType() const
-{
- 
-
-
- 
+
+
+
+
-Plug::getSubunitId() const
-{
@@ -229 +229 @@
-    // name already set
-    if (m_name != "") return true;
-
+
-    m_name = plugAddressTypeToString(getPlugAddressType());
-    m_name += " ";
@@ -256 +256 @@
-Plug::discoverChannelName()
-{
-
+
-    return true;
-}
@@ -493 +493 @@
-
-    int sourcePlugGlobalId=getSignalSource();
-
+
-    if(sourcePlugGlobalId >= 0) {
-        Plug *p=m_unit->getPlugManager().getPlug(sourcePlugGlobalId);
@@ -520 +520 @@
-            return false;
-        }
-
+
-    }
-
@@ -568 +568 @@
-        }
-    }
-
+
-    if(getPlugAddressType() == eAPA_SubunitPlug) {
-        if (getPlugDirection() != eAPD_Input) {
@@ -575 +575 @@
-        }
-    }
-
+
-    SignalSourceCmd signalSourceCmd( m_unit->get1394Service() );
-
+
-    signalSourceCmd.setNodeId( m_unit->getConfigRom().getNodeId() );
-    signalSourceCmd.setSubunitType( eST_Unit  );
@@ -587 +587 @@
-    signalSubunitAddr.m_plugId = 0xFE;
-    signalSourceCmd.setSignalSource( signalSubunitAddr );
-
+
-    setDestPlugAddrToSignalCmd( signalSourceCmd, *this );
-
@@ -605 +605 @@
-            SignalUnitAddress *usrc=dynamic_cast<SignalUnitAddress *>(src);
-            if (usrc->m_plugId & 0x80) {
- 
- 
+
+
-                        usrc->m_plugId & 0x7F );
-            } else {
- 
- 
+
+
-                        usrc->m_plugId & 0x7F );
-            }
-        } else if (dynamic_cast<SignalSubunitAddress *>(src)) {
-            SignalSubunitAddress *susrc=dynamic_cast<SignalSubunitAddress *>(src);
- 
- 
+
+
-                    eAPD_Output, susrc->m_plugId);
-        } else return -1;
-
+
-        if (p==NULL) {
-            debugError("reported signal source plug not found\n");
-            return -1;
-        }
-
+
-        return p->getGlobalId();
-    }
@@ -657 +657 @@
-}
-
- 
+
-Plug::propagateFromConnectedPlug( ) {
-
@@ -668 +668 @@
-            debugWarning("Too many input connections to propagate from, using first one.\n");
-        }
-
+
-        Plug* p = *(getInputConnections().begin());
-        return propagateFromPlug( p );
-
+
-    } else if (getDirection() == eAPD_Input) {
-        if (getOutputConnections().size()==0) {
@@ -680 +680 @@
-            debugWarning("Too many output connections to propagate from, using first one.\n");
-        }
-
+
-        Plug* p = *(getOutputConnections().begin());
-        return propagateFromPlug( p );
-
+
-    } else {
-        debugWarning("plug with undefined direction\n");
@@ -690 +690 @@
-}
-
- 
+
-Plug::propagateFromPlug( Plug *p ) {
-    debugOutput( DEBUG_LEVEL_VERBOSE,
-                 "Propagating info from plug '%s' to plug '%s'\n",
-                 p->getName(), getName() );
-
+
-    if (m_clusterInfos.size()==0) {
-        m_clusterInfos=p->m_clusterInfos;
-    }
-
+
-    m_nrOfChannels=p->m_nrOfChannels;
-
+
-    return true;
-}
@@ -742 +742 @@
-            cmd.m_fmt=0xFF;
-            cmd.m_plug=getPlugId();
-
+
-            cmd.setNodeId( m_unit->getConfigRom().getNodeId() );
-            cmd.setSubunitType( eST_Unit  );
-            cmd.setSubunitId( 0xff );
-
+
-            cmd.setCommandType( AVCCommand::eCT_Status );
-
@@ -753 +753 @@
-                return 0;
-            }
-
+
-            if (cmd.m_fmt != 0x10 ) {
-                debugWarning("Incorrect FMT response received: 0x%02X\n",cmd.m_fmt);
-            }
-
+
-            return fdfSfcToSampleRate(cmd.m_fdf[0]);
-
+
-        } else if (getPlugDirection()==eAPD_Output) {
-            OutputPlugSignalFormatCmd cmd( m_unit->get1394Service() );
@@ -766 +766 @@
-            cmd.m_fmt=0xFF;
-            cmd.m_plug=getPlugId();
-
+
-            cmd.setNodeId( m_unit->getConfigRom().getNodeId() );
-            cmd.setSubunitType( eST_Unit  );
-            cmd.setSubunitId( 0xff );
-
+
-            cmd.setCommandType( AVCCommand::eCT_Status );
-
+
-            if ( !cmd.fire() ) {
-                debugError( "output plug signal format command failed\n" );
-                return 0;
-            }
-
+
-            if (cmd.m_fmt != 0x10 ) {
-                debugWarning("Incorrect FMT response received: 0x%02X\n",cmd.m_fmt);
-            }
-
+
-            return fdfSfcToSampleRate(cmd.m_fdf[0]);
-
+
-        } else {
-            debugError("PCR plug with undefined direction.\n");
@@ -789 +789 @@
-        }
-    }
-
+
-    // fallback
-    return convertESamplingFrequency( static_cast<ESamplingFrequency>( m_samplingFrequency ) );
@@ -812 +812 @@
-            cmd.setSubunitType( eST_Unit  );
-            cmd.setSubunitId( 0xff );
-
+
-            cmd.setCommandType( AVCCommand::eCT_Control );
-
@@ -835 +835 @@
-            cmd.m_fdf[1]=0xFF;
-            cmd.m_fdf[2]=0xFF;
-
+
-            cmd.setNodeId( m_unit->getConfigRom().getNodeId() );
-            cmd.setSubunitType( eST_Unit  );
-            cmd.setSubunitId( 0xff );
-
+
-            cmd.setCommandType( AVCCommand::eCT_Control );
-
+
-            if ( !cmd.fire() ) {
-                debugError( "output plug signal format command failed\n" );
@@ -860 +860 @@
-    // fallback: BeBoB style
-    ESamplingFrequency samplingFrequency = parseSampleRate(rate);
-
+
-    ExtendedStreamFormatCmd extStreamFormatCmd(
-        m_unit->get1394Service(),
@@ -1000 +1000 @@
-bool
-Plug::addPlugConnection( PlugVector& connections,
-  
+
-
-{
@@ -1060 +1060 @@
-void
-Plug::setDestPlugAddrToSignalCmd(SignalSourceCmd& signalSourceCmd,
-  
+
-{
-    switch( plug.getSubunitType() ) {
@@ -1228 +1228 @@
-                 getNrOfStreams() );
-    debugOutput( DEBUG_LEVEL_VERBOSE, "\tIncoming connections from: ");
-
+
-    for ( PlugVector::const_iterator it = m_inputConnections.begin();
-          it != m_inputConnections.end();
@@ -1260 +1260 @@
-    function_block_type_t functionBlockType = 0xff;
-    function_block_id_t   functionBlockId   = 0xff;
-
-
+  
+  
-    plug_id_t             plugId            = 0xff;
-
@@ -1396 +1396 @@
-bool
-Plug::serializeChannelInfos( Glib::ustring basePath,
-  
-  
+
+
-{
-    bool result = true;
@@ -1419 +1419 @@
-bool
-Plug::deserializeChannelInfos( Glib::ustring basePath,
-  
-  
+
+
-{
-    int i = 0;
@@ -1455 +1455 @@
-bool
-Plug::serializeClusterInfos( Glib::ustring basePath,
-  
+
-{
-    bool result = true;
@@ -1481 +1481 @@
-bool
-Plug::deserializeClusterInfos( Glib::ustring basePath,
-  
+
-{
-    int i = 0;
@@ -1519 +1519 @@
-bool
-Plug::serializeFormatInfos( Glib::ustring basePath,
-  
+
-{
-    bool result = true;
@@ -1542 +1542 @@
-bool
-Plug::deserializeFormatInfos( Glib::ustring basePath,
-  
+
-{
-    int i = 0;
@@ -1579 +1579 @@
-bool
-Plug::serializePlugVector( Glib::ustring basePath,
-    
-    
+
+
-{
-    bool result = true;
@@ -1600 +1600 @@
-bool
-Plug::deserializePlugVector( Glib::ustring basePath,
-    
-    
+
+
-{
-    int i = 0;
@@ -1664 +1664 @@
-Plug*
-Plug::deserialize( Glib::ustring basePath,
-  
-  
-  
+
+
+
-{
-    #warning FIXME: The derived class should be creating these
@@ -1680 +1680 @@
-
-    pPlug->m_unit = &unit;
-
+
-    bool result=true;
-
+
-    ESubunitType subunitType;
-    result  = deser.read( basePath + "m_subunitType", subunitType );
@@ -1688 +1688 @@
-    result &= deser.read( basePath + "m_subunitId", subunitId );
-    pPlug->m_subunit = unit.getSubunit( subunitType, subunitType );
-
+
-    result &= deser.read( basePath + "m_functionBlockType", pPlug->m_functionBlockType );
-    result &= deser.read( basePath + "m_functionBlockId", pPlug->m_functionBlockId );
@@ -1864 +1864 @@
-        }
-        plug->getInputConnections().clear();
-
+
-        for ( PlugVector::const_iterator it =
-                  plug->getOutputConnections().begin();
@@ -1874 +1874 @@
-        plug->getOutputConnections().clear();
-    }
-
+
-    for ( PlugConnectionVector::iterator it = connections.begin();
-          it != connections.end();
@@ -1884 +1884 @@
-
-    }
-
+
-    return true;
-}
@@ -2002 +2002 @@
-                    strstrm << plug->getFunctionBlockType();
-            }
-
+
-            if ( plug->getPlugDirection() == Plug::eAPD_Input ) {
-                printf( "\t\"(%d) %s\" -> \"(%s, ID %d)\"\n",
@@ -2057 +2057 @@
-Plug*
-PlugManager::getPlug( ESubunitType subunitType,
-  
-  
-  
-  
-  
-  
+
+
+
+
+
+
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "SBT, SBID, FBT, FBID, AT, PD, ID = "
@@ -2113 +2113 @@
-PlugVector
-PlugManager::getPlugsByType( ESubunitType subunitType,
-  
-  
-  
-  
-  
-  
+
+
+
+
+
+
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "SBT, SBID, FBT, FBID, AT, PD, T = "
@@ -2173 +2173 @@
-PlugManager*
-PlugManager::deserialize( Glib::ustring basePath,
-  
-  
+
+
-
-{
@@ -2191 +2191 @@
-        // therefore we have to *this as additional argument
-        Plug* pPlug = Plug::deserialize( strstrm.str() + "/",
-    
-    
-    
+
+
+
-        if ( pPlug ) {
-            pMgr->m_plugs.push_back( pPlug );

trunk/libffado/src/libavc/general/avc_plug.h

@@ -106 +106 @@
-    ESubunitType getSubunitType() const;
-    subunit_id_t getSubunitId() const;
-
+
-    const char* getName() const
-        { return m_name.c_str(); }
-    bool setName(const char *n)
-};
+ }
-    bool setName(std::string n)
-};
+ }
-    EPlugDirection getPlugDirection() const
-        { return m_direction; }
@@ -121 +121 @@
-    int getSampleRate() const; // 22050, 24000, 32000, ...
-    bool setSampleRate( int rate );
-
+
-    int getNrOfChannels() const;
-    bool setNrOfChannels(int i);
@@ -157 +157 @@
-    bool serialize( Glib::ustring basePath, Util::IOSerialize& ser ) const;
-    static Plug* deserialize( Glib::ustring basePath,
-  
-  
-  
+
+
+
-
-    bool deserializeUpdate( Glib::ustring basePath,
@@ -195 +195 @@
-    virtual bool discoverConnections();
-    virtual bool propagateFromConnectedPlug( );
-
+
-protected:
-    virtual bool discoverPlugType();
@@ -258 +258 @@
-
-    bool serializePlugVector( Glib::ustring basePath,
-  
-  
+
+
-    bool deserializePlugVector( Glib::ustring basePath,
-  
-  
+
+
-
-protected:
@@ -320 +320 @@
-    void showPlugs() const;
-
- 
+
-        { return m_plugs.size(); };
-
@@ -332 +332 @@
-    Plug* getPlug( int iGlobalId ) const;
-    PlugVector getPlugsByType( ESubunitType subunitType,
-          
-          
-          
-          
-          
-          
+                       
+                       
+                       
+                       
+                       
+                       
-
-    bool serialize( Glib::ustring basePath, Util::IOSerialize& ser ) const;
-    static  PlugManager* deserialize( Glib::ustring basePath,
-
-
-
-
-
+
+
+
+
+
+
-    bool tidyPlugConnections(PlugConnectionVector&);
-
@@ -366 +367 @@
-    bool serialize( Glib::ustring basePath, Util::IOSerialize& ser ) const;
-    static PlugConnection* deserialize( Glib::ustring basePath,
-                                          
-                                          
+                                       
+                                       
-private:
-    PlugConnection();

trunk/libffado/src/libavc/general/avc_unit.cpp

@@ -921 +921 @@
-static bool
-deserializePlugUpdateConnections( Glib::ustring path,
-  
-  
+
+
-{
-    bool result = true;
@@ -942 +942 @@
-    result  = ser.write( basePath + "m_verboseLevel_unit", getDebugLevel() );
-    result &= serializeVector( basePath + "Subunit", ser, m_subunits );
-
+
+
+
-    result &= m_pPlugManager->serialize( basePath + "Plug", ser ); // serialize all av plugs
-    result &= serializeSyncInfoVector( basePath + "SyncInfo", ser, m_syncInfos );
@@ -982 +984 @@
-        return false;
-
-
-
+
+
+
+
+
+
+
-    result &= deserializeVector<PlugConnection>( basePath + "PlugConnnection", deser, *this, m_plugConnections );
-    result &= deserializeVector<Subunit>( basePath + "Subunit",  deser, *this, m_subunits );