Changeset 451

Timestamp:

04/08/07 08:56:32 (16 years ago)

Author:

ppalmers

Message:

- First attempt at a OSC controlled mixer. The level of

abstraction is very low, meaning that you have to know
how the function blocks work. It however allows control
applications to be written and to experiment with them.

- This version only does Selector function blocks.

The following message switches the phase88 input to the

• front (or is is back?)
  /devicemanager/dev0/GenericMixer set selector 10 0
  
• back (or is it front?)
  /devicemanager/dev0/GenericMixer set selector 10 1
  
  

Files:

• trunk/libffado/src/bebob/bebob_avdevice.cpp (modified) (4 diffs)
• trunk/libffado/src/bebob/bebob_avdevice.h (modified) (3 diffs)
• trunk/libffado/src/bebob/bebob_avdevice_subunit.cpp (modified) (4 diffs)
• trunk/libffado/src/bebob/bebob_avdevice_subunit.h (modified) (1 diff)
• trunk/libffado/src/bebob/bebob_functionblock.cpp (modified) (1 diff)
• trunk/libffado/src/bebob/bebob_functionblock.h (modified) (2 diffs)
• trunk/libffado/src/bebob/GenericMixer.cpp (added)
• trunk/libffado/src/bebob/GenericMixer.h (added)
• trunk/libffado/src/Makefile.am (modified) (2 diffs)

trunk/libffado/src/bebob/bebob_avdevice.cpp

@@ -24 +24 @@
-#include "bebob/bebob_avdevice.h"
-#include "bebob/bebob_avdevice_subunit.h"
+#include "bebob/GenericMixer.h"
-
-#include "libieee1394/configrom.h"
@@ -72 +73 @@
-    , m_activeSyncInfo( 0 )
-    , m_model ( NULL )
+    , m_Mixer ( NULL )
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Created BeBoB::AvDevice (NodeID %d)\n",
@@ -80 +82 @@
-AvDevice::~AvDevice()
-{
+    if(m_Mixer != NULL) {
+        if (!removeChildOscNode(m_Mixer)) {
+            debugWarning("failed to unregister mixer from OSC namespace\n");
+        }
+        delete m_Mixer;
+    }
-
-    for ( AvDeviceSubunitVector::iterator it = m_subunits.begin();
@@ -184 +192 @@
-    }
-
+    // create a GenericMixer and add it as an OSC child node
+    //  remove if already there
+    if(m_Mixer != NULL) {
+        if (!removeChildOscNode(m_Mixer)) {
+            debugWarning("failed to unregister mixer from OSC namespace\n");
+        }
+        delete m_Mixer;
+    }
+    
+    //  create the mixer & register it
+    if(getAudioSubunit(0) == NULL) {
+        debugWarning("Could not find audio subunit, mixer not available.\n");
+        m_Mixer = NULL;
+    } else {
+        m_Mixer = new GenericMixer(*m_p1394Service , *this);
+        if (!addChildOscNode(m_Mixer)) {
+            debugWarning("failed to register mixer in OSC namespace\n");
+        }
+    }
-    return true;
-}

trunk/libffado/src/bebob/bebob_avdevice.h

@@ -33 +33 @@
-#include "bebob/bebob_avplug.h"
-#include "bebob/bebob_avdevice_subunit.h"
+#include "bebob/GenericMixer.h"
-
-#include "libstreaming/AmdtpStreamProcessor.h"
@@ -120 +121 @@
-                                  Util::IODeserialize& deser,
-                  Ieee1394Service& ieee1394Service );
+    AvDeviceSubunitAudio* getAudioSubunit( subunit_id_t subunitId )
+        { return dynamic_cast<AvDeviceSubunitAudio*>(
+                   getSubunit( AVC1394_SUBUNIT_AUDIO , subunitId ));};
+
-protected:
-
@@ -177 +182 @@
-    SyncInfo*                 m_activeSyncInfo;
-    struct VendorModelEntry*  m_model;
+    GenericMixer*             m_Mixer;
-
-    // streaming stuff

trunk/libffado/src/bebob/bebob_avdevice_subunit.cpp

@@ -270 +270 @@
-BeBoB::AvDeviceSubunitAudio::discover()
-{
+    debugOutput(DEBUG_LEVEL_NORMAL, "Discovering Audio Subunit...\n");
+    
-    if ( !AvDeviceSubunit::discover() ) {
-        return false;
@@ -285 +287 @@
-BeBoB::AvDeviceSubunitAudio::discoverConnections()
-{
+    debugOutput(DEBUG_LEVEL_NORMAL, "Discovering connections...\n");
-    if ( !AvDeviceSubunit::discoverConnections() ) {
-        return false;
@@ -313 +316 @@
-BeBoB::AvDeviceSubunitAudio::discoverFunctionBlocks()
-{
+    debugOutput( DEBUG_LEVEL_NORMAL,
+                 "Discovering function blocks...\n");
+
-    if ( !discoverFunctionBlocksDo(
-             ExtendedSubunitInfoCmd::eFBT_AudioSubunitSelector) )
@@ -337 +343 @@
-        return false;
-    }
+
+    // print a function block list
+#ifdef DEBUG
+    if (getDebugLevel() >= DEBUG_LEVEL_NORMAL) {
+    
+        for ( FunctionBlockVector::iterator it = m_functions.begin();
+            it != m_functions.end();
+            ++it )
+        {
+            debugOutput(DEBUG_LEVEL_NORMAL, "%20s FB, type 0x%X, id=%d\n",
+                (*it)->getName(),
+                (*it)->getType(),
+                (*it)->getId());
+        }
+    }
+#endif
-
-    return true;

trunk/libffado/src/bebob/bebob_avdevice_subunit.h

@@ -112 +112 @@
-    virtual const char* getName();
-
-
+
+
-protected:
-    bool discoverFunctionBlocks();

trunk/libffado/src/bebob/bebob_functionblock.cpp

@@ -80 +80 @@
-BeBoB::FunctionBlock::discover()
-{
-VERBOSE
+NORMAL
-                 "discover function block %s (nr of input plugs = %d, "
-                 "nr of output plugs = %d)\n",

trunk/libffado/src/bebob/bebob_functionblock.h

@@ -37 +37 @@
-public:
-    enum EFunctionBlockType {
-nBlockType 
+onBlockType
-        eFBT_AudioSubunitSelector   = 0x80,
-        eFBT_AudioSubunitFeature    = 0x81,
@@ -66 +66 @@
-
-    virtual const char* getName() = 0;
+    
+    function_block_type_t getType() {return m_type;};
+    function_block_type_t getSubtype() {return m_subtype;};
+    function_block_id_t getId() {return m_id;};
-
-    bool serialize( Glib::ustring basePath, Util::IOSerialize& ser ) const;

trunk/libffado/src/Makefile.am

@@ -52 +52 @@
-        bebob/bebob_avdevice_subunit.h bebob/bebob_avplug.h bebob/bebob_dl_bcd.h bebob/bebob_dl_codes.h \
-        bebob/bebob_dl_mgr.h bebob/bebob_functionblock.h bounce/bounce_avdevice.h bounce/bounce_slave_avdevice.h \
+        bebob/GenericMixer.h \
-        maudio/maudio_avdevice.h motu/motu_avdevice.h rme/rme_avdevice.h \
-        metrichalo/mh_avdevice.h dice/dice_avdevice.h \
@@ -133 +134 @@
-            bebob/bebob_dl_mgr.cpp \
-            bebob/bebob_functionblock.cpp \
+            bebob/GenericMixer.cpp \
-            maudio/maudio_avdevice.cpp
-