Changeset 264

Show
Ignore:
Timestamp:
06/15/06 09:19:04 (16 years ago)
Author:
pieterpalmers
Message:

- fixed small bug introduced by moving the configrom tests

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/libfreebob-2.0/src/devicemanager.cpp

    r262 r264  
    100100          ++nodeId ) 
    101101    { 
     102        debugOutput( DEBUG_LEVEL_VERBOSE, "Probing node %d...\n", nodeId ); 
     103     
    102104        ConfigRom configRom( m_1394Service, nodeId ); 
    103105        if ( !configRom.initialize() ) { 
     
    142144{ 
    143145    IAvDevice* avDevice; 
    144  
     146     
    145147    // All BeBob devices have predictable unit specifier/version fields 
    146148    if (configRom.getUnitSpecifierId() != BEBOB_AVCDEVICE_UNIT_SPECIFIER || 
    147         configRom.getUnitVersion() == BEBOB_AVCDEVICE_UNIT_VERSION) { 
    148         debugOutput( DEBUG_LEVEL_VERBOSE, "Not a BeBoB device...\n" ); 
     149        configRom.getUnitVersion() != BEBOB_AVCDEVICE_UNIT_VERSION) { 
     150        debugOutput( DEBUG_LEVEL_VERBOSE, "Not a BeBoB device, fails ConfigRom test...\n" ); 
    149151        return NULL; 
    150152    } 
     
    157159    if ( !avDevice->discover() ) { 
    158160        delete avDevice; 
    159         debugOutput( DEBUG_LEVEL_VERBOSE, "Not a BeBoB device...\n" ); 
     161        debugOutput( DEBUG_LEVEL_VERBOSE, "Not a BeBoB device, fails discovery...\n" ); 
    160162        return NULL; 
    161163    }