Changeset 736

Timestamp:

11/28/07 05:36:19 (16 years ago)

Author:

ppalmers

Message:

fix some stuff that was not merged correctly

Files:

• trunk/libffado/SConstruct (modified) (4 diffs)
• trunk/libffado/src/bebob/bebob_avdevice_subunit.cpp (modified) (5 diffs)
• trunk/libffado/src/bebob/bebob_functionblock.cpp (modified) (3 diffs)
• trunk/libffado/src/bebob/bebob_functionblock.h (modified) (2 diffs)
• trunk/libffado/src/genericavc/avc_avdevice.cpp (modified) (1 diff)
• trunk/libffado/src/libavc/audiosubunit/avc_audiosubunit.h (modified) (1 diff)
• trunk/libffado/src/libavc/general/avc_plug.cpp (modified) (5 diffs)
• trunk/libffado/src/libavc/general/avc_plug.h (modified) (5 diffs)
• trunk/libffado/src/libavc/general/avc_subunit.cpp (modified) (7 diffs)
• trunk/libffado/src/libavc/general/avc_subunit.h (modified) (2 diffs)
• trunk/libffado/src/libavc/general/avc_unit.cpp (modified) (3 diffs)
• trunk/libffado/src/libavc/musicsubunit/avc_musicsubunit.cpp (modified) (10 diffs)
• trunk/libffado/src/libieee1394/configrom.cpp (modified) (3 diffs)

trunk/libffado/SConstruct

@@ -62 +62 @@
-        buildenv['PKG_CONFIG_PATH']=''
-
+if os.environ.has_key('LD_LIBRARY_PATH'):
+        buildenv['LD_LIBRARY_PATH']=os.environ['LD_LIBRARY_PATH']
+else:
+        buildenv['LD_LIBRARY_PATH']=''
+
-
-env = Environment( tools=['default','scanreplace','pyuic','dbus','doxygen','pkgconfig'], toolpath=['admin'], ENV = buildenv, options=opts )
@@ -92 +97 @@
-opts.Save( 'cache/' + build_base + "options.cache", env )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-tests.update( env['PKGCONFIG_TESTS'] )
-
@@ -154 +148 @@
-        # Optional checks follow:
-        #
-        env['PYUIC'] = conf.CheckForApp( 'pyuic' )
-        env['ALSA_SEQ_OUTPUT'] = conf.CheckLib( 'asound', symbol='snd_seq_event_output_direct', autoadd=0 )
-
@@ -197 +190 @@
-env['sharedir'] = Template( os.path.join( env['SHAREDIR'] ) ).safe_substitute( env )
-
+env.Command( target=env['sharedir'], source="", action=Mkdir( env['sharedir'] ) )
+
-env.Alias( "install", env['libdir'] )
-env.Alias( "install", env['includedir'] )

trunk/libffado/src/bebob/bebob_avdevice_subunit.cpp

@@ -82 +82 @@
-{
-    debugOutput(DEBUG_LEVEL_NORMAL, "Discovering %s...\n", getName());
-
+
-    // discover the AV/C generic part
-    if ( !AVC::SubunitAudio::discover() ) {
@@ -160 +160 @@
-#ifdef DEBUG
-    if ((int)getDebugLevel() >= DEBUG_LEVEL_NORMAL) {
-
+
-        for ( FunctionBlockVector::iterator it = m_functions.begin();
-            it != m_functions.end();
@@ -340 +340 @@
-bool
-BeBoB::SubunitAudio::serializeChild( Glib::ustring basePath,
-        
+
-{
-    bool result = true;
@@ -363 +363 @@
-bool
-BeBoB::SubunitAudio::deserializeChild( Glib::ustring basePath,
-        
-        
+
+
-{
-    int i = 0;
@@ -426 +426 @@
-{
-    debugOutput(DEBUG_LEVEL_NORMAL, "Discovering %s...\n", getName());
-
+
-    // discover the AV/C generic part
-    if ( !AVC::SubunitMusic::discover() ) {

trunk/libffado/src/bebob/bebob_functionblock.cpp

@@ -160 +160 @@
-
-bool
-serializePlugVector( Glib::ustring basePath,
-                       Util::IOSerialize& ser,
-                       const PlugVector& vec )
-{
-    bool result = true;
-    int i = 0;
-    for ( PlugVector::const_iterator it = vec.begin();
-          it != vec.end();
-          ++it )
-    {
-        std::ostringstream strstrm;
-        strstrm << basePath << i;
-        result &= ser.write( strstrm.str(), ( *it )->getGlobalId() );
-        i++;
-    }
-    return result;
-}
-
-bool
-deserializePlugVector( Glib::ustring basePath,
-                         Util::IODeserialize& deser,
-                         AVC::Unit& unit,
-                         PlugVector& vec )
-{
-    int i = 0;
-    bool bFinished = false;
-    bool result = true;
-    do {
-        plug_id_t plugId;
-        std::ostringstream strstrm;
-        strstrm << basePath << i;
-
-        if ( deser.isExisting( strstrm.str() ) ) {
-            result &= deser.read( strstrm.str(), plugId );
-            AVC::Plug* pPlug = unit.getPlugManager().getPlug( plugId );
-
-            if ( result && pPlug ) {
-                vec.push_back( pPlug );
-                i++;
-            } else {
-                bFinished = true;
-            }
-        } else {
-            bFinished = true;
-        }
-    } while ( !bFinished );
-
-    return result;
-}
-
-bool
-FunctionBlock::serialize( Glib::ustring basePath, Util::IOSerialize& ser ) const
-{
@@ -229 +178 @@
-FunctionBlock*
-FunctionBlock::deserialize( Glib::ustring basePath,
-       
-       
-       
+
+
+
-{
-    bool result;
@@ -278 +227 @@
-    result &= deser.read( basePath + "m_nrOfOutputPlugs", pFB->m_nrOfOutputPlugs );
-    result &= deser.read( basePath + "m_verbose", pFB->m_verbose );
-
+
+
-
-    return 0;

trunk/libffado/src/bebob/bebob_functionblock.h

@@ -69 +69 @@
-
-    virtual const char* getName() = 0;
-
+
-    AVC::function_block_type_t getType() {return m_type;};
-    AVC::function_block_type_t getSubtype() {return m_subtype;};
-    AVC::function_block_id_t getId() {return m_id;};
-
+
-    AVC::no_of_input_plugs_t getNrOfInputPlugs() {return m_nrOfInputPlugs;};
-    AVC::no_of_output_plugs_t getNrOfOutputPlugs() {return m_nrOfOutputPlugs;};
-
-    bool serialize( Glib::ustring basePath, Util::IOSerialize& ser ) const;
+
-    static FunctionBlock* deserialize( Glib::ustring basePath,
-                       Util::IODeserialize& deser,
@@ -144 +145 @@
-
-    virtual const char* getName();
-
+
-    // FIXME: this is not pretty!
-    enum EControlSelectorEncoding {

trunk/libffado/src/genericavc/avc_avdevice.cpp

@@ -236 +236 @@
-        bool found=false;
-        for ( PlugVector::const_iterator it2 = syncMSUInputPlugs.begin();
-
-
+  
+  
-        {
-            AVC::Plug* msuPlug = *it2;

trunk/libffado/src/libavc/audiosubunit/avc_audiosubunit.h

@@ -52 +52 @@
-protected:
-    virtual bool serializeChild( Glib::ustring basePath,
-return false;};
+ return true; }
-    virtual bool deserializeChild( Glib::ustring basePath,
-                                   Util::IODeserialize& deser,
-return false;};
+ return true; }
-
-};

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

@@ -1576 +1576 @@
-}
-
-
-bool
-Plug::serializePlugVector( Glib::ustring basePath,
-                           Util::IOSerialize& ser,
-                           const PlugVector& vec) const
-{
-    bool result = true;
-    int i = 0;
-    for ( PlugVector::const_iterator it = vec.begin();
-          it != vec.end();
-          ++it )
-    {
-        const Plug* pPlug = *it;
-        std::ostringstream strstrm;
-        strstrm << basePath << i;
-
-        result &= ser.write( strstrm.str() + "/global_id", pPlug->getGlobalId() );
-        i++;
-    }
-    return result;
-}
-
-bool
-Plug::deserializePlugVector( Glib::ustring basePath,
-                             Util::IODeserialize& deser,
-                             PlugVector& vec )
-{
-    int i = 0;
-    bool bFinished = false;
-    bool result = true;
-    do {
-        std::ostringstream strstrm;
-        strstrm << basePath << i;
-
-        // check for one element to exist. when one exist the other elements
-        // must also be there. otherwise just return (last) result.
-        if ( deser.isExisting( strstrm.str() + "/global_id" ) ) {
-            unsigned int iPlugId;
-            result &= deser.read( strstrm.str() + "/global_id", iPlugId );
-
-            if ( result ) {
-                Plug* pPlug = m_unit->getPlugManager().getPlug( iPlugId );
-                if ( pPlug ) {
-                    vec.push_back( pPlug );
-                } else {
-                    result = false;
-                    bFinished = true;
-                }
-                i++;
-            } else {
-                bFinished = true;
-            }
-        } else {
-            bFinished = true;
-        }
-    } while ( !bFinished );
-
-    return result;
-}
-
-bool
-Plug::serialize( Glib::ustring basePath, Util::IOSerialize& ser ) const
@@ -1683 +1623 @@
-    bool result=true;
-
-
-
-
-
-
-
+
+
-    result &= deser.read( basePath + "m_functionBlockType", pPlug->m_functionBlockType );
-    result &= deser.read( basePath + "m_functionBlockId", pPlug->m_functionBlockId );
@@ -1718 +1654 @@
-bool
-Plug::deserializeUpdate( Glib::ustring basePath,
-  
+
-{
-    bool result;
-
-
-
+
+
+
+
-
-    return result;
+}
+
+bool
+Plug::deserializeUpdateSubunit()
+{
+    m_subunit = m_unit->getSubunit( m_subunitType, m_subunitId );
+    return true;
-}
-
@@ -2205 +2150 @@
-}
-
+bool
+PlugManager::deserializeUpdate()
+{
+    bool result = true;
+
+    for ( PlugVector::const_iterator it = m_plugs.begin();
+          it !=  m_plugs.end();
+          ++it )
+    {
+        Plug* pPlug = *it;
+
+        result &= pPlug->deserializeUpdateSubunit();
+    }
+
+    return result;
+}
-
-////////////////////////////////////
@@ -2339 +2300 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -163 +163 @@
-    bool deserializeUpdate( Glib::ustring basePath,
-                            Util::IODeserialize& deser );
+    bool deserializeUpdateSubunit();
-
- public:
@@ -256 +257 @@
-    bool deserializeFormatInfos( Glib::ustring basePath,
-                                 Util::IODeserialize& deser );
-
-    bool serializePlugVector( Glib::ustring basePath,
-                              Util::IOSerialize& ser,
-                              const PlugVector& vec) const;
-    bool deserializePlugVector( Glib::ustring basePath,
-                                Util::IODeserialize& deser,
-                                PlugVector& vec );
-
-protected:
@@ -285 +279 @@
-    Unit*                       m_unit;
-    Subunit*                    m_subunit;
+    ESubunitType                m_subunitType;
+    subunit_t                   m_subunitId;
-    function_block_type_t       m_functionBlockType;
-    function_block_id_t         m_functionBlockId;
@@ -349 +345 @@
-    bool tidyPlugConnections(PlugConnectionVector&);
-
+    bool deserializeUpdate();
+
-private:
-
@@ -379 +377 @@
-typedef std::vector<PlugConnection> PlugConnectionOwnerVector;
-
+
+bool serializePlugVector( Glib::ustring basePath,
+                          Util::IOSerialize& ser,
+                          const PlugVector& vec);
+
+bool deserializePlugVector( Glib::ustring basePath,
+                            Util::IODeserialize& deser,
+                            const PlugManager& plugManager,
+                            PlugVector& vec );
+
-}
-

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

@@ -107 +107 @@
-{
-    debugOutput(DEBUG_LEVEL_NORMAL, "Discovering plugs...\n");
-
+
-    PlugInfoCmd plugInfoCmd( getUnit().get1394Service(),
-                             PlugInfoCmd::eSF_SerialBusIsochronousAndExternalPlug );
@@ -147 +147 @@
-{
-    debugOutput(DEBUG_LEVEL_NORMAL, "Discovering connections...\n");
-
+
-    for ( PlugVector::iterator it = getPlugs().begin();
-          it != getPlugs().end();
@@ -183 +183 @@
-            return false;
-        }
-
+
-        plug->setVerboseLevel(getDebugLevel());
-
+
-        if ( !plug->discover() ) {
-            debugError( "plug discover failed\n" );
@@ -232 +232 @@
-bool
-Subunit::serialize( Glib::ustring basePath,
-               
+
-{
-    bool result;
@@ -239 +239 @@
-    result &= ser.write( basePath + "m_sbId", m_sbId );
-    result &= ser.write( basePath + "m_verboseLevel", getDebugLevel() );
+    result &= serializePlugVector( basePath + "m_plugs", ser, m_plugs );
-    result &= serializeChild( basePath, ser );
-
@@ -259 +260 @@
-
-    Subunit* pSubunit = 0;
-
+
-    #warning FIXME: The derived class should be creating these
-    // FIXME: The derived class should be creating these, such that discover() can become pure virtual
@@ -280 +281 @@
-    pSubunit->m_sbType = sbType;
-    result &= deser.read( basePath + "m_sbId", pSubunit->m_sbId );
+    result &= deserializePlugVector( basePath + "m_plugs", deser,
+                                     unit.getPlugManager(), pSubunit->m_plugs );
-    int verboseLevel;
-    result &= deser.read( basePath + "m_verboseLevel", verboseLevel );

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

@@ -73 +73 @@
-
-    PlugVector& getPlugs()
-    
+       
-    Plug* getPlug(Plug::EPlugDirection direction, plug_id_t plugId);
-
@@ -80 +80 @@
-    bool serialize( Glib::ustring basePath, Util::IOSerialize& ser ) const;
-    static Subunit* deserialize( Glib::ustring basePath,
-                    
+                               
- protected:
-    Subunit();

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

@@ -975 +975 @@
-    result  = ser.write( basePath + "m_verboseLevel_unit", getDebugLevel() );
-    result &= serializeVector( basePath + "Subunit", ser, m_subunits );
-
-
+Plug
+Plug
-    result &= serializeVector( basePath + "PlugConnection", ser, m_plugConnections );
-    result &= m_pPlugManager->serialize( basePath + "Plug", ser ); // serialize all av plugs
@@ -1007 +1007 @@
-    setDebugLevel( verboseLevel );
-
- 
+
-
-    if (m_pPlugManager)
@@ -1017 +1017 @@
-        return false;
-
-
-
-
-
-
-
-
+
+
-    result &= deserializeVector<PlugConnection>( basePath + "PlugConnnection", deser, *this, m_plugConnections );
-    result &= deserializeVector<Subunit>( basePath + "Subunit",  deser, *this, m_subunits );
-    result &= deserializeSyncInfoVector( basePath + "SyncInfo", deser, m_syncInfos );
-
+    result &= deserializePlugUpdateConnections( basePath + "PcrPlug", deser, m_pcrPlugs );
+    result &= deserializePlugUpdateConnections( basePath + "ExternalPlug", deser, m_externalPlugs );
+    m_pPlugManager->deserializeUpdate();
+
-    unsigned int i;
-    result &= deser.read( basePath + "m_activeSyncInfo", i );

trunk/libffado/src/libavc/musicsubunit/avc_musicsubunit.cpp

@@ -63 +63 @@
-{
-    debugOutput(DEBUG_LEVEL_NORMAL, "Discovering %s...\n", getName());
-
+
-    // discover the AV/C generic part
-    if ( !Subunit::discover() ) {
-        return false;
-    }
-
+
-    // now we have the subunit plugs
-
+
-    return true;
-}
@@ -79 +79 @@
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Loading info from descriptor for plug: \n");
-    bool result=true;
-
+
-    // load the descriptor (if not already loaded)
-    if (m_status_descriptor != NULL) {
-        result &= m_status_descriptor->load();
-    }
-
+
-    AVCMusicSubunitPlugInfoBlock *info;
-    info = m_status_descriptor->getSubunitPlugInfoBlock(plug.getDirection(), plug.getPlugId());
-
+
-    if (info == NULL) {
-        debugError("Could not find plug info block\n");
-        return false;
-    }
-
+
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Found plug: %s\n",info->getName().c_str());
-
+
-    // plug name
-    result &= plug.setName(info->getName());
-
+
-    // plug type
-    switch (info->m_plug_type) {
@@ -119 +119 @@
-            break;
-    }
-
+
-    // number of channels
-    result &= plug.setNrOfChannels(info->m_nb_channels);
-
+
-    int idx=1;
-    for ( AVCMusicClusterInfoBlockVectorIterator it = info->m_Clusters.begin();
-
-
+    
+    
-    {
-        struct Plug::ClusterInfo cinfo;
-
+
-        AVCMusicClusterInfoBlock *c=(*it);
-
+
-        cinfo.m_index=idx; //FIXME: is this correct?
-        cinfo.m_portType=c->m_port_type;
@@ -141 +141 @@
-            cinfo.m_index, cinfo.m_portType, cinfo.m_nrOfChannels, cinfo.m_streamFormat, cinfo.m_name.c_str());
-
- 
-
-
-
+
+    
+  
+  
-        {
-            struct AVCMusicClusterInfoBlock::sSignalInfo s=(*sig_it);
-            struct Plug::ChannelInfo sinfo;
-
+
-            sinfo.m_streamPosition=s.stream_position;
-            sinfo.m_location=s.stream_location;
-
+
-            AVCMusicPlugInfoBlock *mplug=m_status_descriptor->getMusicPlugInfoBlock(s.music_plug_id);
-
+
-            if (mplug==NULL) {
-                debugWarning("No music plug found for this signal\n");
@@ -160 +160 @@
-                sinfo.m_name=mplug->getName();
-            }
-
+
-            if (plug.getDirection() == Plug::eAPD_Input) {
- 
+
-                // so we have to check the source field of the music plug
-                if(s.stream_position != mplug->m_source_stream_position) {
@@ -177 +177 @@
-                }
-            } else if (plug.getDirection() == Plug::eAPD_Output) {
- 
+
-                // so we have to check the destination field of the music plug
-                if(s.stream_position != mplug->m_dest_stream_position) {
@@ -194 +194 @@
-                debugWarning("Invalid plug direction.\n");
-            }
-
+
-            debugOutput(DEBUG_LEVEL_VERBOSE, "Adding signal pos=%2d loc=%2d name=%s\n",
-                sinfo.m_streamPosition, sinfo.m_location, mplug->getName().c_str());
-
+
-            cinfo.m_channelInfos.push_back(sinfo);
-        }
@@ -204 +204 @@
-        plug.getClusterInfos().push_back(cinfo);
-    }
-
-
+
+
-    return result;
-
@@ -239 +239 @@
-bool
-SubunitMusic::serializeChild( Glib::ustring basePath,
-               
+
-{
-    return true;
@@ -246 +246 @@
-bool
-SubunitMusic::deserializeChild( Glib::ustring basePath,
-               
-               
+
+
-{
-    return true;

trunk/libffado/src/libieee1394/configrom.cpp

@@ -64 +64 @@
-    , m_1394Service( &ieee1394service )
-    , m_nodeId( nodeId )
-
+ // FIXME: this does not seem veryu
-    , m_guid( 0 )
-    , m_vendorName( "" )
@@ -91 +91 @@
-    , m_1394Service( 0 )
-    , m_nodeId( -1 )
-
+ // FIXME: this does not seem veryu
-    , m_guid( 0 )
-    , m_vendorName( "" )
@@ -292 +292 @@
-                if ( m_unit_specifier_id == 0x0000a02d ) // XXX
-                {
-
+
+
-                        m_avcDevice = true;
-                    }