Changeset 461

Timestamp:

04/09/07 09:25:30 (16 years ago)

Author:

ppalmers

Message:

- Osc requests now don't require a perfect path match to work.

e.g. an OscNode? at path '/X/Y' will now handle OscMessages? for '/X/Y/Z'

if 'Z' is not registered as a child OscNode? of '/X/Y'

Files:

• trunk/libffado/src/libosc/OscNode.cpp (modified) (6 diffs)
• trunk/libffado/src/libosc/unittests.cpp (modified) (1 diff)

trunk/libffado/src/libosc/OscNode.cpp

@@ -76 +76 @@
-OscNode::processOscMessage(string path, OscMessage *m)
-{
-MSG: %s\n",this
+{%s} MSG: %s\n", this, m_oscBase.c_str()
-
-    // delete leading slash
@@ -91 +91 @@
-
-        // process the message
+        m->setPath(""); // handled by the node itself
-        retVal=processOscMessage(m);
-
@@ -100 +101 @@
-
-    } else { // it targets a deeper node
+        OscResponse retVal;
+        
-        string newpath=path.substr(firstsep+1);
-        int secondsep=newpath.find_first_of('/');
@@ -109 +112 @@
-        }
-
+        // first try to find a child node that might be able
+        // to handle this.
+        // NOTE: the current model allows only one node to 
+        //       handle a request, and then the default
+        //       handler.
-        for ( OscNodeVectorIterator it = m_ChildNodes.begin();
-          it != m_ChildNodes.end();
@@ -117 +125 @@
-            }
-        }
+        
+        // The path is not registered as a child node.
+        // This node should handle it
-        debugOutput( DEBUG_LEVEL_VERBOSE, "Child node %s not found \n",newbase.c_str());
-
-
+
+
+
+
+
+
+
+
-    }
-    return OscResponse(OscResponse::eError);
@@ -130 +148 @@
-OscNode::processOscMessage(OscMessage *m)
-{
-MSG PROCESS: %s\n", this
+{%s} DEFAULT PROCESS: %s\n", this, m_oscBase.c_str()
-    m->print();
-    return OscResponse(OscResponse::eUnhandled); // handled but no response

trunk/libffado/src/libosc/unittests.cpp

@@ -104 +104 @@
-    result &= TEST_SHOULD_RETURN_FALSE(n1.processOscMessage("base1/child1/subchild1",&m).isError());
-    result &= TEST_SHOULD_RETURN_FALSE(n1.processOscMessage("base1/child1/subchild2",&m).isError());
-    result &= TEST_SHOULD_RETURN_TRUE(n1.processOscMessage("base1/child1/subchild3",&m).isError());
-    result &= TEST_SHOULD_RETURN_FALSE(n1.processOscMessage("base1/child2",&m).isError());
-
+
+
-
-    return result;