Changeset 575

Timestamp:

08/27/07 14:26:33 (14 years ago)

Author:

ppalmers

Message:

- Fixed bug in dbus c++ bindings
- First attempt at a decoupled control interface. [WIP]

The src/libcontrol/* elements are the ones that should be
subclassed to implement control elements on the FFADODevice
side.

The tests/controlserver.* files contain some code that
interfaces the DBus calls to these libcontrol elements. The
DBus classes allow for introspection and path discovery,
such that we don't have to care about that anymore.

In the end it should be fairly easy to write another 'backend'
to replace the current DBus one, e.g. to implement OSC support
or MIDI support. (Should we ever want that)

Note that there is no connection between ffado and dbus yet,
this code is merely to experiment with the Control/DBus infra-
structure. Once that is sort-of working, connecting ffado to
this infrastructure is a matter of subclassing the Control::*
classes, creating them on discovery and putting them into one
Container::* that is passed on to the DBus handlers.

Files:

• trunk/libffado/external/dbus/src/introspection.cpp (modified) (1 diff)
• trunk/libffado/src/debugmodule/debugmodule.h (modified) (1 diff)
• trunk/libffado/src/libcontrol/BasicElements.cpp (added)
• trunk/libffado/src/libcontrol/BasicElements.h (added)
• trunk/libffado/src/libcontrol/Element.cpp (added)
• trunk/libffado/src/libcontrol/Element.h (added)
• trunk/libffado/src/SConscript (modified) (1 diff)
• trunk/libffado/tests/controlclient.cpp (modified) (1 diff)
• trunk/libffado/tests/controlclient.h (modified) (2 diffs)
• trunk/libffado/tests/controlserver.cpp (modified) (1 diff)
• trunk/libffado/tests/controlserver.h (modified) (1 diff)
• trunk/libffado/tests/SConscript (modified) (1 diff)
• trunk/libffado/tests/test-dbus-server.cpp (modified) (2 diffs)
• trunk/libffado/tests/test-dbus.cpp (modified) (2 diffs)

trunk/libffado/external/dbus/src/introspection.cpp

@@ -115 +115 @@
-        ObjectAdaptorPList::const_iterator oci;
-
+        debug_log("nb children: %d", children.size());
-        for(oci = children.begin(); oci != children.end(); ++oci) 
-        {
+         
-                std::string name = (*oci)->path().substr(path.length()+1);
-
-
+
+
+
+
+
+
-                xml << "<node name=\"" << name << "\"/>";
-        }

trunk/libffado/src/debugmodule/debugmodule.h

@@ -27 +27 @@
-
-#include "../fbtypes.h"
-
+
-
-#include <vector>

trunk/libffado/src/SConscript

@@ -68 +68 @@
-        libutil/TimeSource.cpp \
-        libutil/TimestampedBuffer.cpp \
+        libcontrol/Element.cpp \
+        libcontrol/BasicElements.cpp \
-' )
-

trunk/libffado/tests/controlclient.cpp

@@ -25 +25 @@
-#include "controlclient.h"
-
-
+DBus
-
-
+
-
-
+
+
+
-: DBus::ObjectProxy(connection, path, name)
-{
-rol
+ignous
-                 name, path );
-}

trunk/libffado/tests/controlclient.h

@@ -32 +32 @@
-#include "controlclient-glue.h"
-
-.Test
-
+
+/Fader
-
-
+DBus
-
-
-
+
+
+
-  public DBus::IntrospectableProxy,
-  public DBus::ObjectProxy
@@ -44 +45 @@
-public:
-
-rol
+ignous
-
-private:

trunk/libffado/tests/controlserver.cpp

@@ -24 +24 @@
-
-#include "controlserver.h"
+#include "libcontrol/Element.h"
+#include "libcontrol/BasicElements.h"
-
-
+DBus
-
-ControlServer, ControlServer
+Element, Element
-
-
-
+
+
+
+
-{
-ControlServer
-SERVER_PATH
+Element
+path().c_str()
-}
-
-
+
+
-{
-
-
+
-}
-
-
+
+
-{
-
-
-
-
-
-
-
-
+
-}
-
+// --- Container
+Container::Container( DBus::Connection& connection, std::string p, Control::Container &slave)
+: Element(connection, p, slave)
+, m_Slave(slave)
+{
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Created Container on '%s'\n",
+                 path().c_str() );
+
+    // add children for the slave container
+    for ( Control::ConstElementVectorIterator it = slave.getElements().begin();
+      it != slave.getElements().end();
+      ++it )
+    {
+        Element *e=createHandler(*(*it));
+        if (e) {
+            m_Children.push_back(e);
+        } else {
+            debugWarning("Failed to create handler for Control::Element %s\n",
+                (*it)->getName().c_str());
+        }
+    }
+}
+
+Container::~Container() {
+    for ( ElementVectorIterator it = m_Children.begin();
+      it != m_Children.end();
+      ++it )
+    {
+        delete (*it);
+    }
+}
+
+/**
+ * \brief create a correct DBusControl counterpart for a given Control::Element
+ */
+Element *
+Container::createHandler(Control::Element& e) {
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Creating handler for '%s'\n",
+                 e.getName().c_str() );
+                 
+    if (dynamic_cast<Control::Container *>(&e) != NULL) {
+        debugOutput( DEBUG_LEVEL_VERBOSE, "Source is a Control::Container\n");
+        
+        return new Container(conn(), std::string(path()+"/"+e.getName()), 
+            *dynamic_cast<Control::Container *>(&e));
+    }
+    if (dynamic_cast<Control::Contignous *>(&e) != NULL) {
+        debugOutput( DEBUG_LEVEL_VERBOSE, "Source is a Control::Contignous\n");
+        
+        return new Contignous(conn(), std::string(path()+"/"+e.getName()),
+            *dynamic_cast<Control::Contignous *>(&e));
+    }
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Source is a Control::Element\n");
+    return new Element(conn(), std::string(path()+"/"+e.getName()), e);
+}
+
+// --- Contignous
+
+Contignous::Contignous( DBus::Connection& connection, std::string p, Control::Contignous &slave)
+: Element(connection, p, slave)
+, m_Slave(slave)
+{
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Created Contignous on '%s'\n",
+                 path().c_str() );
+}
+
+DBus::Double
+Contignous::setValue( const DBus::Double& value )
+{
+    m_Slave.setValue(value);
+    debugOutput( DEBUG_LEVEL_VERBOSE, "setValue(%lf) => %lf\n", value, m_Slave.getValue() );
+    
+    return m_Slave.getValue();
+}
+
+DBus::Double
+Contignous::getValue(  )
+{
+    debugOutput( DEBUG_LEVEL_VERBOSE, "getValue() => %lf\n", m_Slave.getValue() );
+    return m_Slave.getValue();
+}
-
-} // end of namespace Control

trunk/libffado/tests/controlserver.h

@@ -32 +32 @@
-#include "controlserver-glue.h"
-
-
-
+
-
-
+DBus
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-{
-public:
-
-
-
-
-
+
+
+
+
+
+
-
-private:
+    Control::Element &m_Slave;
+
+protected:
-    DECLARE_DEBUG_MODULE;
+};
+typedef std::vector<Element *> ElementVector;
+typedef std::vector<Element *>::iterator ElementVectorIterator;
+typedef std::vector<Element *>::const_iterator ConstElementVectorIterator;
+
+class Container
+: public org::ffado::Control::Element::Container
+, public Element
+{
+public:
+    Container( DBus::Connection& connection,
+                  std::string p,
+                  Control::Container &slave );
+    virtual ~Container();
+    
+    Element *createHandler(Control::Element& e);
+private:
+    Control::Container &m_Slave;
+    ElementVector m_Children;
+};
+
+class Contignous
+: public org::ffado::Control::Element::Fader
+, public Element
+{
+public:
+    Contignous( DBus::Connection& connection,
+                  std::string p,
+                  Control::Contignous &slave );
+    
+    DBus::Double setValue( const DBus::Double & value );
+    DBus::Double getValue( );
+
+private:
+    Control::Contignous &m_Slave;
-};
-

trunk/libffado/tests/SConscript

@@ -15 +15 @@
-#
-#for app in ["test-ffado", "test-extplugcmd", "test-fw410", "test-volume", "test-mixer", "test-cycletimer", "test-timestampedbuffer", "test-ieee1394service", "test-streamdump"]:
+
-for app in ["test-ffado", "test-fw410", "test-cycletimer", "test-timestampedbuffer", "test-ieee1394service", "test-streamdump"]:
-    env.Program( target=app, source = app+".cpp" )

trunk/libffado/tests/test-dbus-server.cpp

@@ -99 +99 @@
-}
-
+static const char* SERVER_NAME = "org.ffado.Control";
+
-void start_server() {
-
@@ -106 +108 @@
-    DBus::Connection conn = DBus::Connection::SessionBus();
-    conn.request_name(SERVER_NAME);
+    
+    Control::Contignous c0("test0");
+    c0.setVerboseLevel(DEBUG_LEVEL_VERBOSE);
+    DBusControl::Contignous fader(conn, "/org/ffado/Control/Test/Fader", c0);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    dispatcher.enter();
-
+    delete container;
+    
-}
-

trunk/libffado/tests/test-dbus.cpp

@@ -107 +107 @@
-    DBus::Connection conn = DBus::Connection::SessionBus();
-
-Control::Control
+DBusControl::Contignous
-
-    int i=0;
@@ -113 +113 @@
-    {
-        try {
-Echo
+setValue
-        } catch(...) {
-Echo
+setValue
-        };
-//         try {