Show
Ignore:
Timestamp:
11/28/07 12:02:08 (13 years ago)
Author:
ppalmers
Message:

- Adapt the ffado external API (upgrade to v3)

NEEDS NEW JACK BACKEND

- simplify FFADODevice constructor even more
- implement first framework support for supporting multiple adapters.

currently all firewire adapters are scanned for supported devices unless specified otherwise
however attaching devices to separate adapters is not supported. using multiple adapters at
that are connected together might work.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/fireworks/fireworks_device.cpp

    r689 r739  
    4343namespace FireWorks { 
    4444 
    45 Device::Device( Ieee1394Service& ieee1394Service, 
    46                             std::auto_ptr<ConfigRom>( configRom )) 
    47     : GenericAVC::AvDevice( ieee1394Service, configRom) 
     45Device::Device(std::auto_ptr<ConfigRom>( configRom )) 
     46    : GenericAVC::AvDevice(configRom) 
    4847    , m_efc_discovery_done ( false ) 
    4948    , m_MixerContainer ( NULL ) 
     
    9190Device::discover() 
    9291{ 
    93     unsigned int vendorId = m_pConfigRom->getNodeVendorId(); 
    94     unsigned int modelId = m_pConfigRom->getModelId(); 
     92    unsigned int vendorId = getConfigRom().getNodeVendorId(); 
     93    unsigned int modelId = getConfigRom().getModelId(); 
    9594 
    9695    GenericAVC::VendorModel vendorModel( SHAREDIR "/ffado_driver_fireworks.txt" ); 
     
    128127{ 
    129128    m_efc_discovery_done = false; 
     129    m_HwInfo.setVerboseLevel(getDebugLevel()); 
    130130 
    131131    if (!doEfcOverAVC(m_HwInfo)) { 
     
    148148 
    149149FFADODevice * 
    150 Device::createDevice( Ieee1394Service& ieee1394Service, 
    151                       std::auto_ptr<ConfigRom>( configRom )) 
     150Device::createDevice(std::auto_ptr<ConfigRom>( configRom )) 
    152151{ 
    153152    unsigned int vendorId = configRom->getNodeVendorId(); 
     
    155154 
    156155    switch(vendorId) { 
    157         case FW_VENDORID_ECHO: return new ECHO::AudioFire(ieee1394Service, configRom ); 
    158         default: return new Device(ieee1394Service, configRom ); 
     156        case FW_VENDORID_ECHO: return new ECHO::AudioFire(configRom ); 
     157        default: return new Device(configRom ); 
    159158    } 
    160159} 
     
    169168 
    170169    cmd.setVerbose( getDebugLevel() ); 
    171 //     cmd.setVerbose( DEBUG_LEVEL_VERY_VERBOSE ); 
    172  
    173170    cmd.m_cmd = &c; 
    174  
    175 //     c.showEfcCmd(); 
    176171 
    177172    if ( !cmd.fire()) { 
     
    180175        return false; 
    181176    } 
    182 //     c.showEfcCmd(); 
    183177 
    184178    if ( cmd.getResponse() != AVC::AVCCommand::eR_Accepted) {