Show
Ignore:
Timestamp:
11/28/07 12:02:08 (15 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/maudio/maudio_avdevice.cpp

    r587 r739  
    4040namespace MAudio { 
    4141 
    42 AvDevice::AvDevice( Ieee1394Service& ieee1394Service, 
    43                     std::auto_ptr<ConfigRom>( configRom )) 
    44     : BeBoB::AvDevice( ieee1394Service, configRom) 
     42AvDevice::AvDevice(std::auto_ptr<ConfigRom>( configRom )) 
     43    : BeBoB::AvDevice( configRom) 
    4544    , m_model ( NULL ) 
    4645{ 
    …… 
    8281 
    8382FFADODevice * 
    84 AvDevice::createDevice( Ieee1394Service& ieee1394Service, 
    85                         std::auto_ptr<ConfigRom>( configRom )) 
     83AvDevice::createDevice(std::auto_ptr<ConfigRom>( configRom )) 
    8684{ 
    87     return new AvDevice(ieee1394Service, configRom ); 
     85    return new AvDevice(configRom ); 
    8886} 
    8987 
    …… 
    9189AvDevice::discover() 
    9290{ 
    93     unsigned int vendorId = m_pConfigRom->getNodeVendorId(); 
    94     unsigned int modelId = m_pConfigRom->getModelId(); 
     91    unsigned int vendorId = getConfigRom().getNodeVendorId(); 
     92    unsigned int modelId = getConfigRom().getModelId(); 
    9593 
    9694    for ( unsigned int i = 0; 

  • trunk/libffado/src/maudio/maudio_avdevice.h

    r734 r739  
    5454class AvDevice : public BeBoB::AvDevice { 
    5555public: 
    56     AvDevice( Ieee1394Service& ieee1394Service, 
    57               std::auto_ptr<ConfigRom>( configRom )); 
     56    AvDevice(std::auto_ptr<ConfigRom>( configRom )); 
    5857    virtual ~AvDevice(); 
    5958 
    6059    static bool probe( ConfigRom& configRom ); 
    61     static FFADODevice * createDevice( Ieee1394Service& ieee1394Service, 
    62                                         std::auto_ptr<ConfigRom>( configRom )); 
     60    static FFADODevice * createDevice(std::auto_ptr<ConfigRom>( configRom )); 
    6361    virtual bool discover(); 
    6462