Show
Ignore:
Timestamp:
08/22/07 10:15:34 (17 years ago)
Author:
ppalmers
Message:

Merge echoaudio branch into trunk.

This adds support for the Echo Audiofire devices to FFADO. Possibly also other devices working with the Apple Class Driver will work with this code. It is not fully complete yet, but the main rework is
done.

First of all the IAvDevice class/interface is renamed to FFADODevice, in order to separate the AV/C code from the FFADO API code. A device supported by FFADO implements a FFADODevice.

The BeBoB device has been split up into three groups:
- libavc/* : all code and commands that are specified by AV/C specs. Note that a lot of the code that used to be in BeBoB::AvDevice? now resides in AVC::Unit
- genericavc/* : a FFADODevice that uses AV/C descriptors & commands for discovery and config
- bebob/* : the bebob FFADODevice that inherits from GenericAVC::AvDevice? but that uses BridgeCo? commands for discovery

Everything has been moved as high as possible in the class hierarchy. If necessary, a subclass that uses device specific commands is introduced (e.g. BeBoB::Plug inherits from AVC::Plug and uses the
BridgeCo? extended plug info command to discover it's properties).

There are some other fixes along the way that have been done too.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/metrichalo/mh_avdevice.cpp

    r479 r554  
    5353                    Ieee1394Service& ieee1394service, 
    5454                    int nodeId ) 
    55     :  IAvDevice( configRom, ieee1394service, nodeId ) 
     55    :  FFADODevice( configRom, ieee1394service, nodeId ) 
    5656    , m_model( NULL ) 
    5757 
     
    125125 
    126126bool 
    127 MHAvDevice::setSamplingFrequency( ESamplingFrequency samplingFrequency ) 
     127MHAvDevice::setSamplingFrequency( int samplingFrequency ) 
    128128{ 
    129129 
  • trunk/libffado/src/metrichalo/mh_avdevice.h

    r516 r554  
    2525#define MHDEVICE_H 
    2626 
    27 #include "iavdevice.h" 
     27#include "ffadodevice.h" 
    2828 
    2929#include "debugmodule/debugmodule.h" 
     
    4545}; 
    4646 
    47 class MHAvDevice : public IAvDevice { 
     47class MHAvDevice : public FFADODevice { 
    4848public: 
    4949    MHAvDevice( std::auto_ptr<ConfigRom>( configRom ), 
     
    5858    virtual void showDevice(); 
    5959 
    60     virtual bool setSamplingFrequency( ESamplingFrequency samplingFrequency ); 
     60    virtual bool setSamplingFrequency( int ); 
    6161    virtual int getSamplingFrequency( ); 
    6262