Changeset 958

Timestamp:

03/18/08 13:52:22 (15 years ago)

Author:

ppalmers

Message:

add clock source control to dbus

Files:

• trunk/libffado/src/ffadodevice.cpp (modified) (3 diffs)
• trunk/libffado/src/ffadodevice.h (modified) (5 diffs)
• trunk/libffado/src/libcontrol/BasicElements.cpp (modified) (1 diff)
• trunk/libffado/src/libcontrol/BasicElements.h (modified) (1 diff)
• trunk/libffado/src/libcontrol/ClockSelect.cpp (added)
• trunk/libffado/src/libcontrol/ClockSelect.h (added)
• trunk/libffado/support/dbus/control-interface.xml (modified) (1 diff)
• trunk/libffado/support/dbus/controlserver.cpp (modified) (2 diffs)
• trunk/libffado/support/dbus/controlserver.h (modified) (2 diffs)
• trunk/libffado/support/dbus/test-dbus-server.cpp (modified) (1 diff)
• trunk/libffado/support/mixer/ffadomixer.in (modified) (2 diffs)
• trunk/libffado/support/mixer/mixer_af2.py (modified) (2 diffs)
• trunk/libffado/support/mixer/mixer_af2.ui (modified) (5 diffs)

trunk/libffado/src/ffadodevice.cpp

@@ -28 +28 @@
-#include "libieee1394/ieee1394service.h"
-
+#include "libcontrol/Element.h"
+#include "libcontrol/ClockSelect.h"
+
-#include <iostream>
-#include <sstream>
@@ -48 +51 @@
-        debugWarning("failed to add ConfigRom to Control::Container\n");
-    }
+
+    m_genericContainer = new Control::Container("Generic");
+    if(m_genericContainer == NULL) {
+        debugError("Could not create Control::Container for generic controls\n");
+    } else {
+
+        if (!addElement(m_genericContainer)) {
+            debugWarning("failed to add generic container to Control::Container\n");
+        }
+        // add a generic control for the clock source selection
+        if(!m_genericContainer->addElement(new Control::ClockSelect(*this))) {
+            debugWarning("failed to add clock source control to container\n");
+        }
+    }
-}
-
@@ -54 +71 @@
-    if (!deleteElement(&getConfigRom())) {
-        debugWarning("failed to remove ConfigRom from Control::Container\n");
+    }
+
+    // remove generic controls if present
+    if(m_genericContainer) {
+        if (!deleteElement(m_genericContainer)) {
+            debugError("Generic controls present but not registered to the avdevice\n");
+        }
+        // remove and delete (as in free) child control elements
+        m_genericContainer->clearElements(true);
+        delete m_genericContainer;
-    }
-}

trunk/libffado/src/ffadodevice.h

@@ -41 +41 @@
-    class StreamProcessor;
-    class StreamProcessorManager;
+}
+
+namespace Control {
+    class Container;
-}
-
@@ -174 +178 @@
-     * @brief Clock source identification struct
-     */
-
+
+
-        sClockSource()
-            : type( eCT_Invalid )
@@ -183 +188 @@
-            , slipping( false )
-            , description( "" )
-
+
+
-        /// indicates the type of the clock source (e.g. eCT_ADAT)
-        enum eClockSourceType type;
@@ -198 +204 @@
-        /// description of the clock struct (optional)
-        std::string description;
+        
+        bool operator==(const sClockSource& x) {
+            return (type == x.type) && (id == x.id);
+        }
-    };
-    typedef struct sClockSource ClockSource;
@@ -425 +435 @@
-    std::auto_ptr<ConfigRom>( m_pConfigRom );
-    DeviceManager& m_pDeviceManager;
+    Control::Container* m_genericContainer;
-protected:
-    DECLARE_DEBUG_MODULE;

trunk/libffado/src/libcontrol/BasicElements.cpp

@@ -142 +142 @@
-}
-
+//// ---
+
+Enum::Enum()
+: Element()
+, m_selected( -1 )
+{
+}
+
+Enum::Enum(std::string n)
+: Element(n)
+, m_selected( -1 )
+{
+}
+
+void
+Enum::show()
+{
+    debugOutput( DEBUG_LEVEL_NORMAL, "Enum Element %s, selected=%d\n",
+                 getName().c_str(), m_selected);
+}
+
+// NOTE: dummy implementation for tests
+bool
+Enum::select(int idx)
+{
+    if(idx <3) {
+        m_selected=idx;
+        return true;
+    } else {
+        return false;
+    }
+}
+
+int
+Enum::selected()
+{
+    return m_selected;
+}
+
+int
+Enum::count()
+{
+    return 3;
+}
+
+std::string
+Enum::getEnumLabel(int idx)
+{
+    switch(idx) {
+        case 0: return "enum val 1";
+        case 1: return "enum val 2";
+        case 2: return "enum val 3";
+        default: return "bad index";
+    }
+}
+
+
+//// ---
+
+AttributeEnum::AttributeEnum()
+: Enum()
+{
+}
+
+AttributeEnum::AttributeEnum(std::string n)
+: Enum(n)
+{
+}
+
+void
+AttributeEnum::show()
+{
+    debugOutput( DEBUG_LEVEL_NORMAL, "AttributeEnum Element %s\n",
+                 getName().c_str());
+    Enum::show();
+}
+
+// NOTE: dummy implementation for tests
+int
+AttributeEnum::attributeCount()
+{
+    return 2;
+}
+
+std::string
+AttributeEnum::getAttributeValue(int attridx)
+{
+    switch(attridx) {
+        case 0: return "attr val 1";
+        case 1: return "attr val 2";
+        default: return "bad attr index";
+    }
+}
+
+std::string
+AttributeEnum::getAttributeName(int attridx)
+{
+    switch(attridx) {
+        case 0: return "attr 1";
+        case 1: return "attr 2";
+        default: return "bad attr index";
+    }
+}
+
-} // namespace Control

trunk/libffado/src/libcontrol/BasicElements.h

@@ -94 +94 @@
-};
-
+/*!
+@brief Base class for basic enumerated control elements
+*/
+class Enum
+: public Element
+{
+public:
+    Enum();
+    Enum(std::string n);
+    virtual ~Enum() {};
+
+    virtual bool select(int idx);
+    virtual int selected();
+    virtual int count();
+    virtual std::string getEnumLabel(int idx);
+
+    virtual void show();
+//private: // HACK
+    int m_selected;
+};
+
+/*!
+@brief Base class for attribute enumerated control elements
+
+The idea of this is that one can have a set of config values
+available for a certain enum choice.
+
+Example: for clock source selection:
+idx Label     signal  locked  available
+  0 WordClock   0       0        1
+  1 S/PDIF      1       0        1
+  ...
+
+Attributes:
+ 0 signal
+ 1 locked
+ 2 available
+
+*/
+class AttributeEnum
+: public Enum
+{
+public:
+    AttributeEnum();
+    AttributeEnum(std::string n);
+    virtual ~AttributeEnum() {};
+
+    virtual int attributeCount();
+    ///> get a specific attribute value for the selected enum 
+    virtual std::string getAttributeValue(int attridx);
+    ///> get the name of the attribute with a certain index
+    virtual std::string getAttributeName(int attridx);
+
+    virtual void show();
+private:
+};
+
-}; // namespace Control
-

trunk/libffado/support/dbus/control-interface.xml

@@ -75 +75 @@
-  </interface>
-
+  <interface name="org.ffado.Control.Element.Enum">
+      <method name="select">
+          <arg type="i" name="idx" direction="in"/>
+          <arg type="i" name="success" direction="out"/>
+      </method>
+      <method name="selected">
+          <arg type="i" name="idx" direction="out"/>
+      </method>
+      <method name="count">
+          <arg type="i" name="count" direction="out"/>
+      </method>
+      <method name="getEnumLabel">
+          <arg type="i" name="idx" direction="in"/>
+          <arg type="s" name="label" direction="out"/>
+      </method>
+  </interface>
+
+  <interface name="org.ffado.Control.Element.AttributeEnum">
+      <method name="select">
+          <arg type="i" name="idx" direction="in"/>
+          <arg type="i" name="success" direction="out"/>
+      </method>
+      <method name="selected">
+          <arg type="i" name="idx" direction="out"/>
+      </method>
+      <method name="count">
+          <arg type="i" name="count" direction="out"/>
+      </method>
+      <method name="attributeCount">
+          <arg type="i" name="count" direction="out"/>
+      </method>
+      <method name="getEnumLabel">
+          <arg type="i" name="idx" direction="in"/>
+          <arg type="s" name="label" direction="out"/>
+      </method>
+      <method name="getAttributeValue">
+          <arg type="i" name="idx" direction="in"/>
+          <arg type="s" name="value" direction="out"/>
+      </method>
+      <method name="getAttributeName">
+          <arg type="i" name="idx" direction="in"/>
+          <arg type="s" name="name" direction="out"/>
+      </method>
+  </interface>
+
-  <interface name="org.ffado.Control.Element.MatrixMixer">
-      <method name="setValue">

trunk/libffado/support/dbus/controlserver.cpp

@@ -146 +146 @@
-            *dynamic_cast<Control::Text *>(&e));
-    }
+
+    // note that we have to check this before checking the Enum,
+    // since Enum is a base class
+    if (dynamic_cast<Control::AttributeEnum *>(&e) != NULL) {
+        debugOutput( DEBUG_LEVEL_VERBOSE, "Source is a Control::AttributeEnum\n");
+        
+        return new AttributeEnum(conn(), std::string(path()+"/"+e.getName()),
+            *dynamic_cast<Control::AttributeEnum *>(&e));
+    }
+    
+    if (dynamic_cast<Control::Enum *>(&e) != NULL) {
+        debugOutput( DEBUG_LEVEL_VERBOSE, "Source is a Control::Enum\n");
+        
+        return new Enum(conn(), std::string(path()+"/"+e.getName()),
+            *dynamic_cast<Control::Enum *>(&e));
+    }
-    
-    if (dynamic_cast<ConfigRom *>(&e) != NULL) {
@@ -253 +269 @@
-}
-
+
+// --- Enum
+
+Enum::Enum( DBus::Connection& connection, std::string p, Control::Enum &slave)
+: Element(connection, p, slave)
+, m_Slave(slave)
+{
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Created Enum on '%s'\n",
+                 path().c_str() );
+}
+
+DBus::Int32
+Enum::select( const DBus::Int32& idx )
+{
+    debugOutput( DEBUG_LEVEL_VERBOSE, "select(%d)\n", idx );
+    return  m_Slave.select(idx);
+}
+
+DBus::Int32
+Enum::selected()
+{
+    int retval = m_Slave.selected();
+    debugOutput( DEBUG_LEVEL_VERBOSE, "selected() => %d\n", retval );
+    return retval;
+}
+
+DBus::Int32
+Enum::count()
+{
+    int retval = m_Slave.count();
+    debugOutput( DEBUG_LEVEL_VERBOSE, "count() => %d\n", retval );
+    return retval;
+}
+
+DBus::String
+Enum::getEnumLabel( const DBus::Int32 & idx )
+{
+    std::string retval = m_Slave.getEnumLabel(idx);
+    debugOutput( DEBUG_LEVEL_VERBOSE, "getEnumLabel(%d) => %s\n", idx, retval.c_str() );
+    return retval;
+}
+
+// --- AttributeEnum
+AttributeEnum::AttributeEnum( DBus::Connection& connection, std::string p, Control::AttributeEnum &slave)
+: Element(connection, p, slave)
+, m_Slave(slave)
+{
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Created Enum on '%s'\n",
+                 path().c_str() );
+}
+
+DBus::Int32
+AttributeEnum::select( const DBus::Int32& idx )
+{
+    debugOutput( DEBUG_LEVEL_VERBOSE, "select(%d)\n", idx );
+    return  m_Slave.select(idx);
+}
+
+DBus::Int32
+AttributeEnum::selected()
+{
+    int retval = m_Slave.selected();
+    debugOutput( DEBUG_LEVEL_VERBOSE, "selected() => %d\n", retval );
+    return retval;
+}
+
+DBus::Int32
+AttributeEnum::count()
+{
+    int retval = m_Slave.count();
+    debugOutput( DEBUG_LEVEL_VERBOSE, "count() => %d\n", retval );
+    return retval;
+}
+
+DBus::Int32
+AttributeEnum::attributeCount()
+{
+    int retval = m_Slave.attributeCount();
+    debugOutput( DEBUG_LEVEL_VERBOSE, "attributeCount() => %d\n", retval );
+    return retval;
+}
+
+DBus::String
+AttributeEnum::getEnumLabel( const DBus::Int32 & idx )
+{
+    std::string retval = m_Slave.getEnumLabel(idx);
+    debugOutput( DEBUG_LEVEL_VERBOSE, "getEnumLabel(%d) => %s\n", idx, retval.c_str() );
+    return retval;
+}
+
+DBus::String
+AttributeEnum::getAttributeValue( const DBus::Int32 & idx )
+{
+    std::string retval = m_Slave.getAttributeValue(idx);
+    debugOutput( DEBUG_LEVEL_VERBOSE, "getAttributeValue(%d) => %s\n", idx, retval.c_str() );
+    return retval;
+}
+
+DBus::String
+AttributeEnum::getAttributeName( const DBus::Int32 & idx )
+{
+    std::string retval = m_Slave.getAttributeName(idx);
+    debugOutput( DEBUG_LEVEL_VERBOSE, "getAttributeName(%d) => %s\n", idx, retval.c_str() );
+    return retval;
+}
+
-// --- ConfigRom
-

trunk/libffado/support/dbus/controlserver.h

@@ -108 +108 @@
-public:
-    Discrete( DBus::Connection& connection,
-    
-    
+
+
-    
-    DBus::Int32 setValue( const DBus::Int32 & value );
@@ -132 +132 @@
-private:
-    Control::Text &m_Slave;
+};
+
+class Enum
+: public org::ffado::Control::Element::Enum
+, public Element
+{
+public:
+    Enum( DBus::Connection& connection,
+          std::string p,
+          Control::Enum &slave );
+    
+    DBus::Int32 select( const DBus::Int32 & idx );
+    DBus::Int32 selected( );
+    DBus::Int32 count( );
+    DBus::String getEnumLabel( const DBus::Int32 & idx );
+
+private:
+    Control::Enum &m_Slave;
+};
+
+class AttributeEnum
+: public org::ffado::Control::Element::AttributeEnum
+, public Element
+{
+public:
+    AttributeEnum( DBus::Connection& connection,
+                   std::string p,
+                   Control::AttributeEnum &slave );
+    
+    DBus::Int32 select( const DBus::Int32 & idx );
+    DBus::Int32 selected( );
+    DBus::Int32 count( );
+    DBus::Int32 attributeCount();
+    DBus::String getEnumLabel( const DBus::Int32 & idx );
+    DBus::String getAttributeValue( const DBus::Int32 & idx );
+    DBus::String getAttributeName( const DBus::Int32 & idx );
+
+private:
+    Control::AttributeEnum &m_Slave;
-};
-

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

@@ -139 +139 @@
-    c5.setVerboseLevel(DEBUG_LEVEL_VERBOSE);
-    cont1.addElement(&c5);
+    
+    Control::Discrete d1("test_discr1");
+    d1.setVerboseLevel(DEBUG_LEVEL_VERBOSE);
+    cont1.addElement(&d1);
+    
+    Control::Enum e1("test_enum");
+    e1.setVerboseLevel(DEBUG_LEVEL_VERBOSE);
+    cont1.addElement(&e1);
+
+    Control::AttributeEnum a1("test_attrenum");
+    a1.setVerboseLevel(DEBUG_LEVEL_VERBOSE);
+    cont1.addElement(&a1);
+    
+    Control::Text t1("test_text");
+    t1.setVerboseLevel(DEBUG_LEVEL_VERBOSE);
+    cont1.addElement(&t1);
-
-    // Note: create handlers AFTER all children are added

trunk/libffado/support/mixer/ffadomixer.in

@@ -168 +168 @@
-    def getModelId(self):
-        return self.iface.getModelId()
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-if __name__ == "__main__":
@@ -236 +257 @@
-                exec('forms.append('+mixerapp+'())')
-                forms[idx].hw = ControlInterface(server, basepath+'/DeviceManager/'+path)
+                forms[idx].clockselect = ClockSelectInterface(server, basepath+'/DeviceManager/'+path)
-                forms[idx].initValues()
-                forms[idx].show()

trunk/libffado/support/mixer/mixer_af2.py

@@ -184 +184 @@
-                    state)
-        self.hw.setDiscrete(self.SelectorControls[sender][0], state)
+    
+    def updateClockSelection(self,a0):
+        #disable the combobox
+        self.comboClockSelect.setEnabled(False)
+        #change the clock source
+        self.clockselect.select(a0)
+        #refresh the clock source selection box
+        self.initClockSelector()
+        #make the box available again
+        self.comboClockSelect.setEnabled(True)
+
+    def initClockSelector(self):
+        self.comboClockSelect.clear()
+        nbsources = self.clockselect.count()
+        for idx in range(nbsources):
+            desc = self.clockselect.getEnumLabel(idx)
+            self.comboClockSelect.insertItem(desc)
+        active_idx = self.clockselect.selected();
+        if active_idx >= 0:
+            self.comboClockSelect.setCurrentItem(active_idx)
-        
-    def initValues(self):
@@ -241 +261 @@
-                # connect the UI element
-                QObject.connect(ctrl,SIGNAL('stateChanged(int)'),self.updateSelector)
+            
+            self.initClockSelector()
+            # connect the clock selector UI element
+            QObject.connect(self.comboClockSelect, SIGNAL('activated(int)'), self.updateClockSelection)

trunk/libffado/support/mixer/mixer_af2.ui

@@ -50 +50 @@
-            </property>
-            <attribute name="title">
-
+&amp;
-            </attribute>
-            <widget class="QLabel">
@@ -84 +84 @@
-                </property>
-                <property name="text">
-
+&amp;
-                </property>
-                <property name="toggleButton">
@@ -1840 +1840 @@
-            </property>
-            <attribute name="title">
-
+&amp;
-            </attribute>
-            <widget class="QLabel">
@@ -2716 +2716 @@
-            </property>
-            <attribute name="title">
-
+&amp;
-            </attribute>
+            <widget class="QLabel">
+                <property name="name">
+                    <cstring>AnOut_textLabel1_2_6</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>50</y>
+                        <width>50</width>
+                        <height>21</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>1</string>
+                </property>
+                <property name="alignment">
+                    <set>AlignCenter</set>
+                </property>
+            </widget>
+            <widget class="QLabel">
+                <property name="name">
+                    <cstring>AnOut_textLabel1_2_3_4</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>78</x>
+                        <y>50</y>
+                        <width>50</width>
+                        <height>21</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>2</string>
+                </property>
+                <property name="alignment">
+                    <set>AlignCenter</set>
+                </property>
+            </widget>
+            <widget class="QPushButton">
+                <property name="name">
+                    <cstring>btnIn1Pad</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>22</x>
+                        <y>80</y>
+                        <width>50</width>
+                        <height>21</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Pad</string>
+                </property>
+                <property name="toggleButton">
+                    <bool>true</bool>
+                </property>
+            </widget>
+            <widget class="QPushButton">
+                <property name="name">
+                    <cstring>btnIn2Pad</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>80</x>
+                        <y>80</y>
+                        <width>50</width>
+                        <height>21</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Pad</string>
+                </property>
+                <property name="toggleButton">
+                    <bool>true</bool>
+                </property>
+            </widget>
-            <widget class="QLabel">
-                <property name="name">
@@ -2737 +2813 @@
-                </property>
-            </widget>
-Label
-
-AnOut_textLabel1_2_6
+GroupBox
+
+groupBox1
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            </widget>
-        </widget>