Changeset 509

Timestamp:

07/29/07 11:02:25 (16 years ago)

Author:

ppalmers

Message:

- Moved all generic stuff but the functionblocks over to libavc
- compiles and works

Files:

• branches/echoaudio/src/bebob/bebob_avdevice.cpp (modified) (12 diffs)
• branches/echoaudio/src/bebob/bebob_avdevice.h (modified) (1 diff)
• branches/echoaudio/src/bebob/bebob_avdevice_subunit.cpp (modified) (6 diffs)
• branches/echoaudio/src/bebob/bebob_avdevice_subunit.h (modified) (5 diffs)
• branches/echoaudio/src/bebob/bebob_avplug.cpp (modified) (4 diffs)
• branches/echoaudio/src/bebob/bebob_functionblock.cpp (modified) (2 diffs)
• branches/echoaudio/src/debugmodule/debugmodule.cpp (modified) (6 diffs)
• branches/echoaudio/src/debugmodule/debugmodule.h (modified) (1 diff)
• branches/echoaudio/src/devicemanager.cpp (modified) (3 diffs)
• branches/echoaudio/src/ffadodevice.h (modified) (1 diff)
• branches/echoaudio/src/libavc/audiosubunit/avc_audiosubunit.cpp (modified) (3 diffs)
• branches/echoaudio/src/libavc/general/avc_plug.cpp (modified) (3 diffs)
• branches/echoaudio/src/libavc/general/avc_plug.h (modified) (2 diffs)
• branches/echoaudio/src/libavc/general/avc_subunit.cpp (modified) (4 diffs)
• branches/echoaudio/src/libavc/general/avc_subunit.h (modified) (5 diffs)
• branches/echoaudio/src/libavc/general/avc_unit.cpp (modified) (3 diffs)
• branches/echoaudio/src/libavc/general/avc_unit.h (modified) (3 diffs)

branches/echoaudio/src/bebob/bebob_avdevice.cpp

@@ -75 +75 @@
-                    int nodeId )
-    : FFADODevice( configRom, ieee1394service, nodeId )
-configRom, ieee1394service, nodeId 
+
-    , m_model ( NULL )
-    , m_Mixer ( NULL )
@@ -92 +92 @@
-        delete m_Mixer;
-    }
-
-    for ( SubunitVector::iterator it = m_subunits.begin();
-          it != m_subunits.end();
-          ++it )
-    {
-        delete *it;
-    }
-    for ( PlugConnectionVector::iterator it = m_plugConnections.begin();
-          it != m_plugConnections.end();
-          ++it )
-    {
-        delete *it;
-    }
-    for ( PlugVector::iterator it = m_pcrPlugs.begin();
-          it != m_pcrPlugs.end();
-          ++it )
-    {
-        delete *it;
-    }
-    for ( PlugVector::iterator it = m_externalPlugs.begin();
-          it != m_externalPlugs.end();
-          ++it )
-    {
-        delete *it;
-    }
-}
-
@@ -125 +100 @@
-
-    FFADODevice::setVerboseLevel(l);
+    AVC::Unit::setVerboseLevel(l);
-}
-
@@ -143 +119 @@
-        }
-    }
-
-    return false;
-}
@@ -191 +166 @@
-//     }
-
+    // bebob specific discovery procedure
-    if ( !discoverPlugs() ) {
-        debugError( "Detecting plugs failed\n" );
@@ -234 +210 @@
-
-bool
+AvDevice::enumerateSubUnits()
+{
+    SubUnitInfoCmd subUnitInfoCmd( get1394Service() );
+    subUnitInfoCmd.setCommandType( AVCCommand::eCT_Status );
+
+    // NOTE: BeBoB has always exactly one audio and one music subunit. This
+    // means is fits into the first page of the SubUnitInfo command.
+    // So there is no need to do more than needed
+
+    subUnitInfoCmd.m_page = 0;
+    subUnitInfoCmd.setNodeId( getConfigRom().getNodeId() );
+    subUnitInfoCmd.setVerbose( getDebugLevel() );
+    if ( !subUnitInfoCmd.fire() ) {
+        debugError( "Subunit info command failed\n" );
+        // shouldn't this be an error situation?
+        return false;
+    }
+
+    for ( int i = 0; i < subUnitInfoCmd.getNrOfValidEntries(); ++i ) {
+        subunit_type_t subunit_type
+            = subUnitInfoCmd.m_table[i].m_subunit_type;
+
+        unsigned int subunitId = getNrOfSubunits( subunit_type );
+
+        debugOutput( DEBUG_LEVEL_VERBOSE,
+                     "subunit_id = %2d, subunit_type = %2d (%s)\n",
+                     subunitId,
+                     subunit_type,
+                     subunitTypeToString( subunit_type ) );
+
+        AVC::Subunit* subunit = 0;
+        switch( subunit_type ) {
+        case eST_Audio:
+            subunit = new BeBoB::SubunitAudio( *this,
+                                               subunitId );
+            if ( !subunit ) {
+                debugFatal( "Could not allocate SubunitAudio\n" );
+                return false;
+            }
+            
+            if ( !subunit->discover() ) {
+                debugError( "enumerateSubUnits: Could not discover "
+                            "subunit_id = %2d, subunit_type = %2d (%s)\n",
+                            subunitId,
+                            subunit_type,
+                            subunitTypeToString( subunit_type ) );
+                delete subunit;
+                return false;
+            } else {
+                m_subunits.push_back( subunit );
+            }
+            
+            break;
+        case eST_Music:
+            subunit = new BeBoB::SubunitMusic( *this,
+                                               subunitId );
+            if ( !subunit ) {
+                debugFatal( "Could not allocate SubunitMusic\n" );
+                return false;
+            }
+            if ( !subunit->discover() ) {
+                debugError( "enumerateSubUnits: Could not discover "
+                            "subunit_id = %2d, subunit_type = %2d (%s)\n",
+                            subunitId,
+                            subunit_type,
+                            subunitTypeToString( subunit_type ) );
+                delete subunit;
+                return false;
+            } else {
+                m_subunits.push_back( subunit );
+            }
+
+            break;
+        default:
+            debugOutput( DEBUG_LEVEL_NORMAL,
+                         "Unsupported subunit found, subunit_type = %d (%s)\n",
+                         subunit_type,
+                         subunitTypeToString( subunit_type ) );
+            continue;
+
+        }
+    }
+
+    return true;
+}
+
+bool
-AvDevice::discoverPlugs()
-{
+    debugOutput( DEBUG_LEVEL_NORMAL, "Discovering plugs...\n");
+
-    //////////////////////////////////////////////
-    // Get number of available isochronous input
@@ -294 +359 @@
-                            plug_id_t plugMaxId )
-{
+    debugOutput( DEBUG_LEVEL_NORMAL, "Discovering PCR plugs, direction %d...\n",plugDirection);
-    for ( int plugId = 0;
-          plugId < plugMaxId;
@@ -323 +389 @@
-                                 plug_id_t plugMaxId )
-{
+    debugOutput( DEBUG_LEVEL_NORMAL, "Discovering Externals plugs, direction %d...\n",plugDirection);
-    for ( int plugId = 0;
-          plugId < plugMaxId;
@@ -353 +420 @@
-          ++it )
-    {
-
+
+
+
+
+
-        if ( !plug->discoverConnections() ) {
-            debugError( "Could not discover plug connections\n" );
@@ -363 +434 @@
-          ++it )
-    {
-
+
+
+
+
+
-        if ( !plug->discoverConnections() ) {
-            debugError( "Could not discover plug connections\n" );
@@ -376 +451 @@
-AvDevice::discoverSubUnitsPlugConnections()
-{
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return true;
-}
@@ -738 +818 @@
-
-    m_pPlugManager->showPlugs();
+    flushDebugOutput();
-}
-

branches/echoaudio/src/bebob/bebob_avdevice.h

@@ -97 +97 @@
-    // redefinition to resolve ambiguity
-    Ieee1394Service& get1394Service()
-*m_p1394Service; }
+FFADODevice::get1394Service(); };
-    ConfigRom& getConfigRom() const 
-return FFADODevice::getConfigRom();
-
+ return FFADODevice::getConfigRom(); 
+
-protected:
+
+    bool enumerateSubUnits();
-
-    bool discoverPlugs();

branches/echoaudio/src/bebob/bebob_avdevice_subunit.cpp

@@ -36 +36 @@
-using namespace AVC;
-
+IMPL_DEBUG_MODULE( BeBoB::Subunit, BeBoB::Subunit, DEBUG_LEVEL_VERBOSE );
+IMPL_DEBUG_MODULE( BeBoB::SubunitAudio, BeBoB::SubunitAudio, DEBUG_LEVEL_VERBOSE );
+IMPL_DEBUG_MODULE( BeBoB::SubunitMusic, BeBoB::SubunitMusic, DEBUG_LEVEL_VERBOSE );
+
+bool
+BeBoB::Subunit::discover()
+{
+    if ( !discoverPlugs() ) {
+        debugError( "plug discovering failed\n" );
+        return false;
+    }
+
+    return true;
+}
+
+bool
+BeBoB::Subunit::discoverPlugs()
+{
+    PlugInfoCmd plugInfoCmd( getUnit().get1394Service(),
+                             PlugInfoCmd::eSF_SerialBusIsochronousAndExternalPlug );
+    plugInfoCmd.setNodeId( getUnit().getConfigRom().getNodeId() );
+    plugInfoCmd.setCommandType( AVCCommand::eCT_Status );
+    plugInfoCmd.setSubunitType( getSubunitType() );
+    plugInfoCmd.setSubunitId( getSubunitId() );
+    plugInfoCmd.setVerbose( getDebugLevel() );
+
+    if ( !plugInfoCmd.fire() ) {
+        debugError( "plug info command failed\n" );
+        return false;
+    }
+
+    debugOutput( DEBUG_LEVEL_NORMAL, "number of source plugs = %d\n",
+                 plugInfoCmd.m_sourcePlugs );
+    debugOutput( DEBUG_LEVEL_NORMAL, "number of destination output "
+                 "plugs = %d\n", plugInfoCmd.m_destinationPlugs );
+
+    if ( !discoverPlugs( Plug::eAPD_Input,
+                         plugInfoCmd.m_destinationPlugs ) )
+    {
+        debugError( "destination plug discovering failed\n" );
+        return false;
+    }
+
+    if ( !discoverPlugs(  Plug::eAPD_Output,
+                          plugInfoCmd.m_sourcePlugs ) )
+    {
+        debugError( "source plug discovering failed\n" );
+        return false;
+    }
+
+    return true;
+}
+
+bool
+BeBoB::Subunit::discoverConnections()
+{
+    debugOutput(DEBUG_LEVEL_NORMAL, "Discovering connections...\n");
+    
+    for ( PlugVector::iterator it = getPlugs().begin();
+          it != getPlugs().end();
+          ++it )
+    {
+        BeBoB::Plug* plug = dynamic_cast<BeBoB::Plug*>(*it);
+        if(!plug) {
+            debugError("BUG: not a bebob plug\n");
+            return false;
+        }
+        if ( !plug->discoverConnections() ) {
+            debugError( "plug connection discovering failed ('%s')\n",
+                        plug->getName() );
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool
+BeBoB::Subunit::discoverPlugs(Plug::EPlugDirection plugDirection,
+                                      plug_id_t plugMaxId )
+{
+    debugOutput(DEBUG_LEVEL_NORMAL, "Discovering plugs...\n");
+    for ( int plugIdx = 0;
+          plugIdx < plugMaxId;
+          ++plugIdx )
+    {
+        ESubunitType subunitType =
+            static_cast<ESubunitType>( getSubunitType() );
+        BeBoB::Plug* plug = new BeBoB::Plug( &getUnit(),
+                                             &getSubunit(),
+                                             0xff,
+                                             0xff,
+                                             Plug::eAPA_SubunitPlug,
+                                             plugDirection,
+                                             plugIdx );
+        if ( !plug ) {
+            debugError( "plug creation failed\n" );
+            return false;
+        }
+        
+        plug->setVerboseLevel(getDebugLevel());
+        
+        if ( !plug->discover() ) {
+            debugError( "plug discover failed\n" );
+            return false;
+        }
+
+        debugOutput( DEBUG_LEVEL_NORMAL, "plug '%s' found\n",
+                     plug->getName() );
+        getPlugs().push_back( plug );
+    }
+    return true;
+}
+
+
+//////////////////////////
-
-BeBoB::SubunitAudio::SubunitAudio( AVC::Unit& avDevice,
-                                   subunit_t id )
-    : AVC::SubunitAudio( avDevice, id )
+    , BeBoB::Subunit()
-{
-}
@@ -56 +173 @@
-BeBoB::SubunitAudio::discover()
-{
-Audio Subunit...\n"
+%s...\n", getName()
-    
+    // discover the AV/C generic part
-    if ( !AVC::SubunitAudio::discover() ) {
-        return false;
-    }
-
+
+
+
+
+
+
+
-    if ( !discoverFunctionBlocks() ) {
-        debugError( "function block discovering failed\n" );
@@ -74 +198 @@
-{
-    debugOutput(DEBUG_LEVEL_NORMAL, "Discovering connections...\n");
-
+BeBoB::
-        return false;
-    }
@@ -362 +486 @@
-
-BeBoB::SubunitMusic::SubunitMusic( AVC::Unit& avDevice,
-                
+
-    : AVC::SubunitMusic( avDevice, id )
+    , BeBoB::Subunit()
-{
-}
@@ -369 +494 @@
-BeBoB::SubunitMusic::SubunitMusic()
-    : AVC::SubunitMusic()
+    , BeBoB::Subunit()
-{
-}
@@ -374 +500 @@
-BeBoB::SubunitMusic::~SubunitMusic()
-{
+}
+
+bool
+BeBoB::SubunitMusic::discover()
+{
+    debugOutput(DEBUG_LEVEL_NORMAL, "Discovering %s...\n", getName());
+    
+    // discover the AV/C generic part
+    if ( !AVC::SubunitMusic::discover() ) {
+        return false;
+    }
+    
+    // do BeBoB subunit specific discovery
+    if ( !BeBoB::Subunit::discover() ) {
+        return false;
+    }
+
+    // do the remaining BeBoB music subunit discovery
+    // which is nothing
+
+    return true;
-}
-

branches/echoaudio/src/bebob/bebob_avdevice_subunit.h

@@ -44 +44 @@
-/////////////////////////////
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    SubunitAudio( AVC::Unit& avDevice,
-
+    
-    SubunitAudio();
-    virtual ~SubunitAudio();
@@ -54 +82 @@
-    virtual bool discoverConnections();
-
+    // required interface for BeBoB::Subunit
-    virtual const char* getName();
+    virtual AVC::subunit_t getSubunitId() 
+        { return AVC::SubunitAudio::getSubunitId(); };
+    virtual AVC::ESubunitType getSubunitType()
+        { return AVC::SubunitAudio::getSubunitType(); };
+    virtual AVC::Unit& getUnit() const
+        { return AVC::SubunitAudio::getUnit(); };
+    virtual AVC::Subunit& getSubunit()
+        { return *this; };
+    virtual AVC::PlugVector& getPlugs()
+        { return AVC::SubunitAudio::getPlugs(); };
-
-    FunctionBlockVector getFunctionBlocks() { return m_functions; };
-    
-protected:
-    bool discoverFunctionBlocks();
@@ -74 +111 @@
-                                   Util::IODeserialize& deser,
-                                   AVC::Unit& unit );
-
-
-
+
+
-};
-
-/////////////////////////////
-
-
+
+
+
- public:
-    SubunitMusic( AVC::Unit& avDevice,
@@ -88 +126 @@
-    virtual ~SubunitMusic();
-
+    // required interface for BeBoB::Subunit
-    virtual const char* getName();
+    virtual AVC::subunit_t getSubunitId() 
+        { return AVC::SubunitMusic::getSubunitId(); };
+    virtual AVC::ESubunitType getSubunitType()
+        { return AVC::SubunitMusic::getSubunitType(); };
+    virtual AVC::Unit& getUnit() const
+        { return AVC::SubunitMusic::getUnit(); };
+    virtual AVC::Subunit& getSubunit()
+        { return *this; };
+    virtual AVC::PlugVector& getPlugs()
+        { return AVC::SubunitMusic::getPlugs(); };
+
+    
+    virtual bool discover();
-
-protected:
@@ -96 +148 @@
-                                   Util::IODeserialize& deser,
-                                   AVC::Unit& unit );
+private:
+    DECLARE_DEBUG_MODULE;
-};
-

branches/echoaudio/src/bebob/bebob_avplug.cpp

@@ -50 +50 @@
-                 plugId )
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -56 +68 @@
-    : AVC::Plug( rhs )
-{
+
-}
-
@@ -600 +613 @@
-
-            if ( formatInfoIsValid ) {
+                flushDebugOutput();
-                debugOutput( DEBUG_LEVEL_VERBOSE,
-                             "[%s:%d] formatInfo[%d].m_samplingFrequency "
@@ -618 +632 @@
-                             i, formatInfo.m_midiChannels );
-                m_formatInfos.push_back( formatInfo );
+                flushDebugOutput();
-            }
-        }

branches/echoaudio/src/bebob/bebob_functionblock.cpp

@@ -34 +34 @@
-
-FunctionBlock::FunctionBlock(
-
+AVC::
-    function_block_type_t type,
-    function_block_type_t subtype,
@@ -146 +146 @@
-          ++it )
-    {
-
+
+
+
+
+
-        if ( !plug->discoverConnections() ) {
-            debugError( "Could not discover plug connections\n" );

branches/echoaudio/src/debugmodule/debugmodule.cpp

@@ -30 +30 @@
-#include <iostream>
-
-
+
+
+
-
-using namespace std;
@@ -113 +115 @@
-        fname=f;
-    }
-
-
+
+
+
+
+
+
+
+
-                 fname,  line,  function );
-    DebugModuleManager::instance()->va_print( format, arg );
@@ -197 +205 @@
-
-    pthread_mutex_init(&mb_write_lock, NULL);
+    pthread_mutex_init(&mb_flush_lock, NULL);
-    pthread_cond_init(&mb_ready_cond, NULL);
-
@@ -288 +297 @@
-DebugModuleManager::flush()
-{
-
+// 
-}
-
@@ -295 +304 @@
-{
-    /* called WITHOUT the mb_write_lock */
+    
+    /* the flush lock is to allow a flush from multiple threads 
+     * this allows a code section that outputs a lot of debug messages
+     * and that can be blocked to flush the buffer itself such that it 
+     * does not overflow.
+     */
+    DebugModuleManager *m=DebugModuleManager::instance();
+    pthread_mutex_lock(&m->mb_flush_lock);
-    while (mb_outbuffer != mb_inbuffer) {
-        fputs(mb_buffers[mb_outbuffer], stderr);
-        mb_outbuffer = MB_NEXT(mb_outbuffer);
-    }
+    pthread_mutex_unlock(&m->mb_flush_lock);
-}
-
@@ -376 +394 @@
-        return;
-    }
-
+
-#ifdef DO_MESSAGE_BUFFER_PRINT
-    if (pthread_mutex_trylock(&mb_write_lock) == 0) {

branches/echoaudio/src/debugmodule/debugmodule.h

@@ -230 +230 @@
-    pthread_t mb_writer_thread;
-    pthread_mutex_t mb_write_lock;
+    pthread_mutex_t mb_flush_lock;
-    pthread_cond_t mb_ready_cond;
-

branches/echoaudio/src/devicemanager.cpp

@@ -228 +228 @@
-
-            FFADODevice* avDevice = getDriverForDevice( configRom,
-
+  
-            if ( avDevice ) {
-                debugOutput( DEBUG_LEVEL_NORMAL,
@@ -266 +266 @@
-                    debugWarning("failed to register AvDevice at OSC server\n");
-                }
+                
+                debugOutput( DEBUG_LEVEL_NORMAL, "discovery of node %d done...\n", nodeId );
-
-            }
-        }
+
+        debugOutput( DEBUG_LEVEL_NORMAL, "discovery finished...\n" );
+
-        return true;
-
@@ -313 +318 @@
-
-            m_avDevices.push_back( avDevice );
-
+
+
+
+
+
-
-        return true;

branches/echoaudio/src/ffadodevice.h

@@ -54 +54 @@
-    virtual ~FFADODevice() {};
-
+    /// Returns the 1394 service of the FFADO device
+    virtual Ieee1394Service& get1394Service()
+        { return *m_p1394Service; };
-    /// Returns the ConfigRom object of the device node.
-
+virtual 
-
-    /**

branches/echoaudio/src/libavc/audiosubunit/avc_audiosubunit.cpp

@@ -60 +60 @@
-SubunitAudio::discover()
-{
-Audio Subunit...\n"
+%s...\n", getName()
-    
-    if ( !Subunit::discover() ) {
@@ -66 +66 @@
-    }
-
-//     if ( !discoverBeBoB::FunctionBlocks() ) {
-//         debugError( "function block discovering failed\n" );
-//         return false;
-//     }
-
-    return true;
-}
@@ -78 +73 @@
-SubunitAudio::getName()
-{
-
+VC::A
-}
-

branches/echoaudio/src/libavc/general/avc_plug.cpp

@@ -119 +119 @@
-Plug::getSubunitId() const
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-bool
@@ -527 +459 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "\tNumber of Streams  = %d\n",
-                 getNrOfStreams() );
+    flushDebugOutput();
-}
-
@@ -948 +881 @@
-                     PlugManager& plugManager )
-{
+    #warning FIXME: The derived class should be creating these
+    // FIXME: The derived class should be creating these, such that discover() can become pure virtual
+
-    Plug* pPlug = new Plug;
-    if ( !pPlug ) {

branches/echoaudio/src/libavc/general/avc_plug.h

@@ -92 +92 @@
-    virtual bool discover() 
-    {//FIXME:
-
-
-
-
-
-
+
+
+
-
-    bool inquireConnnection( Plug& plug );
@@ -171 +168 @@
-    ClusterInfoVector& getClusterInfos()
-        { return m_clusterInfos; }
-
+
+
+
-protected:
-    Plug();

branches/echoaudio/src/libavc/general/avc_subunit.cpp

@@ -36 +36 @@
-#include <sstream>
-
-#warning do we need this?
-#include "bebob/bebob_avplug.h"
-
-namespace AVC {
-
@@ -73 +70 @@
-{
-    // There is nothing we can discover for a generic subunit
-
+
+
-    return true;
-}
@@ -118 +116 @@
-Subunit*
-Subunit::deserialize( Glib::ustring basePath,
-               
-               
+
+
-{
-    bool result;
@@ -126 +124 @@
-
-    Subunit* pSubunit = 0;
+    
+    #warning FIXME: The derived class should be creating these
+    // FIXME: The derived class should be creating these, such that discover() can become pure virtual
-    switch( sbType ) {
-    case eST_Audio:

branches/echoaudio/src/libavc/general/avc_subunit.h

@@ -51 +51 @@
-
-    virtual bool discover();
-    virtual bool discoverConnections()
-    {//FIXME:
-    #warning FIXME
-    };
-
-    virtual const char* getName() = 0;
-
@@ -63 +58 @@
-    { return m_sbType; }
-
+    Unit& getUnit() const
+        { return *m_unit; }
+
+
-    bool addPlug( Plug& plug );
-
@@ -68 +67 @@
-    { return m_plugs; }
-    Plug* getPlug(Plug::EPlugDirection direction, plug_id_t plugId);
-
-
-    Unit& getUnit() const
-        { return *m_unit; }
-
-
@@ -81 +76 @@
-    Subunit();
-
-//     bool discoverPlugs();
-//     bool discoverPlugs(Plug::EPlugDirection plugDirection,
-//                        plug_id_t plugMaxId );
-// 
-    virtual bool serializeChild( Glib::ustring basePath,
-                                 Util::IOSerialize& ser ) const = 0;
@@ -96 +87 @@
-    subunit_t       m_sbId;
-
-       
+
-
-    DECLARE_DEBUG_MODULE;

branches/echoaudio/src/libavc/general/avc_unit.cpp

@@ -46 +46 @@
-IMPL_DEBUG_MODULE( Unit, Unit, DEBUG_LEVEL_VERBOSE );
-
-
-
-
+
-    : m_pPlugManager( new PlugManager( ) )
-    , m_activeSyncInfo( 0 )
-
-
-
-
-
+
+
-}
-
@@ -107 +102 @@
-Unit::enumerateSubUnits()
-{
-*m_pu1394Service
+get1394Service()
-    subUnitInfoCmd.setCommandType( AVCCommand::eCT_Status );
-
@@ -117 +112 @@
-
-    subUnitInfoCmd.m_page = 0;
-m_puConfigRom->
+getConfigRom().
-    subUnitInfoCmd.setVerbose( getDebugLevel() );
-    if ( !subUnitInfoCmd.fire() ) {

branches/echoaudio/src/libavc/general/avc_unit.h

@@ -49 +49 @@
-class Unit {
-public:
-
-
-
+
-    virtual ~Unit();
-
@@ -57 +55 @@
-    virtual void showDevice();
-
-Ieee1394Service& get1394Service()
-    { return *m_pu1394Service; }
-
+// these have to be implemented by the parent class
+/// Returns the 1394 service
+virtual Ieee1394Service& get1394Service() = 0;
-    /// Returns the ConfigRom
-
-
+
-    
-    /// Discovers the unit's internals
@@ -150 +147 @@
-
-private:
-    std::auto_ptr<ConfigRom>( m_puConfigRom );
-    Ieee1394Service*          m_pu1394Service;
-    
-    DECLARE_DEBUG_MODULE;
-