Changeset 1651

Timestamp:

09/03/09 14:08:00 (14 years ago)

Author:

arnonym

Message:

Lets see if this works out: Work for ppalmers.

A new way to get the peakvalues. Getting each value individual is really cpu-heavy. Getting them all toghether should be better.

(My first real code commit to the internals:)

Files:

• trunk/libffado/src/dice/dice_avdevice.h (modified) (1 diff)
• trunk/libffado/src/dice/dice_eap.cpp (modified) (1 diff)
• trunk/libffado/src/libcontrol/CrossbarRouter.h (modified) (2 diffs)
• trunk/libffado/support/dbus/control-interface.xml (modified) (1 diff)
• trunk/libffado/support/dbus/controlserver.cpp (modified) (1 diff)
• trunk/libffado/support/dbus/controlserver.h (modified) (1 diff)

trunk/libffado/src/dice/dice_avdevice.h

@@ -336 +336 @@
-            virtual bool getPeakValues(double &) {return false;};
-            virtual double getPeakValue(const int source, const int dest);
+            virtual Control::CrossbarRouter::PeakValues getPeakValues();
-
-        private:

trunk/libffado/src/dice/dice_eap.cpp

@@ -1563 +1563 @@
-}
-
+Control::CrossbarRouter::PeakValues
+Device::EAP::Router::getPeakValues()
+{
+    // To be implemented by ppalmers
+    return PeakValues();
+}
+
-void
-Device::EAP::Router::show()

trunk/libffado/src/libcontrol/CrossbarRouter.h

@@ -52 +52 @@
-    typedef std::vector<int>::iterator IntVectorIterator;
-
+    struct PeakValue
+    {
+        int source;
+        int destination;
+        double peakvalue;
+    };
+    typedef std::vector<PeakValue> PeakValues;
+
-    virtual std::string getSourceName(const int) = 0;
-    virtual std::string getDestinationName(const int) = 0;
@@ -85 +93 @@
-    virtual double getPeakValue(const int source, const int dest) = 0;
-    virtual bool getPeakValues(double &) = 0;
+    virtual PeakValues getPeakValues() = 0;
-
-protected:

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

@@ -292 +292 @@
-          <arg type="d" name="value" direction="out"/>
-      </method>
+      <method name="getPeakValues">
+          <arg type="a(iid)" name="values" direction="out"/>
+      </method>
-  </interface>
-

trunk/libffado/support/dbus/controlserver.cpp

@@ -942 +942 @@
-    return m_Slave.getPeakValue(source, dest);
-}
+std::vector< DBus::Struct<int, int, double> >
+CrossbarRouter::getPeakValues()
+{
+    //return std::vector< DBus::Struct<int, int, double> >();
+    std::vector< DBus::Struct<int, int, double> > out;
+    Control::CrossbarRouter::PeakValues values = m_Slave.getPeakValues();
+    for ( unsigned int i=0; i<values.size(); ++i ) {
+        DBus::Struct<int, int, double> tmp;
+        tmp._1 = values[i].source;
+        tmp._2 = values[i].destination;
+        tmp._3 = values[i].peakvalue;
+        out.push_back(tmp);
+    }
+    return out;
+}
-
-std::vector< DBus::Int32 >

trunk/libffado/support/dbus/controlserver.h

@@ -355 +355 @@
-    DBus::Double getPeakValue(const DBus::Int32 &source, const DBus::Int32 &dest);
-
+    std::vector< DBus::Struct<int, int, double> > getPeakValues();
+
-    std::vector< DBus::Int32 > getConnectionMap();
-    DBus::Int32 setConnectionMap(const std::vector< DBus::Int32 >&);