Changeset 416

Timestamp:

02/25/07 02:46:00 (16 years ago)

Author:

pieterpalmers

Message:

- Introduced a generic option mechanism. AvDevices? now automatically

inherit from OptionContainer? (via IAvDevice) and can specify options
(e.g. at construction). These can then be get/set using the container
functions from the outside.

- Modified the bebob, bounce, motu, mh, rme AvDevices? to make use of the

option system for their Id value and the 'snoopMode' option.

- Made M-Audio avdevice a subclass of the BeBoB avdevice to avoid code

duplication.

- Extended the bounce device

Files:

• branches/streaming-rework/src/bebob/bebob_avdevice.cpp (modified) (14 diffs)
• branches/streaming-rework/src/bebob/bebob_avdevice.h (modified) (2 diffs)
• branches/streaming-rework/src/bounce/bounce_avdevice.cpp (modified) (6 diffs)
• branches/streaming-rework/src/bounce/bounce_avdevice.h (modified) (4 diffs)
• branches/streaming-rework/src/iavdevice.h (modified) (3 diffs)
• branches/streaming-rework/src/libutil/OptionContainer.cpp (added)
• branches/streaming-rework/src/libutil/OptionContainer.h (added)
• branches/streaming-rework/src/libutil/unittests.cpp (modified) (4 diffs)
• branches/streaming-rework/src/Makefile.am (modified) (2 diffs)
• branches/streaming-rework/src/maudio/maudio_avdevice.cpp (modified) (9 diffs)
• branches/streaming-rework/src/maudio/maudio_avdevice.h (modified) (3 diffs)
• branches/streaming-rework/src/metrichalo/mh_avdevice.cpp (modified) (8 diffs)
• branches/streaming-rework/src/metrichalo/mh_avdevice.h (modified) (1 diff)
• branches/streaming-rework/src/motu/motu_avdevice.cpp (modified) (16 diffs)
• branches/streaming-rework/src/motu/motu_avdevice.h (modified) (1 diff)
• branches/streaming-rework/src/rme/rme_avdevice.cpp (modified) (5 diffs)
• branches/streaming-rework/src/rme/rme_avdevice.h (modified) (2 diffs)

branches/streaming-rework/src/bebob/bebob_avdevice.cpp

@@ -76 +76 @@
-    , m_model ( NULL )
-    , m_nodeId ( nodeId )
-    , m_id( 0 )
-    , m_snoopMode( false )
-{
-    setDebugLevel( verboseLevel );
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Created BeBoB::AvDevice (NodeID %d)\n",
-                 nodeId );
+    addOption(FreebobUtil::OptionContainer::Option("snoopMode",false));
+    addOption(FreebobUtil::OptionContainer::Option("id",std::string("dev?")));
-}
-
@@ -92 +92 @@
-    , m_model ( NULL )
-    , m_nodeId ( -1 )
-
-, m_snoopMode( false )
-
+
+addOption(FreebobUtil::OptionContainer::Option("snoopMode",false));
+
-}
-
-AvDevice::~AvDevice()
-{
+
-    for ( AvDeviceSubunitVector::iterator it = m_subunits.begin();
-          it != m_subunits.end();
@@ -166 +167 @@
-        {
-            m_model = &(supportedDeviceList[i]);
+            break;
-        }
-    }
@@ -942 +944 @@
-{
-    // FIXME: decent ID system nescessary
-
-
+
+
+
+
+
+
+
-}
-
@@ -961 +968 @@
-bool
-AvDevice::prepare() {
+    bool snoopMode=false;
+    if(!getOption("snoopMode", snoopMode)) {
+        debugWarning("Could not retrieve snoopMode parameter, defauling to false\n");
+    }
+
-    ///////////
-    // get plugs
@@ -1001 +1013 @@
-
-    // do the transmit processor
-m_
+
-        // we are snooping, so this is receive too.
-        p=new FreebobStreaming::AmdtpReceiveStreamProcessor(
@@ -1016 +1028 @@
-    if(!p->init()) {
-        debugFatal("Could not initialize transmit processor %s!\n",
-m_
+
-        delete p;
-        return false;
-    }
-
-m_
+
-        if (!addPlugToProcessor(*inputPlug,p,
-            FreebobStreaming::Port::E_Capture)) {
@@ -1027 +1039 @@
-            return false;
-        }
+        m_receiveProcessors.push_back(p);
-    } else {
-        if (!addPlugToProcessor(*inputPlug,p,
@@ -1033 +1046 @@
-            return false;
-        }
+        m_transmitProcessors.push_back(p);
-    }
-
@@ -1043 +1057 @@
-    FreebobStreaming::StreamProcessor *processor,
-    FreebobStreaming::AmdtpAudioPort::E_Direction direction) {
-
+
+
+
+
+
+
-    AvPlug::ClusterInfoVector& clusterInfos = plug.getClusterInfos();
-    for ( AvPlug::ClusterInfoVector::const_iterator it = clusterInfos.begin();
@@ -1059 +1078 @@
-            std::ostringstream portname;
-
-"dev" << m_
+
-
-            FreebobStreaming::Port *p=NULL;
@@ -1332 +1351 @@
-                     Util::IOSerialize& ser ) const
-{
+    
-    bool result;
-    result  = m_pConfigRom->serialize( basePath + "m_pConfigRom/", ser );
@@ -1353 +1373 @@
-    }
-
-    result &= ser.write( basePath + "m_id", m_
+//     result &= ser.write( basePath + "m_id", 
-
-    return result;
@@ -1397 +1417 @@
-        }
-
-
+// 
-    }
-

branches/streaming-rework/src/bebob/bebob_avdevice.h

@@ -40 +40 @@
-
-#include <sstream>
+#include <vector>
-
-class ConfigRom;
@@ -181 +182 @@
-    struct VendorModelEntry*  m_model;
-    int                       m_nodeId;
-    unsigned int              m_id;
-    bool                      m_snoopMode;
-
-    // streaming stuff

branches/streaming-rework/src/bounce/bounce_avdevice.cpp

@@ -56 +56 @@
-                            int verboseLevel )
-    : m_configRom( configRom )
-
+p
-    , m_nodeId( nodeId )
-    , m_verboseLevel( verboseLevel )
-    , m_samplerate (44100)
-    , m_model( NULL )
-
-
-
-
-
+
-{
-    setDebugLevel( verboseLevel );
@@ -71 +67 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Created Bounce::BounceDevice (NodeID %d)\n",
-                 nodeId );
+    addOption(FreebobUtil::OptionContainer::Option("snoopMode",false));
+    addOption(FreebobUtil::OptionContainer::Option("id",std::string("dev?")));
-}
-
@@ -153 +151 @@
-
-        request[1] =  0xFFFFFFFF;
-
+p
-                                                       request,
-                                                       2,
@@ -181 +179 @@
-
-bool BounceDevice::setId( unsigned int id) {
-
-
-
+
+
+
+
+
+
+
+
-}
-
@@ -225 +228 @@
-bool
-BounceDevice::addPortsToProcessor(
-       
-       FreebobStreaming::AmdtpAudio
+    
+    FreebobStreaming::
-
-    debugOutput(DEBUG_LEVEL_VERBOSE,"Adding ports to processor\n");
-
+
+
+
+
+
+
-    int i=0;
-    for (i=0;i<BOUNCE_NR_OF_CHANNELS;i++) {
-        char *buff;
-dev%d%s_Port%d",m_id
+%s%s_Port%d",id.c_str()
-
-        FreebobStreaming::Port *p=NULL;
@@ -269 +277 @@
-bool
-BounceDevice::prepare() {
-
-    debugOutput(DEBUG_LEVEL_NORMAL, "Preparing BounceDevice...\n" );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-int
-BounceDevice::getStreamCount() {
-      return 2; // one receive, one transmit
+   return m_receiveProcessors.size() + m_transmitProcessors.size();
-}
-
-FreebobStreaming::StreamProcessor *
-BounceDevice::getStreamProcessorByIndex(int i) {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-}
-
-bool
-BounceDevice::startStreamByIndex(int i) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-bool
-BounceDevice::stopStreamByIndex(int i) {
-        // do connection management: break connection
-
-//      int plug=0;
-//      int hostplug=-1;
-//
-//      switch (i) {
-//      case 0:
-//              // do connection management: break connection
-//              iec61883_cmp_disconnect(
-//                      m_1394Service->getHandle(),
-//                      m_nodeId | 0xffc0,
-//                      plug,
-//                      raw1394_get_local_id (m_1394Service->getHandle()),
-//                      hostplug,
-//                      m_receiveProcessor->getChannel(),
-//                      m_receiveProcessorBandwidth);
-//
-//              break;
-//      case 1:
-//              // do connection management: break connection
-//              iec61883_cmp_disconnect(
-//                      m_1394Service->getHandle(),
-//                      raw1394_get_local_id (m_1394Service->getHandle()),
-//                      hostplug,
-//                      m_nodeId | 0xffc0,
-//                      plug,
-//                      m_transmitProcessor->getChannel(),
-//                      m_transmitProcessorBandwidth);
-//
-//              // set the channel obtained by the connection management
-// //           m_receiveProcessor2->setChannel(iso_channel);
-//              break;
-//      default:
-//              return 0;
-//      }
-
-        return false;
-}
-
+// helper functions
+
+// allocate ISO resources for the SP's
+int BounceDevice::allocateIsoChannel(unsigned int packet_size) {
+    unsigned int bandwidth=8+packet_size;
+    
+    int ch=m_p1394Service->allocateIsoChannelGeneric(bandwidth);
+        
+    debugOutput(DEBUG_LEVEL_VERBOSE, "allocated channel %d, bandwidth %d\n",
+        ch, bandwidth);
+    
+    return ch;
+}
+// deallocate ISO resources
+bool BounceDevice::deallocateIsoChannel(int channel) {
+    debugOutput(DEBUG_LEVEL_VERBOSE, "freeing channel %d\n",channel);
+    return m_p1394Service->freeIsoChannel(channel);
+}
+
+// I/O functions
+
+bool
+BounceDevice::readReg(fb_nodeaddr_t offset, fb_quadlet_t *result) {
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading base register offset 0x%08llX\n", offset);
+    
+    if(offset >= BOUNCE_INVALID_OFFSET) {
+        debugError("invalid offset: 0x%016llX\n", offset);
+        return false;
+    }
+    
+    fb_nodeaddr_t addr=BOUNCE_REGISTER_BASE + offset;
+    fb_nodeid_t nodeId=m_nodeId | 0xFFC0;
+    
+    if(!m_p1394Service->read_quadlet( nodeId, addr, result ) ) {
+        debugError("Could not read from node 0x%04X addr 0x%012X\n", nodeId, addr);
+        return false;
+    }
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Read result: 0x%08X\n", *result);
+   
+    return true;
+}
+
+bool
+BounceDevice::writeReg(fb_nodeaddr_t offset, fb_quadlet_t data) {
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Writing base register offset 0x%08llX, data: 0x%08X\n",  
+        offset, data);
+    
+    if(offset >= BOUNCE_INVALID_OFFSET) {
+        debugError("invalid offset: 0x%016llX\n", offset);
+        return false;
+    }
+    
+    fb_nodeaddr_t addr=BOUNCE_REGISTER_BASE + offset;
+    fb_nodeid_t nodeId=m_nodeId | 0xFFC0;
+    
+    if(!m_p1394Service->write_quadlet( nodeId, addr, data ) ) {
+        debugError("Could not write to node 0x%04X addr 0x%012X\n", nodeId, addr);
+        return false;
+    }
+    return true;
+}
+
+bool 
+BounceDevice::readRegBlock(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Reading base register offset 0x%08llX, length %u\n", 
+        offset, length);
+    
+    if(offset >= BOUNCE_INVALID_OFFSET) {
+        debugError("invalid offset: 0x%016llX\n", offset);
+        return false;
+    }
+    
+    fb_nodeaddr_t addr=BOUNCE_REGISTER_BASE + offset;
+    fb_nodeid_t nodeId=m_nodeId | 0xFFC0;
+    
+    if(!m_p1394Service->read( nodeId, addr, length, data ) ) {
+        debugError("Could not read from node 0x%04X addr 0x%012llX\n", nodeId, addr);
+        return false;
+    }
+    return true;
+}
+
+bool 
+BounceDevice::writeRegBlock(fb_nodeaddr_t offset, fb_quadlet_t *data, size_t length) {
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"Writing base register offset 0x%08llX, length: %u\n",  
+        offset, length);
+    
+    if(offset >= BOUNCE_INVALID_OFFSET) {
+        debugError("invalid offset: 0x%016llX\n", offset);
+        return false;
+    }
+    
+    fb_nodeaddr_t addr=BOUNCE_REGISTER_BASE + offset;
+    fb_nodeid_t nodeId=m_nodeId | 0xFFC0;
+
+    if(!m_p1394Service->write( nodeId, addr, length, data ) ) {
+        debugError("Could not write to node 0x%04X addr 0x%012llX\n", nodeId, addr);
+        return false;
+    }
+    return true;
+}
+
+
-} // namespace

branches/streaming-rework/src/bounce/bounce_avdevice.h

@@ -31 +31 @@
-#include "libstreaming/AmdtpPortInfo.h"
-
+#include "libieee1394/ARMHandler.h"
+
-#include "iavdevice.h"
-#include "libfreebob/freebob_bounce.h"
+
+#include <vector>
+
+#define BOUNCE_REGISTER_BASE 0x0000FFFFE0000000ULL
+#define BOUNCE_REGISTER_LENGTH (4*256)
+#define BOUNCE_REGISTER_TX_ISOCHANNEL 0x10
+#define BOUNCE_REGISTER_RX_ISOCHANNEL 0x14
+#define BOUNCE_INVALID_OFFSET 0xFFFFF00000000000ULL
-
-class ConfigRom;
@@ -49 +59 @@
-
-class BounceDevice : public IAvDevice {
+private:
+    class BounceNotifier;
-public:
-    BounceDevice( std::auto_ptr<ConfigRom>( configRom ),
@@ -81 +93 @@
-protected:
-    std::auto_ptr<ConfigRom>( m_configRom );
-
+p
-    int              m_nodeId;
-    int              m_verboseLevel;
@@ -90 +102 @@
-    unsigned int m_samplerate;
-    struct VendorModelEntry* m_model;
-    unsigned int m_id;
-
-
-
-
-
-
-
+
+
+
+
-
-    bool addPortsToProcessor(
-
-
-
+
+
-
-    DECLARE_DEBUG_MODULE;
+    
+private: // generic helpers
+    int allocateIsoChannel(unsigned int packet_size);
+    bool deallocateIsoChannel(int channel);
+    
+private: // I/O helpers
+    // quadlet read/write routines
+    bool readReg(fb_nodeaddr_t, fb_quadlet_t *);
+    bool writeReg(fb_nodeaddr_t, fb_quadlet_t);
+    bool readRegBlock(fb_nodeaddr_t, fb_quadlet_t *, size_t);
+    bool writeRegBlock(fb_nodeaddr_t, fb_quadlet_t *, size_t);
+    
+private:
+    BounceNotifier *m_Notifier;
+    /**
+     * this class reacts on the ohter side writing to the 
+     * hosts address space
+     */
+    #define BOUNCE_NOTIFIER_BASE_ADDRESS 0x0000FFFFE0000000ULL
+    #define BOUNCE_NOTIFIER_BLOCK_LENGTH 4
+    class BounceNotifier : public ARMHandler
+    {
+    public:
+        BounceNotifier(BounceDevice *, nodeaddr_t start);
+        virtual ~BounceNotifier();
+        
+    private:
+        BounceDevice *m_bouncedevice;
+    };
-};
-

branches/streaming-rework/src/iavdevice.h

@@ -24 +24 @@
-#include "libfreebobavc/avc_definitions.h"
-#include "libfreebob/xmlparser.h"
+#include "libutil/OptionContainer.h"
-
-class ConfigRom;
@@ -29 +30 @@
-
-namespace FreebobStreaming {
-       
+    
-}
-/*!
@@ -38 +39 @@
-
-*/
-
+: public FreebobUtil::OptionContainer 
-public:
-        virtual ~IAvDevice() {}

branches/streaming-rework/src/libutil/unittests.cpp

@@ -20 +20 @@
-
-#include "serialize.h"
+#include "OptionContainer.h"
+
-#include <libraw1394/raw1394.h>
-
@@ -25 +27 @@
-
-using namespace Util;
+using namespace FreebobUtil;
-
-///////////////////////////////////////
@@ -405 +408 @@
-
-/////////////////////////////////////
+class testOC : public OptionContainer {
+public:
+    testOC() {};
+    ~testOC() {};
+    
+    bool test() {
+        bool result=true;
+        
+        Option op1=Option();
+        if(addOption(op1)) {
+            printf( "adding an empty option should not succeed\n" );
+            result=false;
+        }
+        
+        op1=Option("option1");
+        if(addOption(op1)) {
+            printf( "adding an option without a value should not succeed\n" );
+            result=false;
+        }
+        
+        op1=Option("option1", (float)(1.0));
+        if(!addOption(op1)) {
+            printf( "could not add valid option (1)\n" );
+            result=false;
+        }
+        if(addOption(op1)) {
+            printf( "adding the same option twice should not succeed\n" );
+            result=false;
+        }
+        if(!removeOption(op1)) {
+            printf( "could not remove option by reference\n" );
+            result=false;
+        }
+        if(hasOption(op1)) {
+            printf( "option not removed (by reference)\n" );
+            result=false;
+        }
+        
+        op1=Option("option1", (int64_t)1);
+        if(!addOption(op1)) {
+            printf( "could not add valid option (2)\n" );
+            result=false;
+        }
+        if(!removeOption("option1")) {
+            printf( "could not remove option by name\n" );
+            result=false;
+        }
+        if(hasOption(op1)) {
+            printf( "option not removed (by name)\n" );
+            result=false;
+        }
+        
+        op1=Option("option1", (int64_t)(-1));
+        if(!addOption(op1)) {
+            printf( "could not add valid option (3)\n" );
+            result=false;
+        }
+        Option op2=Option("option1", (double)(1.75));
+        if(addOption(op2)) {
+            printf( "adding two options with the same name should not be allowed\n" );
+            result=false;
+        }
+        
+        op2=Option("option2", (double)(1.75));
+        if(!addOption(op2)) {
+            printf( "adding an option with a different name should be allowed (1)\n" );
+            result=false;
+        }
+        Option op3=Option("option3", (int64_t)(1.75));
+        if(!addOption(op3)) {
+            printf( "adding an option with a different name should be allowed (2)\n" );
+            result=false;
+        }
+        
+        if(countOptions() != 3) {
+            printf( "countOptions failed\n" );
+            result=false;
+        }
+            
+        int i=0;
+        for ( OptionContainer::iterator it = begin();
+          it != end();
+          ++it )
+        {
+    //         printf(" (%s)",(*it).getName().c_str());
+            i++;
+        }
+        if(i!=3) {
+            printf( "did not iterate through the right amount of options\n" );
+            result=false;
+        }
+        
+        clearOptions();
+        return result;
+    }
+    
+    void prepare() {
+        Option op1=Option("option1", (int64_t)(-1));
+        if(!addOption(op1)) {
+            printf( "prepare: could not add valid option (3)\n" );
+        }
+        
+        Option op2=Option("option2", (double)(1.75));
+        if(!addOption(op2)) {
+            printf( "prepare: adding an option with a different name should be allowed (1)\n" );
+        }
+        Option op3=Option("option3", (int64_t)(1.75));
+        if(!addOption(op3)) {
+            printf( "prepare: adding an option with a different name should be allowed (2)\n" );
+        }
+    }
+};
+
+static bool
+testU4()
+{
+    bool result=true;
+    testOC oc;
+    if(!oc.test()) {
+        printf( "OptionContainer test failed\n" );
+        result=false;
+    }
+    
+    // now manipulate it externally
+    oc.prepare();
+    
+    if(!oc.hasOption("option1")) {
+        printf( "option1 should be present\n" );
+        result=false;
+    }
+    if(!oc.hasOption("option2")) {
+        printf( "option2 should be present\n" );
+        result=false;
+    }
+    if(!oc.hasOption("option3")) {
+        printf( "option3 should be present\n" );
+        result=false;
+    }
+    if(oc.hasOption("option4")) {
+        printf( "option4 should not be present\n" );
+        result=false;
+    }
+
+    oc.setOption("option1", 1024);
+    int tst;
+    if (!oc.getOption("option1", tst)) {
+        printf( "could not get option1 value\n" );
+        result=false;
+    }
+    
+    if(tst != 1024) {
+        printf( "option1 should be 1024\n" );
+        result=false;
+    }
+    
+    return result;
+}
+
+/////////////////////////////////////
-/////////////////////////////////////
-/////////////////////////////////////
@@ -420 +582 @@
-    { "serialize 2",  testU2 },
-    { "serialize 3",  testU3 },
+    { "OptionContainer 1",  testU4 },
-};
-

branches/streaming-rework/src/Makefile.am

@@ -54 +54 @@
-        libstreaming/StreamProcessor.h libstreaming/StreamProcessorManager.h \
-        libutil/Atomic.h libutil/cycles.h libutil/DelayLockedLoop.h libutil/PosixThread.h \
-
+
+
-        libutil/serialize.h libutil/SystemTimeSource.h libutil/Thread.h libutil/Time.h \
-        libutil/TimeSource.h libutil/TimestampedBuffer.h
@@ -92 +93 @@
-        libutil/DelayLockedLoop.cpp \
-        libutil/PacketBuffer.cpp \
+        libutil/OptionContainer.cpp \
-        libutil/PosixThread.cpp \
-        libutil/ringbuffer.c \

branches/streaming-rework/src/maudio/maudio_avdevice.cpp

@@ -19 +19 @@
- */
-#include "maudio/maudio_avdevice.h"
+#include "bebob/bebob_avdevice.h"
-
-#include "libieee1394/configrom.h"
@@ -41 +42 @@
-                    int iNodeId,
-                    int iVerboseLevel )
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Created MAudio::AvDevice (NodeID %d)\n",
-                 iNodeId );
@@ -62 +56 @@
-}
-
-ConfigRom&
-AvDevice::getConfigRom() const
-{
-    return *m_pConfigRom;
-}
-
-struct VendorModelEntry {
-    unsigned int m_iVendorId;
-    unsigned int m_iModelId;
-    const char*  m_pFilename;
-};
-
-static VendorModelEntry supportedDeviceList[] =
-{
-
-
-
-
-
-
-
+
+
+
+
+
-};
-
@@ -95 +75 @@
-          ++i )
-    {
-m_iVendorI
-_iModelI
+vendor_i
+odel_i
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
@@ -108 +87 @@
-AvDevice::discover()
-{
-
-
+
+
+
-    for ( unsigned int i = 0;
-          i < ( sizeof( supportedDeviceList )/sizeof( VendorModelEntry ) );
-          ++i )
-    {
-
-
+
+
+
-        {
-pFilename = supportedDeviceList[i].m_pFilename
+model = &(supportedDeviceList[i])
-            break;
-        }
-    }
-
-
+
+
+
+
-    
+    return true;
-}
-
@@ -137 +122 @@
-}
-
-bool
-AvDevice::lock() {
-
-    return true;
-}
-
-
-bool
-AvDevice::unlock() {
-
-    return true;
-}
-
-void
-AvDevice::showDevice() const
@@ -159 +131 @@
-{
-    char* pFilename;
-pF
+model->f
-        debugError( "addXmlDescription: Could not create filename string\n" );
-        return false;
@@ -213 +185 @@
-                            if ( ( !xmlStrcmp( pSubNode->name,  ( const xmlChar * ) "Node" ) ) ) {
-                                char* result;
-iN
+n
-                                xmlNodeSetContent( pSubNode, BAD_CAST result );
-                                free( result );
@@ -244 +216 @@
-}
-
-
-
-
-
+
+
+
-    return true;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+

branches/streaming-rework/src/maudio/maudio_avdevice.h

@@ -27 +27 @@
-#include "libfreebob/xmlparser.h"
-
+#include "bebob/bebob_avdevice.h"
+
-#include "libstreaming/AmdtpStreamProcessor.h"
-#include "libstreaming/AmdtpPort.h"
@@ -38 +40 @@
-namespace MAudio {
-
-
+
+
+
+
+
+
+
+
+
-public:
-    AvDevice( std::auto_ptr<ConfigRom>( configRom ),
@@ -47 +57 @@
-
-    static bool probe( ConfigRom& configRom );
-
-
-
-
+
-    
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
-
-protected:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    
-    DECLARE_DEBUG_MODULE;

branches/streaming-rework/src/metrichalo/mh_avdevice.cpp

@@ -34 +34 @@
-#include <assert.h>
-#include <netinet/in.h>
+#include <iostream>
+#include <sstream>
-
-#include <libraw1394/csr.h>
@@ -56 +58 @@
-    , m_nodeId( nodeId )
-    , m_verboseLevel( verboseLevel )
-    , m_id(0)
-    , m_iso_recv_channel ( -1 )
-    , m_iso_send_channel ( -1 )
-    
-{
@@ -65 +64 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Created MetricHalo::MHAvDevice (NodeID %d)\n",
-                 nodeId );
+    addOption(FreebobUtil::OptionContainer::Option("id",std::string("dev?")));
-
-}
@@ -140 +140 @@
-
-bool MHAvDevice::setId( unsigned int id) {
-
-
-
+
+
+
+
+
+
+
+
-}
-
@@ -174 +179 @@
-int 
-MHAvDevice::getStreamCount() {
- // one receive, one transmit
+
-}
-
@@ -180 +185 @@
-MHAvDevice::getStreamProcessorByIndex(int i) {
-
-//    switch (i) {
-//    case 0:
-//        return m_receiveProcessor;
-//    case 1:
-//        return m_transmitProcessor;
-//    default:
-//        return NULL;
-//    }
-//    return 0;
-    return NULL;
-}
@@ -194 +190 @@
-bool
-MHAvDevice::startStreamByIndex(int i) {
-
-    return false;
-}
@@ -203 +198 @@
-}
-
-
-
-
-
-
-
-
-
-
+

branches/streaming-rework/src/metrichalo/mh_avdevice.h

@@ -86 +86 @@
-    int              m_nodeId;
-    int              m_verboseLevel;
-    signed int m_id;
-    signed int m_iso_recv_channel, m_iso_send_channel;
-    
-//      FreebobStreaming::MHReceiveStreamProcessor *m_receiveProcessor;
-//      FreebobStreaming::MHTransmitStreamProcessor *m_transmitProcessor;
-
-private:

branches/streaming-rework/src/motu/motu_avdevice.cpp

@@ -37 +37 @@
-#include <assert.h>
-#include <netinet/in.h>
+#include <iostream>
+#include <sstream>
-
-#include <libraw1394/csr.h>
@@ -61 +63 @@
-    , m_nodeId( nodeId )
-    , m_verboseLevel( verboseLevel )
-    , m_id(0)
-    , m_iso_recv_channel ( -1 )
-    , m_iso_send_channel ( -1 )
@@ -304 +305 @@
-
-bool MotuDevice::setId( unsigned int id) {
-
-
-
+
+
+
+
+
+
+
+
-}
-
@@ -399 +405 @@
-        char *buff;
-        FreebobStreaming::Port *p=NULL;
-
+
+
+
+
+
+
+
-        // Add audio capture ports
-        if (!addDirPorts(FreebobStreaming::Port::E_Capture, samp_freq, optical_in_mode)) {
@@ -408 +420 @@
-        // MIDI byte sent using a 3 byte sequence starting at byte 4 of the
-        // event data.
-dev%d_cap_MIDI0",m_id
+%s_cap_MIDI0",id.c_str()
-        p = new FreebobStreaming::MotuMidiPort(buff,
-                FreebobStreaming::Port::E_Capture, 4);
@@ -425 +437 @@
-
-        // example of adding an control port:
-dev%d_cap_%s",m_id
+%s_cap_%s",id.c_str()
-//    p=new FreebobStreaming::MotuControlPort(
-//            buff,
@@ -468 +480 @@
-        // MIDI byte transmitted using a 3 byte sequence starting at byte 4
-        // of the event data.
-dev%d_pbk_MIDI0",m_id
+%s_pbk_MIDI0",id.c_str()
-        p = new FreebobStreaming::MotuMidiPort(buff,
-                FreebobStreaming::Port::E_Capture, 4);
@@ -485 +497 @@
-
-        // example of adding an control port:
-dev%d_pbk_%s",m_id
+%s_pbk_%s",id.c_str()
-//    
-//    p=new FreebobStreaming::MotuControlPort(
@@ -765 +777 @@
-char *buff;
-
+        // retrieve the ID
+    std::string id=std::string("dev?");
+    if(!getOption("id", id)) {
+        debugWarning("Could not retrieve id parameter, defauling to 'dev?'\n");
+    }
+
-        if (direction == FreebobStreaming::Port::E_Capture) {
-                s_processor = m_receiveProcessor;
@@ -777 +795 @@
-        if (sample_rate<=96000) {
-                for (i=0; i<2; i++, ofs+=3) {
-dev%d_%s_%s-%c", m_id
+%s_%s_%s-%c", id.c_str()
-                          aux_str, i==0?'L':'R');
-                        if (!addPort(s_processor, buff, direction, ofs, 0))
@@ -787 +805 @@
-        // always present no matter what the device configuration is.
-        for (i=0; i<8; i++, ofs+=3) {
-dev%d_%s_Analog%d", m_id
+%s_%s_Analog%d", id.c_str()
-                if (!addPort(s_processor, buff, direction, ofs, 0))
-                        return false;
@@ -799 +817 @@
-                for (i=0; i<2; i++, ofs+=3) {
-                        if (m_motu_model == MOTUFW_MODEL_TRAVELER) {
-dev%d_%s_AES/EBU%d", m_id
+%s_%s_AES/EBU%d", id.c_str()
-                        } else {
-                                if (direction == FreebobStreaming::Port::E_Capture)
-dev%d_%s_Mic%d", m_id
+%s_%s_Mic%d", id.c_str()
-                                else
-dev%d_%s_MainOut-%c", m_id
+%s_%s_MainOut-%c", id.c_str()
-                        }
-                        if (!addPort(s_processor, buff, direction, ofs, 0))
@@ -815 +833 @@
-        if (sample_rate<=96000 && optical_mode!=MOTUFW_OPTICAL_MODE_TOSLINK) {
-                for (i=0; i<2; i++, ofs+=3) {
-dev%d_%s_SPDIF%d", m_id
+%s_%s_SPDIF%d", id.c_str()
-                        if (!addPort(s_processor, buff, direction, ofs, 0))
-                                return false;
@@ -825 +843 @@
-        if (sample_rate<=96000 && optical_mode==MOTUFW_OPTICAL_MODE_TOSLINK) {
-                for (i=0; i<2; i++, ofs+=3) {
-dev%d_%s_TOSLINK%d", m_id
+%s_%s_TOSLINK%d", id.c_str()
-                        if (!addPort(s_processor, buff, direction, ofs, 0))
-                                return false;
@@ -835 +853 @@
-        if (sample_rate<=96000 && optical_mode==MOTUFW_OPTICAL_MODE_ADAT) {
-                for (i=0; i<4; i++, ofs+=3) {
-dev%d_%s_ADAT%d", m_id
+%s_%s_ADAT%d", id.c_str()
-                        if (!addPort(s_processor, buff, direction, ofs, 0))
-                                return false;
@@ -845 +863 @@
-        if (sample_rate<=48000 && optical_mode==MOTUFW_OPTICAL_MODE_ADAT) {
-                for (i=4; i<8; i++, ofs+=3) {
-dev%d_%s_ADAT%d", m_id
+%s_%s_ADAT%d", id.c_str()
-                        if (!addPort(s_processor, buff, direction, ofs, 0))
-                                return false;

branches/streaming-rework/src/motu/motu_avdevice.h

@@ -137 +137 @@
-    int              m_nodeId;
-    int              m_verboseLevel;
-    signed int m_id;
-    signed int m_iso_recv_channel, m_iso_send_channel;
-    signed int m_bandwidth;

branches/streaming-rework/src/rme/rme_avdevice.cpp

@@ -33 +33 @@
-#include <netinet/in.h>
-
+#include <iostream>
+#include <sstream>
+
-#include <libraw1394/csr.h>
-
@@ -54 +57 @@
-    , m_nodeId( nodeId )
-    , m_verboseLevel( verboseLevel )
-    , m_id(0)
-    , m_iso_recv_channel ( -1 )
-    , m_iso_send_channel ( -1 )
-    , m_bandwidth ( -1 )
-//    , m_receiveProcessor ( 0 )
-//    , m_transmitProcessor ( 0 )
-    
-{
@@ -71 +68 @@
-RmeDevice::~RmeDevice()
-{
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -158 +145 @@
-
-bool RmeDevice::setId( unsigned int id) {
-
-
-
+
+
+
+
+
+
+
+
-}
-
@@ -213 +205 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+

branches/streaming-rework/src/rme/rme_avdevice.h

@@ -75 +75 @@
-    bool startStreamByIndex(int i);
-    bool stopStreamByIndex(int i);
-
-    signed int getIsoRecvChannel(void);
-    signed int getIsoSendChannel(void);
-
-    signed int getEventSize(unsigned int dir);
-  
-protected:
@@ -89 +84 @@
-    int              m_nodeId;
-    int              m_verboseLevel;
-    signed int m_id;
-    signed int m_iso_recv_channel, m_iso_send_channel;
-    signed int m_bandwidth;
-    
-//      FreebobStreaming::RmeReceiveStreamProcessor *m_receiveProcessor;
-//      FreebobStreaming::RmeTransmitStreamProcessor *m_transmitProcessor;
-
-private:
-//      bool addPort(FreebobStreaming::StreamProcessor *s_processor,
-//              char *name, 
-//              enum FreebobStreaming::Port::E_Direction direction,
-//              int position, int size);
-//      bool addDirPorts(
-//              enum FreebobStreaming::Port::E_Direction direction,
-//              unsigned int sample_rate, unsigned int optical_mode);
-        
-        unsigned int ReadRegister(unsigned int reg);
-        signed int WriteRegister(unsigned int reg, quadlet_t data);
-
-    // debug support