Changeset 1228

Show
Ignore:
Timestamp:
05/27/08 13:32:21 (13 years ago)
Author:
ppalmers
Message:

apply fix from #119 (addresses #119)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/libffado-2.0/SConstruct

    r1226 r1228  
    2525 
    2626FFADO_API_VERSION="8" 
    27 FFADO_VERSION="1.999.34
     27FFADO_VERSION="1.999.35
    2828 
    2929import os 
  • branches/libffado-2.0/src/libavc/general/avc_plug.cpp

    r1160 r1228  
    7979    : m_unit ( rhs.m_unit ) 
    8080    , m_subunit ( rhs.m_subunit ) 
     81    , m_subunitType ( rhs.m_subunitType ) 
     82    , m_subunitId ( rhs.m_subunitId ) 
    8183    , m_functionBlockType( rhs.m_functionBlockType ) 
    8284    , m_functionBlockId( rhs.m_functionBlockId ) 
     
    8991    , m_clusterInfos( rhs.m_clusterInfos ) 
    9092    , m_formatInfos( rhs.m_formatInfos ) 
     93 
    9194{ 
    9295    if ( getDebugLevel() ) { 
     
    16721675    } 
    16731676 
     1677    // this is needed to allow for the update of the subunit pointer later on 
     1678    // in the deserializeUpdateSubunit. 
     1679    pPlug->m_subunitType = subunitType; 
     1680    pPlug->m_subunitId = subunitId; 
     1681 
    16741682    result &= deser.read( basePath + "m_infoPlugType", pPlug->m_infoPlugType ); 
    16751683    result &= deser.read( basePath + "m_nrOfChannels", pPlug->m_nrOfChannels ); 
  • branches/libffado-2.0/src/libavc/general/avc_unit.cpp

    r1203 r1228  
    827827bool Unit::setActiveSync(const SyncInfo& syncInfo) 
    828828{ 
    829     bool result = syncInfo.m_source->setConnection( *syncInfo.m_destination ); 
     829    bool result = true; 
     830 
     831    if(!syncInfo.m_source->setConnection( *syncInfo.m_destination )) { 
     832        debugWarning("Could not set sync source connection.\n"); 
     833    } 
     834 
    830835    result &= updateActiveSyncInfo(); 
    831836    return result; 
     
    10221027    result &= deserializePlugVector( basePath + "ExternalPlug", deser, 
    10231028                                     getPlugManager(), m_externalPlugs ); 
    1024     result &= deserializeVector<PlugConnection>( basePath + "PlugConnnection", deser, 
     1029    result &= deserializeVector<PlugConnection>( basePath + "PlugConnection", deser, 
    10251030                                                 *this, m_plugConnections ); 
    10261031    result &= deserializeVector<Subunit>( basePath + "Subunit",  deser, *this, m_subunits );