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/devicemanager.h

    r734 r739  
    3737 
    3838#include <vector> 
     39#include <string> 
    3940 
    4041class Ieee1394Service; 
    …… 
    4748typedef std::vector< FFADODevice* >::iterator FFADODeviceVectorIterator; 
    4849 
     50typedef std::vector< Ieee1394Service* > Ieee1394ServiceVector; 
     51typedef std::vector< Ieee1394Service* >::iterator Ieee1394ServiceVectorIterator; 
     52 
     53typedef std::vector< Functor* > FunctorVector; 
     54typedef std::vector< Functor* >::iterator FunctorVectorIterator; 
     55 
    4956class DeviceManager 
    5057    : public Util::OptionContainer, 
    …… 
    5562    ~DeviceManager(); 
    5663 
    57     bool initialize( int port ); 
     64    bool initialize(); 
    5865    bool deinitialize(); 
    5966 
    60     bool discover( ); 
     67    bool addSpecString(char *); 
     68    bool isSpecStringValid(std::string s); 
     69 
     70    bool discover(); 
    6171 
    6272    bool isValidNode( int node ); 
    …… 
    8090protected: 
    8191    FFADODevice* getDriverForDevice( std::auto_ptr<ConfigRom>( configRom ), 
    82                                    int id ); 
     92                                     int id ); 
    8393    FFADODevice* getSlaveDriver( std::auto_ptr<ConfigRom>( configRom ) ); 
    8494 
    …… 
    8696 
    8797protected: 
    88     Ieee1394Service*   m_1394Service; 
    89     FFADODeviceVector  m_avDevices; 
    90     Functor*           m_busreset_functor; 
     98    // we have one service for each port 
     99    // found on the system. We don't allow dynamic addition of ports (yet) 
     100    Ieee1394ServiceVector   m_1394Services; 
     101    FFADODeviceVector       m_avDevices; 
     102    FunctorVector           m_busreset_functors; 
     103 
     104    std::vector<std::string>          m_SpecStrings; 
    91105 
    92106// debug stuff