Show
Ignore:
Timestamp:
08/22/07 10:15:34 (14 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/rme/rme_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{ 
     
    128128 
    129129bool 
    130 RmeDevice::setSamplingFrequency( ESamplingFrequency samplingFrequency ) 
     130RmeDevice::setSamplingFrequency( int samplingFrequency ) 
    131131{ 
    132132/* 
    133133 * Set the RME device's samplerate. 
    134134 */ 
    135         if (samplingFrequency == eSF_48000Hz
     135        if (samplingFrequency == 48000
    136136                return true; 
    137137        return false; 
  • trunk/libffado/src/rme/rme_avdevice.h

    r516 r554  
    2626#define RMEDEVICE_H 
    2727 
    28 #include "iavdevice.h" 
     28#include "ffadodevice.h" 
    2929 
    3030#include "debugmodule/debugmodule.h" 
     
    4646}; 
    4747 
    48 class RmeDevice : public IAvDevice { 
     48class RmeDevice : public FFADODevice { 
    4949public: 
    5050 
     
    6060    virtual void showDevice(); 
    6161 
    62     virtual bool setSamplingFrequency( ESamplingFrequency samplingFrequency ); 
     62    virtual bool setSamplingFrequency( int samplingFrequency ); 
    6363    virtual int getSamplingFrequency( ); 
    6464