Changeset 1655

Timestamp:

09/05/09 05:07:54 (14 years ago)

Author:

arnonym

Message:

Thinking about getting structured info about the router-channels.

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

@@ -311 +311 @@
-            virtual NameVector getDestinationNames();
-
+            virtual Control::CrossbarRouter::Groups getSources();
+            virtual Control::CrossbarRouter::Groups getDestinations();
+
-            virtual IntVector getDestinationsForSource(const int);
-            virtual int getSourceForDestination(const int);

trunk/libffado/src/dice/dice_eap.cpp

@@ -1229 +1229 @@
-}
-
+Control::CrossbarRouter::Groups
+Device::EAP::Router::getSources()
+{
+    debugError("Device::EAP::Router::getSources() is not yet implemented!");
+    return Control::CrossbarRouter::Groups();
+}
+
+Control::CrossbarRouter::Groups
+Device::EAP::Router::getDestinations()
+{
+    debugError("Device::EAP::Router::getDestinations() is not yet implemented!");
+    return Control::CrossbarRouter::Groups();
+}
+
-Control::CrossbarRouter::IntVector
-Device::EAP::Router::getDestinationsForSource(const int srcid)

trunk/libffado/src/libcontrol/CrossbarRouter.h

@@ -59 +59 @@
-    typedef std::vector<PeakValue> PeakValues;
-
+    struct Group
+    {
+        std::string name;
+        int nbchannels;
+    };
+    typedef std::vector<Group> Groups;
+
-    virtual std::string getSourceName(const int) = 0;
-    virtual std::string getDestinationName(const int) = 0;
@@ -66 +73 @@
-    virtual NameVector getSourceNames() = 0;
-    virtual NameVector getDestinationNames() = 0;
+
+    virtual Groups getSources() = 0;
+    virtual Groups getDestinations() = 0;
-
-    virtual IntVector getDestinationsForSource(const int) = 0;

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

@@ -224 +224 @@
-      <method name="getSourceNames">
-          <arg type="as" name="sourcenames" direction="out"/>
+      </method>
+      <method name="getSources">
+          <arg type="a(si)" name="sources" direction="out"/>
+      </method>
+      <method name="getDestinations">
+          <arg type="a(si)" name="sources" direction="out"/>
-      </method>
-      <method name="getDestinationNames">

trunk/libffado/support/dbus/controlserver.cpp

@@ -865 +865 @@
-}
-
+std::vector< DBus::Struct<DBus::String, int> >
+CrossbarRouter::getSources()
+{
+    return std::vector< DBus::Struct<DBus::String, int> >();
+}
+
+std::vector< DBus::Struct<DBus::String, int> >
+CrossbarRouter::getDestinations()
+{
+    return std::vector< DBus::Struct<DBus::String, int> >();
+}
+
-std::vector< DBus::Int32 >
-CrossbarRouter::getDestinationsForSource(const DBus::Int32 &idx)

trunk/libffado/support/dbus/controlserver.h

@@ -336 +336 @@
-    std::vector< DBus::String > getDestinationNames();
-
+    std::vector< DBus::Struct<DBus::String, int> > getSources();
+    std::vector< DBus::Struct<DBus::String, int> > getDestinations();
+
-    std::vector< DBus::Int32 > getDestinationsForSource(const DBus::Int32 &);
-    DBus::Int32 getSourceForDestination(const DBus::Int32 &);