Changeset 1899

Show
Ignore:
Timestamp:
09/16/10 12:38:55 (7 years ago)
Author:
arnonym
Message:

Take a shot at fixing #233: I think it is okay to rely on streamformat==-1 (==0xff) to be safe for replacement. According to avc_extended_stream_format.h 0xff is AVC1394_STREAM_FORMAT_AM824_DONT_CARE.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/libavc/general/avc_plug.cpp

    r1765 r1899  
    128128    , m_clusterInfos( rhs.m_clusterInfos ) 
    129129    , m_formatInfos( rhs.m_formatInfos ) 
    130 // FIXME: how about the global id? 
     130    , m_globalId( rhs.m_globalId ) 
    131131{ 
    132132    if ( getDebugLevel() ) { 
     
    384384            c.m_channelInfos.push_back(ci); 
    385385        } 
    386         c.m_streamFormat = 0; // filled in later 
     386        c.m_streamFormat = -1; // filled in later 
    387387         
    388388        m_clusterInfos.push_back(c); 
     
    835835                 p->getName(), getName() ); 
    836836 
    837     if (m_clusterInfos.size()==0) { 
     837    if (m_clusterInfos.size()==0 || m_clusterInfos[0].m_streamFormat == -1) { 
    838838        m_clusterInfos=p->m_clusterInfos; 
    839839    }