Changeset 500

Show
Ignore:
Timestamp:
07/28/07 01:33:18 (16 years ago)
Author:
ppalmers
Message:

- renamed the IAvDevice to FFADODevice since it's not a pure 'AvDevice?' anymore and it also isn't an interface anymore.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/echoaudio/src/bebob-sync.cpp

    r445 r500  
    2323 
    2424#include "devicemanager.h" 
    25 #include "iavdevice.h" 
     25#include "ffadodevice.h" 
    2626#include "bebob/bebob_avdevice.h" 
    2727 
    …… 
    144144    } 
    145145 
    146     IAvDevice* pAvDevice = pDeviceManager->getAvDevice( node_id ); 
     146    FFADODevice* pAvDevice = pDeviceManager->getAvDevice( node_id ); 
    147147    if ( !pAvDevice ) { 
    148148        printf( "No recognized device found with id %d\n", node_id ); 

  • branches/echoaudio/src/bebob/bebob_avdevice.cpp

    r499 r500  
    7070                    Ieee1394Service& ieee1394service, 
    7171                    int nodeId ) 
    72     : IAvDevice( configRom, ieee1394service, nodeId ) 
     72    : FFADODevice( configRom, ieee1394service, nodeId ) 
    7373    , m_pPlugManager( new AvPlugManager( DEBUG_LEVEL_NORMAL ) ) 
    7474    , m_activeSyncInfo( 0 ) 
    …… 
    121121//     m_pPlugManager->setVerboseLevel(l); 
    122122 
    123     IAvDevice::setVerboseLevel(l); 
     123    FFADODevice::setVerboseLevel(l); 
    124124} 
    125125 

  • branches/echoaudio/src/bebob/bebob_avdevice.h

    r451 r500  
    4141#include "libutil/serialize.h" 
    4242 
    43 #include "iavdevice.h" 
     43#include "ffadodevice.h" 
    4444 
    4545#include <sstream> 
    …… 
    5959}; 
    6060 
    61 class AvDevice : public IAvDevice { 
     61class AvDevice : public FFADODevice { 
    6262public: 
    6363    AvDevice( std::auto_ptr<ConfigRom>( configRom ), 

  • branches/echoaudio/src/bounce/bounce_avdevice.cpp

    r445 r500  
    5555                            Ieee1394Service& ieee1394service, 
    5656                            int nodeId ) 
    57     : IAvDevice( configRom, ieee1394service, nodeId ) 
     57    : FFADODevice( configRom, ieee1394service, nodeId ) 
    5858    , m_samplerate (44100) 
    5959    , m_model( NULL ) 

  • branches/echoaudio/src/bounce/bounce_avdevice.h

    r445 r500  
    3636#include "libieee1394/ARMHandler.h" 
    3737 
    38 #include "iavdevice.h" 
     38#include "ffadodevice.h" 
    3939 
    4040#include <vector> 
    …… 
    6565}; 
    6666 
    67 class BounceDevice : public IAvDevice { 
     67class BounceDevice : public FFADODevice { 
    6868private: 
    6969    class BounceNotifier; 

  • branches/echoaudio/src/devicemanager.cpp

    r499 r500  
    2626 
    2727#include "devicemanager.h" 
    28 #include "iavdevice.h" 
     28#include "ffadodevice.h" 
    2929 
    3030#include "libieee1394/configrom.h" 
    …… 
    9090    } 
    9191 
    92     for ( IAvDeviceVectorIterator it = m_avDevices.begin(); 
     92    for ( FFADODeviceVectorIterator it = m_avDevices.begin(); 
    9393          it != m_avDevices.end(); 
    9494          ++it ) 
    …… 
    110110    OscNode::setVerboseLevel(l); 
    111111 
    112     for ( IAvDeviceVectorIterator it = m_avDevices.begin(); 
     112    for ( FFADODeviceVectorIterator it = m_avDevices.begin(); 
    113113          it != m_avDevices.end(); 
    114114          ++it ) 
    …… 
    188188    setVerboseLevel(getDebugLevel()); 
    189189 
    190     for ( IAvDeviceVectorIterator it = m_avDevices.begin(); 
     190    for ( FFADODeviceVectorIterator it = m_avDevices.begin(); 
    191191          it != m_avDevices.end(); 
    192192          ++it ) 
    …… 
    227227            } 
    228228 
    229             IAvDevice* avDevice = getDriverForDevice( configRom, 
     229            FFADODevice* avDevice = getDriverForDevice( configRom, 
    230230                                                      nodeId ); 
    231231            if ( avDevice ) { 
    …… 
    291291        } 
    292292 
    293         IAvDevice* avDevice = getSlaveDriver( configRom ); 
     293        FFADODevice* avDevice = getSlaveDriver( configRom ); 
    294294        if ( avDevice ) { 
    295295            debugOutput( DEBUG_LEVEL_NORMAL, 
    …… 
    320320 
    321321 
    322 IAvDevice* 
     322FFADODevice* 
    323323DeviceManager::getDriverForDevice( std::auto_ptr<ConfigRom>( configRom ), 
    324324                                   int id ) 
    …… 
    383383} 
    384384 
    385 IAvDevice* 
     385FFADODevice* 
    386386DeviceManager::getSlaveDriver( std::auto_ptr<ConfigRom>( configRom ) ) 
    387387{ 
    …… 
    399399DeviceManager::isValidNode(int node) 
    400400{ 
    401     for ( IAvDeviceVectorIterator it = m_avDevices.begin(); 
     401    for ( FFADODeviceVectorIterator it = m_avDevices.begin(); 
    402402          it != m_avDevices.end(); 
    403403          ++it ) 
    404404    { 
    405         IAvDevice* avDevice = *it; 
     405        FFADODevice* avDevice = *it; 
    406406 
    407407        if (avDevice->getConfigRom().getNodeId() == node) { 
    …… 
    426426    } 
    427427 
    428     IAvDevice* avDevice = m_avDevices.at( deviceNr ); 
     428    FFADODevice* avDevice = m_avDevices.at( deviceNr ); 
    429429 
    430430    if ( !avDevice ) { 
    …… 
    435435} 
    436436 
    437 IAvDevice* 
     437FFADODevice* 
    438438DeviceManager::getAvDevice( int nodeId ) 
    439439{ 
    440     for ( IAvDeviceVectorIterator it = m_avDevices.begin(); 
     440    for ( FFADODeviceVectorIterator it = m_avDevices.begin(); 
    441441          it != m_avDevices.end(); 
    442442          ++it ) 
    443443    { 
    444         IAvDevice* avDevice = *it; 
     444        FFADODevice* avDevice = *it; 
    445445        if ( avDevice->getConfigRom().getNodeId() == nodeId ) { 
    446446            return avDevice; 
    …… 
    451451} 
    452452 
    453 IAvDevice* 
     453FFADODevice* 
    454454DeviceManager::getAvDeviceByIndex( int idx ) 
    455455{ 
    …… 
    473473Streaming::StreamProcessor * 
    474474DeviceManager::getSyncSource() { 
    475     IAvDevice* device = getAvDeviceByIndex(0); 
     475    FFADODevice* device = getAvDeviceByIndex(0); 
    476476 
    477477    bool slaveMode=false; 
    …… 
    501501    i=0; // avoids unused warning 
    502502 
    503     for ( IAvDeviceVectorIterator it = m_avDevices.begin(); 
     503    for ( FFADODeviceVectorIterator it = m_avDevices.begin(); 
    504504          it != m_avDevices.end(); 
    505505          ++it ) 
    506506    { 
    507         IAvDevice* pAvDevice; 
     507        FFADODevice* pAvDevice; 
    508508        pAvDevice = *it; // avoids unused warning 
    509509 

  • branches/echoaudio/src/devicemanager.h

    r475 r500  
    4040 
    4141class Ieee1394Service; 
    42 class IAvDevice; 
     42class FFADODevice; 
    4343namespace Streaming { 
    4444    class StreamProcessor; 
    4545} 
    4646 
    47 typedef std::vector< IAvDevice* > IAvDeviceVector; 
    48 typedef std::vector< IAvDevice* >::iterator IAvDeviceVectorIterator; 
     47typedef std::vector< FFADODevice* > FFADODeviceVector; 
     48typedef std::vector< FFADODevice* >::iterator FFADODeviceVectorIterator; 
    4949 
    5050class DeviceManager 
    …… 
    6565    int getDeviceNodeId( int deviceNr ); 
    6666 
    67     IAvDevice* getAvDevice( int nodeId ); 
    68     IAvDevice* getAvDeviceByIndex( int idx ); 
     67    FFADODevice* getAvDevice( int nodeId ); 
     68    FFADODevice* getAvDeviceByIndex( int idx ); 
    6969    unsigned int getAvDeviceCount(); 
    7070 
    …… 
    7575 
    7676protected: 
    77     IAvDevice* getDriverForDevice( std::auto_ptr<ConfigRom>( configRom ), 
     77    FFADODevice* getDriverForDevice( std::auto_ptr<ConfigRom>( configRom ), 
    7878                                   int id ); 
    79     IAvDevice* getSlaveDriver( std::auto_ptr<ConfigRom>( configRom ) ); 
     79    FFADODevice* getSlaveDriver( std::auto_ptr<ConfigRom>( configRom ) ); 
    8080 
    8181protected: 
    8282    Ieee1394Service* m_1394Service; 
    83     IAvDeviceVector  m_avDevices; 
     83    FFADODeviceVector  m_avDevices; 
    8484 
    8585    OSC::OscServer*  m_oscServer; 

  • branches/echoaudio/src/dice/dice_avdevice.cpp

    r445 r500  
    5454                    Ieee1394Service& ieee1394service, 
    5555                    int nodeId ) 
    56     : IAvDevice( configRom, ieee1394service, nodeId ) 
     56    : FFADODevice( configRom, ieee1394service, nodeId ) 
    5757    , m_model( NULL ) 
    5858    , m_global_reg_offset (0xFFFFFFFFLU) 

  • branches/echoaudio/src/dice/dice_avdevice.h

    r445 r500  
    2525#define DICEDEVICE_H 
    2626 
    27 #include "iavdevice.h" 
     27#include "ffadodevice.h" 
    2828 
    2929#include "debugmodule/debugmodule.h" 
    …… 
    5252}; 
    5353 
    54 class DiceAvDevice : public IAvDevice { 
     54class DiceAvDevice : public FFADODevice { 
    5555private: 
    5656    class DiceNotifier; 

  • branches/echoaudio/src/ffado.cpp

    r454 r500  
    3030#include "fbtypes.h" 
    3131#include "devicemanager.h" 
    32 #include "iavdevice.h" 
     32#include "ffadodevice.h" 
    3333 
    3434#include "libavc/avc_generic.h" 
    …… 
    133133ffado_set_samplerate( ffado_handle_t ffado_handle, int node_id, int samplerate ) 
    134134{ 
    135     IAvDevice* avDevice = ffado_handle->m_deviceManager->getAvDevice( node_id ); 
     135    FFADODevice* avDevice = ffado_handle->m_deviceManager->getAvDevice( node_id ); 
    136136    if ( avDevice ) { 
    137137        if ( avDevice->setSamplingFrequency( parseSampleRate( samplerate ) ) ) { 

  • branches/echoaudio/src/ffadodevice.cpp

    r449 r500  
    2323 */ 
    2424 
    25 #include "iavdevice.h" 
     25#include "ffadodevice.h" 
    2626 
    2727#include "libieee1394/configrom.h" 
    …… 
    3131#include <sstream> 
    3232 
    33 IMPL_DEBUG_MODULE( IAvDevice, IAvDevice, DEBUG_LEVEL_VERBOSE ); 
     33IMPL_DEBUG_MODULE( FFADODevice, FFADODevice, DEBUG_LEVEL_VERBOSE ); 
    3434 
    35 IAvDevice::IAvDevice( std::auto_ptr< ConfigRom >( configRom ), 
     35FFADODevice::FFADODevice( std::auto_ptr< ConfigRom >( configRom ), 
    3636                    Ieee1394Service& ieee1394service, 
    3737                    int nodeId ) 
    …… 
    5454 
    5555ConfigRom& 
    56 IAvDevice::getConfigRom() const 
     56FFADODevice::getConfigRom() const 
    5757{ 
    5858    return *m_pConfigRom; 
    …… 
    6060 
    6161bool 
    62 IAvDevice::setId( unsigned int id) 
     62FFADODevice::setId( unsigned int id) 
    6363{ 
    6464    bool retval; 
    …… 
    7777 
    7878void 
    79 IAvDevice::setVerboseLevel(int l) 
     79FFADODevice::setVerboseLevel(int l) 
    8080{ 
    8181    m_verboseLevel=l; 
    …… 
    8686 
    8787bool 
    88 IAvDevice::enableStreaming() { 
     88FFADODevice::enableStreaming() { 
    8989    return true; 
    9090} 
    9191 
    9292bool 
    93 IAvDevice::disableStreaming() { 
     93FFADODevice::disableStreaming() { 
    9494    return true; 
    9595} 

  • branches/echoaudio/src/ffadodevice.h

    r499 r500  
    2323 */ 
    2424 
    25 #ifndef IAVDEVICE_H 
    26 #define IAVDEVICE_H 
     25#ifndef FFADODEVICE_H 
     26#define FFADODEVICE_H 
    2727 
    2828#include "libavc/avc_definitions.h" 
    …… 
    4343 
    4444*/ 
    45 class IAvDevice 
     45class FFADODevice 
    4646    : public Util::OptionContainer, 
    4747      public OSC::OscNode 
    4848{ 
    4949public: 
    50     IAvDevice( std::auto_ptr< ConfigRom >( configRom ), 
     50    FFADODevice( std::auto_ptr< ConfigRom >( configRom ), 
    5151                    Ieee1394Service& ieee1394service, 
    5252                    int nodeId ); 
    5353 
    54     virtual ~IAvDevice() {}; 
     54    virtual ~FFADODevice() {}; 
    5555 
    5656    /// Returns the ConfigRom object of the device node. 

  • branches/echoaudio/src/ffado_streaming.cpp

    r454 r500  
    2828#include "../libffado/ffado.h" 
    2929#include "devicemanager.h" 
    30 #include "iavdevice.h" 
     30#include "ffadodevice.h" 
    3131 
    3232#include "libstreaming/StreamProcessorManager.h" 
    …… 
    139139    // add the stream processors of the devices to the managers 
    140140    for(i=0;i<dev->m_deviceManager->getAvDeviceCount();i++) { 
    141         IAvDevice *device=dev->m_deviceManager->getAvDeviceByIndex(i); 
     141        FFADODevice *device=dev->m_deviceManager->getAvDeviceByIndex(i); 
    142142        assert(device); 
    143143 
    …… 
    211211    // iterate over the found devices 
    212212    for(i=0;i<dev->m_deviceManager->getAvDeviceCount();i++) { 
    213         IAvDevice *device=dev->m_deviceManager->getAvDeviceByIndex(i); 
     213        FFADODevice *device=dev->m_deviceManager->getAvDeviceByIndex(i); 
    214214        assert(device); 
    215215 
    …… 
    236236    // add the stream processors of the devices to the managers 
    237237    for(i=0;i<dev->m_deviceManager->getAvDeviceCount();i++) { 
    238         IAvDevice *device=dev->m_deviceManager->getAvDeviceByIndex(i); 
     238        FFADODevice *device=dev->m_deviceManager->getAvDeviceByIndex(i); 
    239239        assert(device); 
    240240 
    …… 
    272272    // add the stream processors of the devices to the managers 
    273273    for(i=0;i<dev->m_deviceManager->getAvDeviceCount();i++) { 
    274         IAvDevice *device=dev->m_deviceManager->getAvDeviceByIndex(i); 
     274        FFADODevice *device=dev->m_deviceManager->getAvDeviceByIndex(i); 
    275275        assert(device); 
    276276 

  • branches/echoaudio/src/genericavc/avc_avdevice.cpp

    r475 r500  
    5353                    Ieee1394Service& ieee1394service, 
    5454                    int nodeId ) 
    55     :  IAvDevice( configRom, ieee1394service, nodeId ) 
     55    :  FFADODevice( configRom, ieee1394service, nodeId ) 
    5656    , m_model( NULL ) 
    5757 

  • branches/echoaudio/src/genericavc/avc_avdevice.h

    r475 r500  
    2525#define GENERICAVC_AVDEVICE_H 
    2626 
    27 #include "iavdevice.h" 
     27#include "ffadodevice.h" 
    2828 
    2929#include "debugmodule/debugmodule.h" 
    …… 
    4343}; 
    4444 
    45 class AvDevice : public IAvDevice { 
     45class AvDevice : public FFADODevice { 
    4646public: 
    4747    AvDevice( std::auto_ptr<ConfigRom>( configRom ), 

  • branches/echoaudio/src/Makefile.am

    r499 r500  
    4949        libieee1394/IEC61883.h \ 
    5050        debugmodule/debugmodule.h \ 
    51         devicemanager.h fbtypes.h iavdevice.h threads.h bebob/bebob_avdevice.h \ 
     51        devicemanager.h fbtypes.h ffadodevice.h threads.h bebob/bebob_avdevice.h \ 
    5252        bebob/bebob_avdevice_subunit.h bebob/bebob_avplug.h bebob/bebob_dl_bcd.h bebob/bebob_dl_codes.h \ 
    5353        bebob/bebob_dl_mgr.h bebob/bebob_functionblock.h bounce/bounce_avdevice.h bounce/bounce_slave_avdevice.h \ 
    …… 
    8383            ffado.cpp \ 
    8484            ffado_streaming.cpp \ 
    85             iavdevice.cpp \ 
     85            ffadodevice.cpp \ 
    8686            debugmodule/debugmodule.cpp \ 
    8787            libavc/avc_connect.cpp \ 

  • branches/echoaudio/src/maudio/maudio_avdevice.h

    r445 r500  
    3636#include "libstreaming/AmdtpPortInfo.h" 
    3737 
    38 #include "iavdevice.h" 
     38#include "ffadodevice.h" 
    3939 
    4040class ConfigRom; 

  • branches/echoaudio/src/metrichalo/mh_avdevice.cpp

    r445 r500  
    5353                    Ieee1394Service& ieee1394service, 
    5454                    int nodeId ) 
    55     :  IAvDevice( configRom, ieee1394service, nodeId ) 
     55    :  FFADODevice( configRom, ieee1394service, nodeId ) 
    5656    , m_model( NULL ) 
    5757 

  • branches/echoaudio/src/metrichalo/mh_avdevice.h

    r445 r500  
    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 ), 

  • branches/echoaudio/src/motu/motu_avdevice.cpp

    r445 r500  
    5959                    Ieee1394Service& ieee1394service, 
    6060                    int nodeId) 
    61     : IAvDevice( configRom, ieee1394service, nodeId ) 
     61    : FFADODevice( configRom, ieee1394service, nodeId ) 
    6262    , m_motu_model( MOTUFW_MODEL_NONE ) 
    6363    , m_iso_recv_channel ( -1 ) 

  • branches/echoaudio/src/motu/motu_avdevice.h

    r445 r500  
    2626#define MOTUDEVICE_H 
    2727 
    28 #include "iavdevice.h" 
     28#include "ffadodevice.h" 
    2929 
    3030#include "debugmodule/debugmodule.h" 
    …… 
    9191}; 
    9292 
    93 class MotuDevice : public IAvDevice { 
     93class MotuDevice : public FFADODevice { 
    9494public: 
    9595 

  • branches/echoaudio/src/rme/rme_avdevice.cpp

    r445 r500  
    5353                    Ieee1394Service& ieee1394service, 
    5454                    int nodeId ) 
    55     : IAvDevice( configRom, ieee1394service, nodeId ) 
     55    : FFADODevice( configRom, ieee1394service, nodeId ) 
    5656    , m_model( NULL ) 
    5757{ 

  • branches/echoaudio/src/rme/rme_avdevice.h

    r445 r500  
    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 

  • branches/echoaudio/tests/test-ffado.cpp

    r499 r500  
    3434#include "fbtypes.h" 
    3535#include "devicemanager.h" 
    36 #include "iavdevice.h" 
     36#include "ffadodevice.h" 
    3737 
    3838#include <signal.h> 
    …… 
    282282 
    283283        if(arguments.node_id_set) { 
    284             IAvDevice* avDevice = m_deviceManager->getAvDevice( arguments.node_id ); 
     284            FFADODevice* avDevice = m_deviceManager->getAvDevice( arguments.node_id ); 
    285285            if ( avDevice ) { 
    286286                if ( avDevice->setSamplingFrequency( parseSampleRate( samplerate ) ) ) { 
    …… 
    299299                int node_id=m_deviceManager->getDeviceNodeId(i); 
    300300                printf("  set samplerate for device = %d, node = %d\n", i, node_id); 
    301                 IAvDevice* avDevice = m_deviceManager->getAvDevice( node_id ); 
     301                FFADODevice* avDevice = m_deviceManager->getAvDevice( node_id ); 
    302302                if ( avDevice ) { 
    303303                    if ( !avDevice->setSamplingFrequency( parseSampleRate( samplerate ) ) ) {