Changeset 548

Timestamp:

08/21/07 10:12:58 (16 years ago)

Author:

ppalmers

Message:

- make the BeBoB AvDevice? a child class of the GenericAVC AvDevice?. This
avoids a lot of code duplication.
- fix inconsistency in position/location numbering between ext pluginfo
cmd and descriptor.

Files:

• branches/echoaudio/src/bebob/bebob_avdevice.cpp (modified) (8 diffs)
• branches/echoaudio/src/bebob/bebob_avdevice.h (modified) (4 diffs)
• branches/echoaudio/src/bebob/bebob_avplug.cpp (modified) (2 diffs)
• branches/echoaudio/src/bebob/bebob_avplug.h (modified) (1 diff)
• branches/echoaudio/src/genericavc/avc_avdevice.cpp (modified) (12 diffs)
• branches/echoaudio/src/genericavc/avc_avdevice.h (modified) (2 diffs)
• branches/echoaudio/src/libavc/general/avc_plug.cpp (modified) (4 diffs)
• branches/echoaudio/src/libavc/general/avc_plug.h (modified) (3 diffs)
• branches/echoaudio/src/libavc/general/avc_unit.cpp (modified) (2 diffs)
• branches/echoaudio/src/libavc/general/avc_unit.h (modified) (1 diff)
• branches/echoaudio/src/libavc/musicsubunit/avc_musicsubunit.cpp (modified) (2 diffs)

branches/echoaudio/src/bebob/bebob_avdevice.cpp

@@ -45 +45 @@
-namespace BeBoB {
-
-
-
-
+
-{
-    {0x00000f, 0x00010065, "Mackie", "Onyx Firewire"},
@@ -74 +72 @@
-                    Ieee1394Service& ieee1394service,
-                    int nodeId )
-
-
-
+
-    , m_Mixer ( NULL )
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Created BeBoB::AvDevice (NodeID %d)\n",
-                 nodeId );
-    addOption(Util::OptionContainer::Option("snoopMode",false));
-}
-
@@ -95 +90 @@
-
-AVC::Subunit* 
-BeBoB::
+
-                               AVC::ESubunitType type,
-                               AVC::subunit_t id ) 
@@ -110 +105 @@
-
-AVC::Plug *
-BeBoB::
+
-                     AVC::Subunit* subunit,
-                     AVC::function_block_type_t functionBlockType,
@@ -128 +123 @@
-}
-
-void
-AvDevice::setVerboseLevel(int l)
-{
-    m_pPlugManager->setVerboseLevel(l);
-
-    FFADODevice::setVerboseLevel(l);
-    AVC::Unit::setVerboseLevel(l);
-}
-
-bool
-AvDevice::probe( ConfigRom& configRom )
@@ -144 +130 @@
-
-    for ( unsigned int i = 0;
-
+GenericAVC::
-          ++i )
-    {
@@ -163 +149 @@
-
-    for ( unsigned int i = 0;
-
+GenericAVC::
-          ++i )
-    {
@@ -223 +209 @@
-
-bool
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    return true;
-}
-
-void
-AvDevice::showDevice()
-{
-    debugOutput(DEBUG_LEVEL_VERBOSE,
-        "%s %s at node %d\n", m_model->vendor_name, m_model->model_name,
-        m_nodeId);
-
-    m_pPlugManager->showPlugs();
-    flushDebugOutput();
-}
-
-
-bool
-AvDevice::lock() {
-    bool snoopMode=false;
-    if(!getOption("snoopMode", snoopMode)) {
-        debugWarning("Could not retrieve snoopMode parameter, defauling to false\n");
-    }
-
-    if (snoopMode) {
-        // don't lock
-    } else {
-//         return Unit::reserve(4);
-    }
-
-    return true;
-}
-
-bool
-AvDevice::unlock() {
-    bool snoopMode=false;
-    if(!getOption("snoopMode", snoopMode)) {
-        debugWarning("Could not retrieve snoopMode parameter, defauling to false\n");
-    }
-
-    if (snoopMode) {
-        // don't unlock
-    } else {
-//         return Unit::reserve(0);
-    }
-    return true;
-}
-
-bool
-AvDevice::prepare() {
-    bool snoopMode=false;
-    if(!getOption("snoopMode", snoopMode)) {
-        debugWarning("Could not retrieve snoopMode parameter, defauling to false\n");
-    }
-
-    ///////////
-    // get plugs
-
-    AVC::Plug* inputPlug = getPlugById( m_pcrPlugs, Plug::eAPD_Input, 0 );
-    if ( !inputPlug ) {
-        debugError( "setSampleRate: Could not retrieve iso input plug 0\n" );
-        return false;
-    }
-    AVC::Plug* outputPlug = getPlugById( m_pcrPlugs, Plug::eAPD_Output, 0 );
-    if ( !outputPlug ) {
-        debugError( "setSampleRate: Could not retrieve iso output plug 0\n" );
-        return false;
-    }
-
-    int samplerate=outputPlug->getSampleRate();
-
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Initializing receive processor...\n");
-    // create & add streamprocessors
-    Streaming::StreamProcessor *p;
-
-    p=new Streaming::AmdtpReceiveStreamProcessor(
-                             m_p1394Service->getPort(),
-                             samplerate,
-                             outputPlug->getNrOfChannels());
-
-    if(!p->init()) {
-        debugFatal("Could not initialize receive processor!\n");
-        delete p;
-        return false;
-    }
-
-    if (!addPlugToProcessor(*outputPlug,p,
-        Streaming::Port::E_Capture)) {
-        debugFatal("Could not add plug to processor!\n");
-        delete p;
-        return false;
-    }
-
-    m_receiveProcessors.push_back(p);
-
-    // do the transmit processor
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Initializing transmit processor%s...\n",
-            (snoopMode?" in snoop mode":""));
-    if (snoopMode) {
-        // we are snooping, so this is receive too.
-        p=new Streaming::AmdtpReceiveStreamProcessor(
-                                  m_p1394Service->getPort(),
-                                  samplerate,
-                                  inputPlug->getNrOfChannels());
-    } else {
-        p=new Streaming::AmdtpTransmitStreamProcessor(
-                                m_p1394Service->getPort(),
-                                samplerate,
-                                inputPlug->getNrOfChannels());
-    }
-
-    if(!p->init()) {
-        debugFatal("Could not initialize transmit processor %s!\n",
-            (snoopMode?" in snoop mode":""));
-        delete p;
-        return false;
-    }
-
-    if (snoopMode) {
-        if (!addPlugToProcessor(*inputPlug,p,
-            Streaming::Port::E_Capture)) {
-            debugFatal("Could not add plug to processor!\n");
-            return false;
-        }
-    } else {
-        if (!addPlugToProcessor(*inputPlug,p,
-            Streaming::Port::E_Playback)) {
-            debugFatal("Could not add plug to processor!\n");
-            return false;
-        }
-    }
-
-    // we put this SP into the transmit SP vector,
-    // no matter if we are in snoop mode or not
-    // this allows us to find out what direction
-    // a certain stream should have.
-    m_transmitProcessors.push_back(p);
-
-    return true;
-}
-
-bool
-AvDevice::addPlugToProcessor(
-    AVC::Plug& plug,
-    Streaming::StreamProcessor *processor,
-    Streaming::AmdtpAudioPort::E_Direction direction) {
-
-    std::string id=std::string("dev?");
-    if(!getOption("id", id)) {
-        debugWarning("Could not retrieve id parameter, defauling to 'dev?'\n");
-    }
-
-    Plug::ClusterInfoVector& clusterInfos = plug.getClusterInfos();
-    for ( Plug::ClusterInfoVector::const_iterator it = clusterInfos.begin();
-          it != clusterInfos.end();
-          ++it )
-    {
-        const Plug::ClusterInfo* clusterInfo = &( *it );
-
-        Plug::ChannelInfoVector channelInfos = clusterInfo->m_channelInfos;
-        for ( Plug::ChannelInfoVector::const_iterator it = channelInfos.begin();
-              it != channelInfos.end();
-              ++it )
-        {
-            const Plug::ChannelInfo* channelInfo = &( *it );
-            std::ostringstream portname;
-
-            portname << id << "_" << channelInfo->m_name;
-
-            Streaming::Port *p=NULL;
-            switch(clusterInfo->m_portType) {
-            case ExtendedPlugInfoClusterInfoSpecificData::ePT_Speaker:
-            case ExtendedPlugInfoClusterInfoSpecificData::ePT_Headphone:
-            case ExtendedPlugInfoClusterInfoSpecificData::ePT_Microphone:
-            case ExtendedPlugInfoClusterInfoSpecificData::ePT_Line:
-            case ExtendedPlugInfoClusterInfoSpecificData::ePT_Analog:
-                debugOutput(DEBUG_LEVEL_VERBOSE, " Adding audio channel %s (pos=0x%02X, loc=0x%02X)\n",
-                    channelInfo->m_name.c_str(), channelInfo->m_streamPosition-1, channelInfo->m_location-1);
-                p=new Streaming::AmdtpAudioPort(
-                        portname.str(),
-                        direction,
-                        // \todo: streaming backend expects indexing starting from 0
-                        // but bebob reports it starting from 1. Decide where
-                        // and how to handle this (pp: here)
-                        // note that the descriptor mechanism specifies indexing from 0
-                        channelInfo->m_streamPosition-1,
-                        channelInfo->m_location - 1,
-                        Streaming::AmdtpPortInfo::E_MBLA
-                );
-                break;
-
-            case ExtendedPlugInfoClusterInfoSpecificData::ePT_MIDI:
-                debugOutput(DEBUG_LEVEL_VERBOSE, " Adding MIDI channel %s (pos=0x%02X, loc=0x%02X)\n",
-                    channelInfo->m_name.c_str(), channelInfo->m_streamPosition-1, processor->getPortCount(Streaming::Port::E_Midi));
-                p=new Streaming::AmdtpMidiPort(
-                        portname.str(),
-                        direction,
-                        channelInfo->m_streamPosition-1,
-                        // Workaround for out-of-spec hardware
-                        // should be:
-                        // channelInfo->m_location-1,
-                        // but now we renumber the midi channels' location as they
-                        // are discovered
-                        processor->getPortCount(Streaming::Port::E_Midi),
-                        Streaming::AmdtpPortInfo::E_Midi
-                );
-
-                break;
-            case ExtendedPlugInfoClusterInfoSpecificData::ePT_SPDIF:
-            case ExtendedPlugInfoClusterInfoSpecificData::ePT_ADAT:
-            case ExtendedPlugInfoClusterInfoSpecificData::ePT_TDIF:
-            case ExtendedPlugInfoClusterInfoSpecificData::ePT_MADI:
-            case ExtendedPlugInfoClusterInfoSpecificData::ePT_Digital:
-            case ExtendedPlugInfoClusterInfoSpecificData::ePT_NoType:
-            default:
-            // unsupported
-                break;
-            }
-
-            if (!p) {
-                debugOutput(DEBUG_LEVEL_VERBOSE, "Skipped port %s\n",channelInfo->m_name.c_str());
-            } else {
-
-                if (!processor->addPort(p)) {
-                    debugWarning("Could not register port with stream processor\n");
-                    return false;
-                }
-            }
-         }
-    }
-    return true;
-}
-
-int
-AvDevice::getStreamCount() {
-    return m_receiveProcessors.size() + m_transmitProcessors.size();
-}
-
-Streaming::StreamProcessor *
-AvDevice::getStreamProcessorByIndex(int i) {
-
-    if (i<(int)m_receiveProcessors.size()) {
-        return m_receiveProcessors.at(i);
-    } else if (i<(int)m_receiveProcessors.size() + (int)m_transmitProcessors.size()) {
-        return m_transmitProcessors.at(i-m_receiveProcessors.size());
-    }
-
-    return NULL;
-}
-
-bool
-AvDevice::startStreamByIndex(int i) {
-    int iso_channel=-1;
-    bool snoopMode=false;
-    if(!getOption("snoopMode", snoopMode)) {
-        debugWarning("Could not retrieve snoopMode parameter, defauling to false\n");
-    }
-
-    if (i<(int)m_receiveProcessors.size()) {
-        int n=i;
-        Streaming::StreamProcessor *p=m_receiveProcessors.at(n);
-
-        if(snoopMode) { // a stream from the device to another host
-            // FIXME: put this into a decent framework!
-            // we should check the oPCR[n] on the device
-            struct iec61883_oPCR opcr;
-            if (iec61883_get_oPCRX(
-                    m_p1394Service->getHandle(),
-                    m_pConfigRom->getNodeId() | 0xffc0,
-                    (quadlet_t *)&opcr,
-                    n)) {
-
-                debugWarning("Error getting the channel for SP %d\n",i);
-                return false;
-            }
-
-            iso_channel=opcr.channel;
-        } else {
-            iso_channel=m_p1394Service->allocateIsoChannelCMP(
-                m_pConfigRom->getNodeId() | 0xffc0, n,
-                m_p1394Service->getLocalNodeId()| 0xffc0, -1);
-        }
-        if (iso_channel<0) {
-            debugError("Could not allocate ISO channel for SP %d\n",i);
-            return false;
-        }
-
-        debugOutput(DEBUG_LEVEL_VERBOSE, "Started SP %d on channel %d\n",i,iso_channel);
-
-        p->setChannel(iso_channel);
-        return true;
-
-    } else if (i<(int)m_receiveProcessors.size() + (int)m_transmitProcessors.size()) {
-        int n=i-m_receiveProcessors.size();
-        Streaming::StreamProcessor *p=m_transmitProcessors.at(n);
-
-        if(snoopMode) { // a stream from another host to the device
-            // FIXME: put this into a decent framework!
-            // we should check the iPCR[n] on the device
-            struct iec61883_iPCR ipcr;
-            if (iec61883_get_iPCRX(
-                    m_p1394Service->getHandle(),
-                    m_pConfigRom->getNodeId() | 0xffc0,
-                    (quadlet_t *)&ipcr,
-                    n)) {
-
-                debugWarning("Error getting the channel for SP %d\n",i);
-                return false;
-            }
-
-            iso_channel=ipcr.channel;
-
-        } else {
-            iso_channel=m_p1394Service->allocateIsoChannelCMP(
-                m_p1394Service->getLocalNodeId()| 0xffc0, -1,
-                m_pConfigRom->getNodeId() | 0xffc0, n);
-        }
-
-        if (iso_channel<0) {
-            debugError("Could not allocate ISO channel for SP %d\n",i);
-            return false;
-        }
-
-        debugOutput(DEBUG_LEVEL_VERBOSE, "Started SP %d on channel %d\n",i,iso_channel);
-
-        p->setChannel(iso_channel);
-        return true;
-    }
-
-    debugError("SP index %d out of range!\n",i);
-    return false;
-}
-
-bool
-AvDevice::stopStreamByIndex(int i) {
-    bool snoopMode=false;
-    if(!getOption("snoopMode", snoopMode)) {
-        debugWarning("Could not retrieve snoopMode parameter, defauling to false\n");
-    }
-
-    if (i<(int)m_receiveProcessors.size()) {
-        int n=i;
-        Streaming::StreamProcessor *p=m_receiveProcessors.at(n);
-
-        if(snoopMode) {
-
-        } else {
-            // deallocate ISO channel
-            if(!m_p1394Service->freeIsoChannel(p->getChannel())) {
-                debugError("Could not deallocate iso channel for SP %d\n",i);
-                return false;
-            }
-        }
-        p->setChannel(-1);
-
-        return true;
-
-    } else if (i<(int)m_receiveProcessors.size() + (int)m_transmitProcessors.size()) {
-        int n=i-m_receiveProcessors.size();
-        Streaming::StreamProcessor *p=m_transmitProcessors.at(n);
-
-        if(snoopMode) {
-
-        } else {
-            // deallocate ISO channel
-            if(!m_p1394Service->freeIsoChannel(p->getChannel())) {
-                debugError("Could not deallocate iso channel for SP %d\n",i);
-                return false;
-            }
-        }
-        p->setChannel(-1);
-
-        return true;
-    }
-
-    debugError("SP index %d out of range!\n",i);
-    return false;
-}
-

branches/echoaudio/src/bebob/bebob_avdevice.h

@@ -44 +44 @@
-#include "libutil/serialize.h"
-
+#include "genericavc/avc_avdevice.h"
+
-#include "ffadodevice.h"
-
@@ -54 +56 @@
-namespace BeBoB {
-
-
-
-
-
-
-
-
-
+
-public:
-    AvDevice( std::auto_ptr<ConfigRom>( configRom ),
@@ -68 +63 @@
-    virtual ~AvDevice();
-
-    void setVerboseLevel(int l);
-
-    static bool probe( ConfigRom& configRom );
-    virtual bool discover();
-
-    virtual bool setSamplingFrequency( int );
-    virtual int getSamplingFrequency( );
-
-    virtual int getStreamCount();
-    virtual Streaming::StreamProcessor *getStreamProcessorByIndex(int i);
-
-    virtual bool prepare();
-    bool lock();
-    bool unlock();
-
-    bool startStreamByIndex(int i);
-    bool stopStreamByIndex(int i);
-
-    virtual void showDevice();
-
-    bool serialize( Glib::ustring basePath, Util::IOSerialize& ser ) const;
-    static AvDevice* deserialize( Glib::ustring basePath,
-                                  Util::IODeserialize& deser,
-                                  Ieee1394Service& ieee1394Service );
-
-    // redefinition to resolve ambiguity
-    Ieee1394Service& get1394Service()
-        { return FFADODevice::get1394Service(); };
-    ConfigRom& getConfigRom() const 
-        { return FFADODevice::getConfigRom(); };
-        
-    virtual AVC::Subunit* createSubunit(AVC::Unit& unit,
-                                        AVC::ESubunitType type,
@@ -109 +76 @@
-                                   AVC::Plug::EPlugDirection plugDirection,
-                                   AVC::plug_id_t plugId );
-protected:
-
-    virtual bool addPlugToProcessor( AVC::Plug& plug, Streaming::StreamProcessor *processor,
-                             Streaming::AmdtpAudioPort::E_Direction direction);
-
-    bool setSamplingFrequencyPlug( AVC::Plug& plug,
-                                   AVC::Plug::EPlugDirection direction,
-                                   AVC::ESamplingFrequency samplingFrequency );
-
-    virtual bool propagateClusterInfos() {return true;};
-
-protected:
-
+
+
+
+
+
+
+
+
+
-    GenericMixer*             m_Mixer;
-
-    // streaming stuff
-    typedef std::vector< Streaming::StreamProcessor * > StreamProcessorVector;
-    StreamProcessorVector m_receiveProcessors;
-    StreamProcessorVector m_transmitProcessors;
-
-    DECLARE_DEBUG_MODULE;
-};
-

branches/echoaudio/src/bebob/bebob_avplug.cpp

@@ -312 +312 @@
-
-bool
+Plug::copyClusterInfo(ExtendedPlugInfoPlugChannelPositionSpecificData&
+                        channelPositionData )
+{
+    int index = 1;
+    for ( ExtendedPlugInfoPlugChannelPositionSpecificData::ClusterInfoVector::const_iterator it
+              = channelPositionData.m_clusterInfos.begin();
+          it != channelPositionData.m_clusterInfos.end();
+          ++it )
+    {
+        const ExtendedPlugInfoPlugChannelPositionSpecificData::ClusterInfo*
+            extPlugSpClusterInfo = &( *it );
+
+        ClusterInfo clusterInfo;
+        clusterInfo.m_nrOfChannels = extPlugSpClusterInfo->m_nrOfChannels;
+        clusterInfo.m_index = index;
+        index++;
+
+        for (  ExtendedPlugInfoPlugChannelPositionSpecificData::ChannelInfoVector::const_iterator cit
+                  = extPlugSpClusterInfo->m_channelInfos.begin();
+              cit != extPlugSpClusterInfo->m_channelInfos.end();
+              ++cit )
+        {
+            const ExtendedPlugInfoPlugChannelPositionSpecificData::ChannelInfo*
+                extPlugSpChannelInfo = &( *cit );
+
+            ChannelInfo channelInfo;
+            channelInfo.m_streamPosition =
+                extPlugSpChannelInfo->m_streamPosition-1;
+            // FIXME: this can only become a mess with the two meanings
+            //        of the location parameter. the audio style meaning
+            //        starts from 1, the midi style meaning from 0
+            //        lucky for us we recalculate this for the midi channels
+            //        and don't use this value.
+            channelInfo.m_location =
+                extPlugSpChannelInfo->m_location;
+
+            clusterInfo.m_channelInfos.push_back( channelInfo );
+        }
+        m_clusterInfos.push_back( clusterInfo );
+    }
+
+    return true;
+}
+
+bool
-Plug::discoverChannelName()
-{
@@ -539 +584 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

branches/echoaudio/src/bebob/bebob_avplug.h

@@ -78 +78 @@
-
-private:
+    bool copyClusterInfo(AVC::ExtendedPlugInfoPlugChannelPositionSpecificData&
+                         channelPositionData );
+    AVC::ExtendedPlugInfoCmd setPlugAddrToPlugInfoCmd();
+
-
-};

branches/echoaudio/src/genericavc/avc_avdevice.cpp

@@ -65 +65 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Created GenericAVC::AvDevice (NodeID %d)\n",
-                 nodeId );
+    addOption(Util::OptionContainer::Option("snoopMode",false));
-}
-
@@ -134 +135 @@
-}
-
+void
+AvDevice::setVerboseLevel(int l)
+{
+    m_pPlugManager->setVerboseLevel(l);
+
+    FFADODevice::setVerboseLevel(l);
+    AVC::Unit::setVerboseLevel(l);
+}
+
-int
-AvDevice::getSamplingFrequency( ) {
@@ -159 +169 @@
-AvDevice::setSamplingFrequency( int s )
-{
-    ESamplingFrequency samplingFrequency=parseSampleRate( s );
-    bool snoopMode=false;
-    if(!getOption("snoopMode", snoopMode)) {
@@ -167 +176 @@
-    if(snoopMode) {
-        int current_sr=getSamplingFrequency();
-convertESamplingFrequency( samplingFrequency )
+s
-            debugError("In snoop mode it is impossible to set the sample rate.\n");
-            debugError("Please start the client with the correct setting.\n");
@@ -180 +189 @@
-        }
-
-convertESamplingFrequency( samplingFrequency )
+s
-        {
-            debugError( "setSampleRate: Setting sample rate failed\n" );
@@ -192 +201 @@
-        }
-
-convertESamplingFrequency( samplingFrequency )
+s
-        {
-            debugError( "setSampleRate: Setting sample rate failed\n" );
@@ -200 +209 @@
-        debugOutput( DEBUG_LEVEL_VERBOSE,
-                     "setSampleRate: Set sample rate to %d\n",
-convertESamplingFrequency( samplingFrequency )
+s
-        return true;
-    }
@@ -348 +357 @@
-    Streaming::StreamProcessor *processor,
-    Streaming::AmdtpAudioPort::E_Direction direction) {
-        
-    debugOutput(DEBUG_LEVEL_VERBOSE, " Adding plug %s to processor\n", plug.getName());
-
-    std::string id=std::string("dev?");
@@ -362 +369 @@
-    {
-        const Plug::ClusterInfo* clusterInfo = &( *it );
-        
-        debugOutput(DEBUG_LEVEL_VERBOSE, " Adding cluster %s\n", clusterInfo->m_name.c_str());
-
-        Plug::ChannelInfoVector channelInfos = clusterInfo->m_channelInfos;
@@ -370 +375 @@
-              ++it )
-        {
-
-            const Plug::ChannelInfo* channelInfo = &( *it );
-            
-            std::ostringstream portname;
-
@@ -396 +399 @@
-
-            case ExtendedPlugInfoClusterInfoSpecificData::ePT_MIDI:
-                // HACK: for audiofire2 only !!!
-                debugOutput(DEBUG_LEVEL_VERBOSE, " Adding MIDI channel %s (pos=0x%02X, loc=0x%02X)\n",
-
-
+
-                p=new Streaming::AmdtpMidiPort(
-                        portname.str(),
-                        direction,
-
-
+
-                        // Workaround for out-of-spec hardware
-                        // should be:
@@ -420 +420 @@
-            case ExtendedPlugInfoClusterInfoSpecificData::ePT_MADI:
-            case ExtendedPlugInfoClusterInfoSpecificData::ePT_Digital:
+                debugOutput(DEBUG_LEVEL_VERBOSE, " Adding digital audio channel %s (pos=0x%02X, loc=0x%02X)\n",
+                    channelInfo->m_name.c_str(), channelInfo->m_streamPosition, channelInfo->m_location);
+                p=new Streaming::AmdtpAudioPort(
+                        portname.str(),
+                        direction,
+                        channelInfo->m_streamPosition,
+                        channelInfo->m_location,
+                        Streaming::AmdtpPortInfo::E_MBLA
+                );
+                break;
+                
-            case ExtendedPlugInfoClusterInfoSpecificData::ePT_NoType:
-            default:

branches/echoaudio/src/genericavc/avc_avdevice.h

@@ -60 +60 @@
-
-    static bool probe( ConfigRom& configRom );
-
+
+
+
+
-
-
+
+
-
-bool setSamplingFrequency( int 
-int getSamplingFrequency( 
+virtual int getStreamCount(
+virtual Streaming::StreamProcessor *getStreamProcessorByIndex(int i
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
-    
-    // redefinition to resolve ambiguity
-
+virtual 
-        { return FFADODevice::get1394Service(); };
-
+virtual 
-        { return FFADODevice::getConfigRom(); };
-        
@@ -86 +87 @@
-    virtual bool addPlugToProcessor( AVC::Plug& plug, Streaming::StreamProcessor *processor,
-                             Streaming::AmdtpAudioPort::E_Direction direction);
-
+/*
-                                   AVC::Plug::EPlugDirection direction,
-
+*/
-    
-    struct VendorModelEntry *m_model;

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

@@ -520 +520 @@
-Plug::discoverConnectionsOutput()
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Discovering outgoing connections...\n");
-    
-//     int i=0;
-//     int nbPlugs=m_unit->getPlugManager().getPlugCount();
-//     debugOutput( DEBUG_LEVEL_VERBOSE, "checking %d plugs\n", nbPlugs);
-//     
-//     for (i=0;i<nbPlugs;i++) {
-//         Plug *p=m_unit->getPlugManager().getPlug(i);
-//         
-//         if(p==NULL) {
-//             debugError("could not get plug 0x%02X\n",i);
-//             continue;
-//         }
-//         
-//         if(p->getGlobalId()==getGlobalId()) continue; // skip yourself
-//         
-// 
-//     }
-
-    return true;
-}
@@ -1098 +1079 @@
-        debugError( "Unknown subunit type\n" );
-    }
-}
-
-
-bool
-Plug::copyClusterInfo(ExtendedPlugInfoPlugChannelPositionSpecificData&
-                        channelPositionData )
-{
-    int index = 1;
-    for ( ExtendedPlugInfoPlugChannelPositionSpecificData::ClusterInfoVector::const_iterator it
-              = channelPositionData.m_clusterInfos.begin();
-          it != channelPositionData.m_clusterInfos.end();
-          ++it )
-    {
-        const ExtendedPlugInfoPlugChannelPositionSpecificData::ClusterInfo*
-            extPlugSpClusterInfo = &( *it );
-
-        ClusterInfo clusterInfo;
-        clusterInfo.m_nrOfChannels = extPlugSpClusterInfo->m_nrOfChannels;
-        clusterInfo.m_index = index;
-        index++;
-
-        for (  ExtendedPlugInfoPlugChannelPositionSpecificData::ChannelInfoVector::const_iterator cit
-                  = extPlugSpClusterInfo->m_channelInfos.begin();
-              cit != extPlugSpClusterInfo->m_channelInfos.end();
-              ++cit )
-        {
-            const ExtendedPlugInfoPlugChannelPositionSpecificData::ChannelInfo*
-                extPlugSpChannelInfo = &( *cit );
-
-            ChannelInfo channelInfo;
-            channelInfo.m_streamPosition =
-                extPlugSpChannelInfo->m_streamPosition;
-            channelInfo.m_location =
-                extPlugSpChannelInfo->m_location;
-
-            clusterInfo.m_channelInfos.push_back( channelInfo );
-        }
-        m_clusterInfos.push_back( clusterInfo );
-    }
-
-    return true;
-}
-
@@ -2308 +2248 @@
-}
-
-
-
-
-
-
+
+
+
+
+
+
+
-    switch( getSubunitType() ) {
-    case eST_Unit:
-    
+
-            UnitPlugAddress::EPlugType ePlugType =
-                UnitPlugAddress::ePT_Unknown;
@@ -2331 +2273 @@
-                    ePlugType = UnitPlugAddress::ePT_Unknown;
-            }
-            UnitPlugAddress unitPlugAddress( ePlugType,
-                                             m_id );
-            extPlugInfoCmd.setPlugAddress(
-                PlugAddress( convertPlugDirection( getPlugDirection() ),
-                             PlugAddress::ePAM_Unit,
-                             unitPlugAddress ) );
-        }
-        break;
-    case eST_Music:
-    case eST_Audio:
-        {
-            switch( m_addressType ) {
-            case eAPA_SubunitPlug:
-            {
-                SubunitPlugAddress subunitPlugAddress( m_id );
-                extPlugInfoCmd.setPlugAddress(
-                    PlugAddress(
-                        convertPlugDirection( getPlugDirection() ),
-                        PlugAddress::ePAM_Subunit,
-                        subunitPlugAddress ) );
-            }
-            break;
-            case eAPA_FunctionBlockPlug:
-            {
-                FunctionBlockPlugAddress functionBlockPlugAddress(
-                    m_functionBlockType,
-                    m_functionBlockId,
-                    m_id );
-                extPlugInfoCmd.setPlugAddress(
-                    PlugAddress(
-                        convertPlugDirection( getPlugDirection() ),
-                        PlugAddress::ePAM_FunctionBlock,
-                        functionBlockPlugAddress ) );
-            }
-            break;
-            default:
-                extPlugInfoCmd.setPlugAddress(PlugAddress());
-            }
-        }
-        break;
-    default:
-        debugError( "Unknown subunit type\n" );
-    }
-
-    extPlugInfoCmd.setNodeId( m_unit->getConfigRom().getNodeId() );
-    extPlugInfoCmd.setCommandType( AVCCommand::eCT_Status );
-    extPlugInfoCmd.setSubunitId( getSubunitId() );
-    extPlugInfoCmd.setSubunitType( getSubunitType() );
-
-    return extPlugInfoCmd;
-}
-
-ExtendedStreamFormatCmd
-Plug::setPlugAddrToStreamFormatCmd(
-    ExtendedStreamFormatCmd::ESubFunction subFunction)
-{
-    ExtendedStreamFormatCmd extStreamFormatInfoCmd(
-        m_unit->get1394Service(),
-        subFunction );
-    switch( getSubunitType() ) {
-    case eST_Unit:
-    {
-            UnitPlugAddress::EPlugType ePlugType =
-                UnitPlugAddress::ePT_Unknown;
-            switch ( m_addressType ) {
-                case eAPA_PCR:
-                    ePlugType = UnitPlugAddress::ePT_PCR;
-                    break;
-                case eAPA_ExternalPlug:
-                    ePlugType = UnitPlugAddress::ePT_ExternalPlug;
-                    break;
-                case eAPA_AsynchronousPlug:
-                    ePlugType = UnitPlugAddress::ePT_AsynchronousPlug;
-                    break;
-                default:
-                    ePlugType = UnitPlugAddress::ePT_Unknown;
-            }
-        UnitPlugAddress unitPlugAddress( ePlugType,
-                                         m_id );

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

@@ -28 +28 @@
-#include "../ccm/avc_signal_source.h"
-#include "../streamformat/avc_extended_stream_format.h"
-#include "avc_extended_plug_info.h"
-#include "avc_extended_cmd_generic.h"
-#include "../avc_definitions.h"
-#include "avc_generic.h"
@@ -214 +212 @@
-    bool propagateFromPlug( Plug *p );
-
-    ExtendedPlugInfoCmd setPlugAddrToPlugInfoCmd();
-
-    ExtendedStreamFormatCmd setPlugAddrToStreamFormatCmd(
-            ExtendedStreamFormatCmd::ESubFunction subFunction);
@@ -228 +224 @@
-
-    void debugOutputClusterInfos( int debugLevel );
-
-    bool copyClusterInfo(ExtendedPlugInfoPlugChannelPositionSpecificData&
-                         channelPositionData );
-
-    bool addPlugConnection( PlugVector& connections, Plug& plug );

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

@@ -156 +156 @@
-    }
-
-ClusterInfos
-cluster info's
+PlugInfo
+plug info
-        return false;
-    }
@@ -458 +458 @@
-
-bool
-ClusterInfos
+PlugInfo
-{
-    debugOutput( DEBUG_LEVEL_NORMAL, "Propagating info to PCR plugs...\n");

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

@@ -127 +127 @@
-    virtual bool discoverPlugsExternal( AVC::Plug::EPlugDirection plugDirection,
-                                AVC::plug_id_t plugMaxId );
-ClusterInfos
+PlugInfo
-    virtual bool discoverSyncModes();
-    virtual bool checkSyncConnectionsAndAddToList( AVC::PlugVector& plhs,

branches/echoaudio/src/libavc/musicsubunit/avc_musicsubunit.cpp

@@ -124 +124 @@
-    // number of channels
-    result &= plug.setNrOfChannels(info->m_nb_channels);
-    
-    
-    
-    int idx=1;
@@ -165 +163 @@
-            }
-            
+            if (plug.getDirection() == Plug::eAPD_Input) {
+                // it's an input plug to the subunit 
+                // so we have to check the source field of the music plug
+                if(s.stream_position != mplug->m_source_stream_position) {
+                    debugWarning("s.stream_position (= 0x%02X) != mplug->m_source_stream_position (= 0x%02X)\n",
+                        s.stream_position, mplug->m_source_stream_position);
+                    // use the one from the music plug
+                    sinfo.m_streamPosition= mplug->m_source_stream_position;
+                }
+                if(s.stream_location != mplug->m_source_stream_location) {
+                    debugWarning("s.stream_location (= 0x%02X) != mplug->m_source_stream_location (= 0x%02X)\n",
+                        s.stream_location, mplug->m_source_stream_location);
+                    // use the one from the music plug
+                    sinfo.m_location=mplug->m_source_stream_location;
+                }
+            } else if (plug.getDirection() == Plug::eAPD_Output) {
+                // it's an output plug from the subunit 
+                // so we have to check the destination field of the music plug
+                if(s.stream_position != mplug->m_dest_stream_position) {
+                    debugWarning("s.stream_position (= 0x%02X) != mplug->m_dest_stream_position (= 0x%02X)\n",
+                        s.stream_position, mplug->m_dest_stream_position);
+                    // use the one from the music plug
+                    sinfo.m_streamPosition=mplug->m_dest_stream_position;
+                }
+                if(s.stream_location != mplug->m_dest_stream_location) {
+                    debugWarning("s.stream_location (= 0x%02X) != mplug->m_dest_stream_location (= 0x%02X)\n",
+                        s.stream_location, mplug->m_dest_stream_location);
+                    // use the one from the music plug
+                    sinfo.m_location=mplug->m_dest_stream_location;
+                }
+            } else {
+                debugWarning("Invalid plug direction.\n");
+            }
+            
-            debugOutput(DEBUG_LEVEL_VERBOSE, "Adding signal pos=%2d loc=%2d name=%s\n",
-                sinfo.m_streamPosition, sinfo.m_location, mplug->getName().c_str());