Changeset 462

Timestamp:

04/09/07 13:41:33 (17 years ago)

Author:

ppalmers

Message:

- Rework the OSC space to something more usable

Files:

• trunk/libffado/src/bebob/GenericMixer.cpp (modified) (11 diffs)
• trunk/libffado/src/bebob/GenericMixer.h (modified) (1 diff)
• trunk/libffado/src/libieee1394/configrom.cpp (modified) (1 diff)
• trunk/libffado/src/libosc/OscServer.cpp (modified) (1 diff)
• trunk/libffado/support/mixer/mixer_phase88.ui.h (modified) (12 diffs)

trunk/libffado/src/bebob/GenericMixer.cpp

@@ -36 +36 @@
-#include "libieee1394/ieee1394service.h"
-
+#include <string>
-#include <sstream>
+#include <iostream>
+
-#include <assert.h>
-
@@ -42 +45 @@
-
-namespace BeBoB {
+
+template <class T>
+bool from_string(T& t, 
+                 const std::string& s, 
+                 std::ios_base& (*f)(std::ios_base&))
+{
+  std::istringstream iss(s);
+  return !(iss >> f >> t).fail();
+}
-
-IMPL_DEBUG_MODULE( GenericMixer, GenericMixer, DEBUG_LEVEL_NORMAL );
@@ -61 +73 @@
-OscResponse 
-GenericMixer::processOscMessage(OscMessage *m) {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    unsigned int nbArgs=m->nbArguments();
-    if (nbArgs>=1) {
@@ -68 +116 @@
-        if(arg0.isString()) { // first argument should be a string command
-            string cmd=arg0.getString();
-
+
+
-            if(cmd == "list") {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            if(cmd == "set") {
-                debugOutput( DEBUG_LEVEL_NORMAL, "setting mixer element...\n");
@@ -100 +266 @@
-                    int value=m->getArgument(3).toInt();
-                    
-mixerS
+s
-                }
-                
@@ -164 +330 @@
-    // default action: don't change response
-    return OscResponse(OscResponse::eUnhandled);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    debugOutput(DEBUG_LEVEL_NORMAL,"Get selector %d value...\n",
-        fb_id);
@@ -208 +465 @@
-    if ( !fbCmd.fire() ) {
-        debugError( "FunctionBlockCmd failed\n" );
-OscResponse(OscResponse::eError)
+false
-    }
-
@@ -216 +473 @@
-    }
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    debugOutput(DEBUG_LEVEL_NORMAL,"Set selector %d to %d...\n",
-        fb_id, value);
@@ -245 +495 @@
-    if ( !fbCmd.fire() ) {
-        debugError( "FunctionBlockCmd failed\n" );
-OscResponse(OscResponse::eError)
+false
-    }
-
@@ -253 +503 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return OscResponse(OscResponse::eError);
-    }
-    
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                        int volume) {
-    OscMessage m;
-    
-    debugOutput(DEBUG_LEVEL_NORMAL,"Set feature volume %d channel %d to %d...\n",
-        fb_id, channel, volume);
@@ -281 +743 @@
-    if ( !fbCmd.fire() ) {
-        debugError( "cmd failed\n" );
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-OscResponse 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return OscResponse(m);
-}

trunk/libffado/src/bebob/GenericMixer.h

@@ -48 +48 @@
-
-protected:
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-
-
+
+
+
+
+
+
+
+
-    
-protected:

trunk/libffado/src/libieee1394/configrom.cpp

@@ -592 +592 @@
-            debugOutput( DEBUG_LEVEL_VERBOSE, "(%p) CMD? %s\n", this, cmd.c_str());
-            if(cmd == "params") {
-children
+params
-                OSC::OscMessage& rm=r.getMessage();
-                rm.addArgument("GUID");

trunk/libffado/src/libosc/OscServer.cpp

@@ -178 +178 @@
-        return 0;
-    } else {
-
+
+
+
+
+
-        m.print();
-        return 1;  // not handled

trunk/libffado/support/mixer/mixer_phase88.ui.h

@@ -22 +22 @@
-    print "switching front/back state to %d" % state
-
-", ["set", "selector", 10
+/Selector/10", ["set", "value"
-}
-
@@ -28 +28 @@
-{
-    print "switching out assign to %d" % a0
-", ["set", "selector", 6
+/Selector/6", ["set", "value"
-}
-
@@ -34 +34 @@
-{
-    print "switching input assign to %d" % a0
-", ["set", "selector", 7
+/Selector/7", ["set", "value"
-}
-
@@ -40 +40 @@
-{
-    print "switching sync source to %d" % a0
-", ["set", "selector", 9
+/Selector/9", ["set", "value"
-}
-
@@ -46 +46 @@
-{
-    print "switching external sync source to %d" % a0
-", ["set", "selector", 8
+/Selector/8", ["set", "value"
-}
-
-
-void Phase88Control::setVolume12( int )
@@ -54 +53 @@
-    vol = -a0
-    print "setting volume for 1/2 to %d" % vol
-", ["set", "volume", 2 
+/Feature/2", ["set", "volume"
-}
-
-
-void Phase88Control::setVolume34( int )
@@ -62 +60 @@
-    vol = -a0
-    print "setting volume for 3/4 to %d" % vol
-", ["set", "volume", 3 
+/Feature/3", ["set", "volume"
-}
-
-
-void Phase88Control::setVolume56( int )
@@ -70 +67 @@
-    vol = -a0
-    print "setting volume for 5/6 to %d" % vol
-
-
+
-}
-
@@ -78 +74 @@
-    vol = -a0
-    print "setting volume for 7/8 to %d" % vol
-", ["set", "volume", 5 
+/Feature/5", ["set", "volume"
-}
-
@@ -85 +81 @@
-    vol = -a0
-    print "setting volume for S/PDIF to %d" % vol
-", ["set", "volume", 6 
+/Feature/6", ["set", "volume"
-}
-
@@ -92 +88 @@
-    vol = -a0
-    print "setting volume for WavePlay to %d" % vol
-", ["set", "volume", 1 
+/Feature/7", ["set", "volume"
-}
-
@@ -99 +95 @@
-    vol = -a0
-    print "setting master volume to %d" % vol
-", ["set", "volume", 7 
+/Feature/1", ["set", "volume"
-}