Changeset 647

Timestamp:

10/14/07 12:08:00 (15 years ago)

Author:

ppalmers

Message:

Add a matrix mixer control element

Files:

• trunk/libffado/src/libcontrol/MatrixMixer.cpp (added)
• trunk/libffado/src/libcontrol/MatrixMixer.h (added)
• trunk/libffado/src/SConscript (modified) (1 diff)
• trunk/libffado/tests/control-interface.xml (modified) (1 diff)
• trunk/libffado/tests/controlserver.cpp (modified) (3 diffs)
• trunk/libffado/tests/controlserver.h (modified) (2 diffs)

trunk/libffado/src/SConscript

@@ -70 +70 @@
-        libcontrol/Element.cpp \
-        libcontrol/BasicElements.cpp \
+        libcontrol/MatrixMixer.cpp \
-' )
-

trunk/libffado/tests/control-interface.xml

@@ -64 +64 @@
-      </method>
-  </interface>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</node>

trunk/libffado/tests/controlserver.cpp

@@ -26 +26 @@
-#include "libcontrol/Element.h"
-#include "libcontrol/BasicElements.h"
+#include "libcontrol/MatrixMixer.h"
-
-namespace DBusControl {
@@ -146 +147 @@
-    }
-    
+    if (dynamic_cast<Control::MatrixMixer *>(&e) != NULL) {
+        debugOutput( DEBUG_LEVEL_VERBOSE, "Source is a Control::MatrixMixer\n");
+        
+        return new MatrixMixer(conn(), std::string(path()+"/"+e.getName()),
+            *dynamic_cast<Control::MatrixMixer *>(&e));
+    }
+    
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Source is a Control::Element\n");
-    return new Element(conn(), std::string(path()+"/"+e.getName()), e);
@@ -249 +257 @@
-}
-
+// --- MatrixMixer
+
+MatrixMixer::MatrixMixer( DBus::Connection& connection, std::string p, Control::MatrixMixer &slave)
+: Element(connection, p, slave)
+, m_Slave(slave)
+{
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Created MatrixMixer on '%s'\n",
+                 path().c_str() );
+}
+
+DBus::String
+MatrixMixer::getRowName( const DBus::Int32& row) {
+    return m_Slave.getRowName(row);
+}
+
+DBus::String
+MatrixMixer::getColName( const DBus::Int32& col) {
+    return m_Slave.getColName(col);
+}
+
+DBus::Int32
+MatrixMixer::canWrite( const DBus::Int32& row, const DBus::Int32& col) {
+    return m_Slave.canWrite(row,col);
+}
+
+DBus::Double
+MatrixMixer::setValue( const DBus::Int32& row, const DBus::Int32& col, const DBus::Double& val ) {
+    return m_Slave.setValue(row,col,val);
+}
+
+DBus::Double
+MatrixMixer::getValue( const DBus::Int32& row, const DBus::Int32& col) {
+    return m_Slave.getValue(row,col);
+}
+
+DBus::Int32
+MatrixMixer::getRowCount( ) {
+    return m_Slave.getRowCount();
+}
+
+DBus::Int32
+MatrixMixer::getColCount( ) {
+    return m_Slave.getColCount();
+}
+
-} // end of namespace Control

trunk/libffado/tests/controlserver.h

@@ -34 +34 @@
-#include "libcontrol/BasicElements.h"
-#include "libieee1394/configrom.h"
+
+namespace Control {
+    class MatrixMixer;
+};
-
-namespace DBusControl {
@@ -136 +140 @@
-};
-
+class MatrixMixer
+: public org::ffado::Control::Element::MatrixMixer
+, public Element
+{
+public:
+    MatrixMixer(  DBus::Connection& connection,
+                  std::string p,
+                  Control::MatrixMixer &slave );
+
+    DBus::String getRowName( const DBus::Int32& );
+    DBus::String getColName( const DBus::Int32& );
+    DBus::Int32 canWrite( const DBus::Int32&, const DBus::Int32& );
+    DBus::Double setValue( const DBus::Int32&, const DBus::Int32&, const DBus::Double& );
+    DBus::Double getValue( const DBus::Int32&, const DBus::Int32& );
+    DBus::Int32 getRowCount( );
+    DBus::Int32 getColCount( );
+
+private:
+    Control::MatrixMixer &m_Slave;
+};
-
-}