Show
Ignore:
Timestamp:
04/24/06 13:59:21 (16 years ago)
Author:
wagi
Message:

CVS-SVN migration developer public sync patch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libfreebob/src/devicemanager.h

    r183 r185  
    2929 
    3030class Ieee1394Service; 
    31 class AvDevice; 
     31class IAvDevice; 
    3232 
    33 typedef std::vector< AvDevice* > AvDeviceVector; 
    34 typedef std::vector< AvDevice* >::iterator AvDeviceVectorIterator; 
     33typedef std::vector< IAvDevice* > IAvDeviceVector; 
     34typedef std::vector< IAvDevice* >::iterator IAvDeviceVectorIterator; 
     35 
     36typedef IAvDevice* (*ProbeFunction)(Ieee1394Service&, int, int); 
     37typedef std::vector<ProbeFunction> ProbeFunctionVector; 
     38typedef std::vector<ProbeFunction>::iterator ProbeFunctionVectorIterator; 
    3539 
    3640class DeviceManager{ 
     
    4852    int getDeviceNodeId( int deviceNr ); 
    4953 
    50     AvDevice* getAvDevice( int nodeId ); 
     54    IAvDevice* getAvDevice( int nodeId ); 
    5155 
    5256    xmlDocPtr getXmlDescription(); 
    53  protected: 
     57 
     58protected: 
     59    static IAvDevice* probeBeBoB(Ieee1394Service& service, int id, int level); 
     60    static IAvDevice* probeBounce(Ieee1394Service& service, int id, int level); 
     61 
     62protected: 
    5463    Ieee1394Service* m_1394Service; 
    55     AvDeviceVector   m_avDevices; 
     64    IAvDeviceVector  m_avDevices; 
     65    ProbeFunctionVector m_probeList; 
    5666 
    5767    DECLARE_DEBUG_MODULE;