Changeset 1776

Timestamp:

01/02/10 15:07:26 (14 years ago)

Author:

arnonym

Message:

Reduce the LOC:

• Use only strings as identifiers for the Dice::EAP::Router. Updating the router doesn't happen that often, using strings only is acceptable. And it eases handling so much.
  
• Adapt the control interface.
  
• Adapt the dbus interface.
  
• Adapt the routers gui.
  

• The peak-space is not yet working (I didn't actually test it), the peak-functions of EAP::Router return nothing.
  
• And the test for the dice has to be adopted when the peaks are working again.
  

TODO:

• Re-activate the peaks.
  
• Adopt the mixer interface.
  

Files:

• trunk/libffado/src/dice/dice_eap.cpp (modified) (23 diffs)
• trunk/libffado/src/dice/dice_eap.h (modified) (5 diffs)
• trunk/libffado/src/dice/focusrite/saffire_pro24.cpp (modified) (1 diff)
• trunk/libffado/src/libcontrol/CrossbarRouter.h (modified) (3 diffs)
• trunk/libffado/support/dbus/control-interface.xml (modified) (2 diffs)
• trunk/libffado/support/dbus/controlserver.cpp (modified) (10 diffs)
• trunk/libffado/support/dbus/controlserver.h (modified) (1 diff)
• trunk/libffado/support/mixer-qt4/ffado/widgets/crossbarrouter.py (modified) (5 diffs)
• trunk/libffado/tests/test-dice-eap.cpp (modified) (1 diff)

trunk/libffado/src/dice/dice_eap.cpp

@@ -219 +219 @@
-        case DICE_EAP_CAP_GENERAL_CHIP_DICEJR:
-            // second audio port (unique to the junior)
-eRS_InS1, 0, 8
+0, 8, eRS_InS1
-        case DICE_EAP_CAP_GENERAL_CHIP_DICEMINI:
-            /// these are common to the mini and junior
-            // the AES receiver
-eRS_AES, 0, 8
+0, 8, eRS_AES
-            // the ADAT receiver
-eRS_ADAT, 0, 8
+0, 8, eRS_ADAT
-            // the Mixer outputs
-eRS_Mixer, 0, 16
+0, 16, eRS_Mixer
-            // the first audio port
-eRS_InS0, 0, 8
+0, 8, eRS_InS0
-            // the ARM audio port
-eRS_ARM, 0, 8
+0, 8, eRS_ARM
-            // the 1394 stream receivers
-eRS_ARX0, 0, 16
-eRS_ARX1, 0, 16
+0, 16, eRS_ARX0
+0, 16, eRS_ARX1
-            // mute
-eRS_Muted, 0, 1
+0, 1, eRS_Muted
-            break;
-        default:
@@ -253 +253 @@
-        case DICE_EAP_CAP_GENERAL_CHIP_DICEJR:
-            // second audio port (unique to the junior)
-eRD_InS1, 0, 8
+0, 8, eRD_InS1
-        case DICE_EAP_CAP_GENERAL_CHIP_DICEMINI:
-            /// these are common to the mini and junior
-            // the AES receiver
-eRD_AES, 0, 8
+0, 8, eRD_AES
-            // the ADAT receiver
-eRD_ADAT, 0, 8
+0, 8, eRD_ADAT
-            // the Mixer outputs
-eRD_Mixer0, 0, 16
-eRD_Mixer1, 16, 2
+0, 16, eRD_Mixer0
+0, 2, eRD_Mixer1, 16
-            // the first audio port
-eRD_InS0, 0, 8
+0, 8, eRD_InS0
-            // the ARM audio port
-eRD_ARM, 0, 8
+0, 8, eRD_ARM
-            // the 1394 stream receivers
-eRD_ATX0, 0, 16
-eRD_ATX1, 0, 16
+0, 16, eRD_ATX0
+0, 16, eRD_ATX1
-            // mute
-eRD_Muted, 0, 1
+0, 1, eRD_Muted
-            break;
-        default:
@@ -280 +280 @@
-
-void
-
-
+
+
+
+
-}
-void
-
-
+
+
+
+
-}
-
@@ -496 +500 @@
-                                     (m_mixer_readonly?"not ":""),
-                                     (m_mixer_flashstored?"":"not "));
-%s [%d], rx id: %s [%d]
-dstBlockToString(m_mixer_tx_id), m_mixer_tx_id
-srcBlockToString(m_mixer_rx_id), m_mixer_rx_id
+(%d==eRD_Mixer0) ? %s, rx id: (%d==eRS_Mixer) ? %s
+m_mixer_tx_id, (m_mixer_tx_id == eRD_Mixer0)?"true":"false"
+m_mixer_rx_id, (m_mixer_rx_id == eRS_Mixer) ?"true":"false"
-    printMessage("         nb tx channels: %d, nb rx channels: %d\n", m_mixer_nb_tx, m_mixer_nb_rx);
-    printMessage(" General: dynamic stream config %ssupported\n",
@@ -1092 +1096 @@
-}
-
+//
-// ----------- Router -------------
-
-
-
+
-
-EAP::Router::Router(EAP &p)
@@ -1111 +1114 @@
-
-void
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-}
-
-void
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-}
@@ -1139 +1140 @@
-EAP::Router::getSourceName(const int srcid)
-{
-if((unsigned)srcid < m_sources.size()
-return m_sources.at(srcid).name;
-} else {
-debugWarning("source id out of range (%d)\n", srcid);
-    return "";
-}
+for (std::map<std::string, int>::iterator it=m_sources.begin(); it!=m_sources.end(); ++it
+if (it->second == srcid) {
+        return it->first;
+}
+}
+return "";
-}
-
@@ -1150 +1151 @@
-EAP::Router::getDestinationName(const int dstid)
-{
-
-
-
-
-
-
+
+
+
+
+
+
+
-}
-
@@ -1161 +1163 @@
-EAP::Router::getSourceIndex(std::string name)
-{
-
-
-
-
-
-
-
-
-
+
+
+
-}
-
@@ -1175 +1171 @@
-EAP::Router::getDestinationIndex(std::string name)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-EAP::Router::getSourceNames()
-{
-
-
-
-
-
-
-
+
+
+
-    return n;
-}
-
-
+
-EAP::Router::getDestinationNames()
-{
-
-
-
-
-
-
-
+
+
+
-    return n;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-bool
-EAP::Router::canConnect(const int source, const int dest)
-{
-
+
+
-        debugWarning("source id out of range (%d)\n", source);
-        return false;
@@ -1356 +1230 @@
-        return false;
-    }
-
+*/
-
-    // we can connect anything
@@ -1366 +1240 @@
-EAP::Router::setConnectionState(const int source, const int dest, const bool enable)
-{
-    if((unsigned)source >= m_sources.size()) {
-        debugWarning("source id out of range (%d)\n", source);
-        return false;
-    }
-    Source s = m_sources.at(source);
-
-    if((unsigned)dest >= m_destinations.size()) {
-        debugWarning("destination id out of range (%d)\n", dest);
-        return false;
-    }
-    Destination d = m_destinations.at(dest);
-
-    // get the routing configuration
-    RouterConfig *rcfg = m_eap.getActiveRouterConfig();
@@ -1385 +1247 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1420 +1283 @@
-EAP::Router::getConnectionState(const int source, const int dest)
-{
-    if((unsigned)source >= m_sources.size()) {
-        debugWarning("source id out of range (%d)\n", source);
-        return false;
-    }
-    Source s = m_sources.at(source);
-
-    if((unsigned)dest >= m_destinations.size()) {
-        debugWarning("destination id out of range (%d)\n", dest);
-        return false;
-    }
-    Destination d = m_destinations.at(dest);
-
-    // get the routing configuration
-    RouterConfig *rcfg = m_eap.getActiveRouterConfig();
@@ -1438 +1289 @@
-        return false;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-{
-    int srcidx = getSourceIndex(src);
@@ -1466 +1306 @@
-
-bool
-std::string src, std::string
+const std::string& src, const std::string&
-{
-    int srcidx = getSourceIndex(src);
@@ -1474 +1314 @@
-
-bool
-std::string src, std::string
+const std::string& src, const std::string&
-{
-    int srcidx = getSourceIndex(src);
@@ -1481 +1321 @@
-}
-
-// the map is organized as a matrix where the 
-// rows are the destinations and the columns are
-// the sources
-
-// note that map as assumed to be big enough and
-// allocated by the user
-bool
-EAP::Router::getConnectionMap(int *map)
-{
-    unsigned int nb_sources = getNbSources();
-    unsigned int nb_destinations = getNbDestinations();
-
-    // clear the map
-    memset(map, 0, nb_sources * nb_destinations * sizeof(int));
-
-    // get the routing configuration
-    RouterConfig *rcfg = m_eap.getActiveRouterConfig();
-    if(rcfg == NULL) {
-        debugError("Could not request active router configuration\n");
-        return false;
-    }
-
-    unsigned int nb_routes = rcfg->getNbRoutes();
-
-    for(unsigned int i=0; i<nb_routes; i++) {
-        struct RouterConfig::Route r = rcfg->getRoute(i);
-        int srcidx = getSourceIndex(r.src, r.srcChannel);
-        int dstidx = getDestinationIndex(r.dst, r.dstChannel);
-        if(srcidx < 0) {
-            debugWarning("bogus source (%d, %d) in route table\n", r.src, r.srcChannel);
-        } else if(dstidx < 0) {
-            debugWarning("bogus destination (%d, %d) in route table\n", r.dst, r.dstChannel);
-        } else {
-            int *ptr = map;
-            ptr += dstidx * nb_sources;
-            ptr += srcidx;
-            *ptr = 1; // route present
-        }
-    }
-    return true;
-}
-
-bool
-EAP::Router::setConnectionMap(int *map)
-{
-    return false;
-}
-
-bool
@@ -1550 +1343 @@
-
-double
-
-
-
+
+
+
+
-        debugWarning("source id out of range (%d)\n", source);
-        return false;
@@ -1584 +1378 @@
-        r = m_peak.getRoute(idx);
-        return r.peak;
-
-
-
-
-
+
+
+
+
+
+
-EAP::Router::getPeakValues()
-{
-
+
+
-    Control::CrossbarRouter::PeakValues values;
-    for (unsigned int i=0; i<m_peak.getNbRoutes(); ++i) {
@@ -1600 +1396 @@
-        values.push_back(tmp);
-    }
-
+
+
-}
-
@@ -1607 +1404 @@
-{
-    // print the peak space as it also contains the routing configuration
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1863 +1678 @@
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "%s:%02d source can't be found\n",
-                                          dstBlockToString((int)dst), channel);
-0
+-1
-    return r;
-}

trunk/libffado/src/dice/dice_eap.h

@@ -223 +223 @@
-        virtual void show();
-
-
-        bool insertRoute(struct Route r)
-            {return insertRoute(r, m_routes.size());};
@@ -367 +366 @@
-      */
-    class Router : public Control::CrossbarRouter {
-    private:
-        struct Source {
-            std::string name;
-            enum eRouteSource src;
-            int srcChannel;
-        };
-        typedef std::vector<Source> SourceVector;
-        typedef std::vector<Source>::iterator SourceVectorIterator;
-
-        struct Destination {
-            std::string name;
-            enum eRouteDestination dst;
-            int dstChannel;
-        };
-        typedef std::vector<Destination> DestinationVector;
-        typedef std::vector<Destination>::iterator DestinationVectorIterator;
-
-    public:
-        Router(EAP &);
@@ -390 +372 @@
-        void show();
-
-
-
-
-
-
-
-
+
+
+
+
-
-        // per-coefficient access
@@ -403 +382 @@
-        virtual int getSourceIndex(std::string);
-        virtual int getDestinationIndex(std::string);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        virtual bool clearAllConnections();
-
-        virtual int getNbSources();
-        virtual int getNbDestinations();
-
-        // functions to access the entire routing map at once
-        // idea is that the row/col nodes that are 1 get a routing entry
-        virtual bool getConnectionMap(int *);
-        virtual bool setConnectionMap(int *);
-
-        // peak metering support
-        virtual bool hasPeakMetering();
-
-
-
+
+
-
-    private:
-        EAP &m_eap;
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-        PeakSpace &m_peak;
@@ -528 +500 @@
-      @brief Actually add the source
-      */
- const std::string name, enum eRouteSource srcid
-unsigned int base, unsigned int count 
+const std::string name, unsigned int base, unsigned int count
+       enum eRouteSource srcid, unsigned int offset=0
-    /**
-      @brief Actually add the destination
-      */
- const std::string name, enum eRouteDestination destid
-unsigned int base, unsigned int count 
+const std::string name, unsigned int base, unsigned int count
+            enum eRouteDestination destid, unsigned int offset=0
-
-private:

trunk/libffado/src/dice/focusrite/saffire_pro24.cpp

@@ -45 +45 @@
-
-void SaffirePro24::SaffirePro24EAP::setupSources() {
-  eRS_AES,   6, 2
-  eRS_ADAT,  0, 8
-INS0",     eRS_InS0,  0, 4
-Out", eRS_Mixer, 0, 16
-  eRS_ARX0,  0, 8
+6, 2, eRS_AES
+0, 8, eRS_ADAT
+Analog", 0, 4, eRS_InS0
+",  0, 16, eRS_Mixer
+0, 8, eRS_ARX0
-}
-void SaffirePro24::SaffirePro24EAP::setupDestinations() {
-eRD_AES, 6, 2
-INS0", eRD_InS0, 0, 6
-In", eRD_Mixer0, 0, 16
-In", eRD_Mixer1, 16, 2
-eRD_ATX0, 0, 16
+ 6, 2, eRD_AES
+Analog", 0, 6, eRD_InS0
+",  0, 16, eRD_Mixer0
+",  0, 2, eRD_Mixer1, 16
+  0, 16, eRD_ATX0
-}
-

trunk/libffado/src/libcontrol/CrossbarRouter.h

@@ -26 +26 @@
-
-#include "debugmodule/debugmodule.h"
+#include "ffadotypes.h"
-
-#include "Element.h"
@@ -31 +32 @@
-#include <vector>
-#include <string>
+#include <map>
-
-namespace Control {
@@ -47 +49 @@
-    virtual void show() = 0;
-
-
-
-
-
+
+
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-    virtual bool clearAllConnections() = 0;
-
-    virtual int getNbSources() = 0;
-    virtual int getNbDestinations() = 0;
-
-    // functions to access the entire routing map at once
-    // idea is that the row/col nodes that are 1 get a routing entry
-    virtual bool getConnectionMap(int *) = 0;
-    virtual bool setConnectionMap(int *) = 0;
-
-    // peak metering
-    virtual bool hasPeakMetering() = 0;
-
-
-
+
+
-
-protected:

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

@@ -240 +240 @@
-
-  <interface name="org.ffado.Control.Element.CrossbarRouter">
-      <method name="getSourceName">
-          <arg type="i" name="srcid" direction="in"/>
-          <arg type="s" name="sourcename" direction="out"/>
-      </method>
-      <method name="getDestinationName">
-          <arg type="i" name="dstid" direction="in"/>
-          <arg type="s" name="destinationname" direction="out"/>
-      </method>
-      <method name="getSourceIndex">
-          <arg type="s" name="sourcename" direction="in"/>
-          <arg type="i" name="srcid" direction="out"/>
-      </method>
-      <method name="getDestinationIndex">
-          <arg type="s" name="destinationname" direction="in"/>
-          <arg type="i" name="dstid" direction="out"/>
-      </method>
-      <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">
-          <arg type="as" name="destinationnames" direction="out"/>
-      </method>
+      <method name="getSourceForDestination">
+          <arg type="s" name="dstid" direction="in"/>
+          <arg type="s" name="srcid" direction="out"/>
+      </method>
-      <method name="getDestinationsForSource">
-
-
-
-
-
-
+
+
-      </method>
-      <method name="canConnect">
-i
-i
+s
+s
-          <arg type="b" name="canconnect" direction="out"/>
-      </method>
-      <method name="setConnectionState">
-i
-i
+s
+s
-          <arg type="b" name="state" direction="in"/>
-          <arg type="b" name="result" direction="out"/>
-      </method>
-      <method name="getConnectionState">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-          <arg type="b" name="state" direction="out"/>
-      </method>
@@ -311 +273 @@
-          <arg type="b" name="state" direction="out"/>
-      </method>
-      <method name="getNbSources">
-          <arg type="i" name="state" direction="out"/>
-      </method>
-      <method name="getNbDestinations">
-          <arg type="i" name="state" direction="out"/>
-      </method>
-      <method name="getConnectionMap">
-          <arg type="ai" name="map" direction="out"/>
-      </method>
-      <method name="setConnectionMap">
-          <arg type="ai" name="map" direction="in"/>
-          <arg type="i" name="state" direction="out"/>
-      </method>
-      <method name="hasPeakMetering">
-          <arg type="b" name="hasmetering" direction="out"/>
-      </method>
-      <method name="getPeakValue">
-
-
+
-          <arg type="d" name="value" direction="out"/>
-      </method>
-      <method name="getPeakValues">
-i
+s
-      </method>
-  </interface>

trunk/libffado/support/dbus/controlserver.cpp

@@ -868 +868 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-CrossbarRouter::getSourceIndex(const DBus::String &name)
-{
@@ -890 +878 @@
-{
-    return m_Slave.getDestinationIndex(name);
-
+*/
-
-std::vector< DBus::String >
@@ -904 +892 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-{
-    return m_Slave.getDestinationsForSource(idx);
-}
-
-Int32
-Int32
+String
+String
-{
-    return m_Slave.getSourceForDestination(idx);
@@ -929 +905 @@
-
-DBus::Bool
-Int32 &source, const DBus::Int32
+String &source, const DBus::String
-{
-    return m_Slave.canConnect(source, dest);
@@ -935 +911 @@
-
-DBus::Bool
-Int32 &source, const DBus::Int32
+String &source, const DBus::String
-{
-    return m_Slave.setConnectionState(source, dest, enable);
@@ -941 +917 @@
-
-DBus::Bool
-Int32 &source, const DBus::Int32
+String &source, const DBus::String
-{
-    return m_Slave.getConnectionState(source, dest);
@@ -947 +923 @@
-
-DBus::Bool
-CrossbarRouter::canConnectNamed(const DBus::String& source, const DBus::String& dest)
-{
-    return m_Slave.canConnect(source, dest);
-}
-
-DBus::Bool
-CrossbarRouter::setConnectionStateNamed(const DBus::String &source, const DBus::String &dest, const DBus::Bool &enable)
-{
-    return m_Slave.setConnectionState(source, dest, enable);
-}
-
-DBus::Bool
-CrossbarRouter::getConnectionStateNamed(const DBus::String &source, const DBus::String &dest)
-{
-    return m_Slave.getConnectionState(source, dest);
-}
-
-DBus::Bool
-CrossbarRouter::clearAllConnections()
-{
@@ -970 +928 @@
-}
-
-DBus::Int32
-CrossbarRouter::getNbSources()
-{
-    return m_Slave.getNbSources();
-}
-
-DBus::Int32
-CrossbarRouter::getNbDestinations()
-{
-    return m_Slave.getNbDestinations();
-}
-
-DBus::Bool
-CrossbarRouter::hasPeakMetering()
@@ -989 +935 @@
-
-DBus::Double
-Int32 &source, const DBus::Int32
-
-source, 
-
-int
+String
+
+
+
+DBus::String
-CrossbarRouter::getPeakValues()
-{
-//return std::vector< DBus::Struct<int, int
-
+return std::vector< DBus::Struct<DBus::String
+/*
-    Control::CrossbarRouter::PeakValues values = m_Slave.getPeakValues();
-    for ( unsigned int i=0; i<values.size(); ++i ) {
@@ -1005 +951 @@
-        out.push_back(tmp);
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-

trunk/libffado/support/dbus/controlserver.h

@@ -339 +339 @@
-                  Control::CrossbarRouter &slave );
-
-    DBus::String getSourceName(const DBus::Int32 &);
-    DBus::String getDestinationName(const DBus::Int32 &);
-    DBus::Int32 getSourceIndex(const DBus::String &);
-    DBus::Int32 getDestinationIndex(const DBus::String &);
-
-    std::vector< DBus::String > getSourceNames();
-    std::vector< DBus::String > getDestinationNames();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-    DBus::Bool  clearAllConnections();
-
-    DBus::Int32 getNbSources();
-    DBus::Int32 getNbDestinations();
-
-    DBus::Bool  hasPeakMetering();
-
-
-
-
-
-
+
+
-
-private:

trunk/libffado/support/mixer-qt4/ffado/widgets/crossbarrouter.py

@@ -80 +80 @@
-        self.layout.addWidget(self.lbl, 0, 0)
-
-
-
+#
+#
-
-        sources = self.interface.getSourceNames()
@@ -89 +89 @@
-        self.combo.addItem("Disconnected")
-        self.combo.addItems(sources)
-idx = self.interface.getDestinationIndex
-sourceidx = self.interface.getSourceForDestination(idx)
-if sourceidx > -1:
-    source = self.interface.getSourceName(sourceidx)
-sources.index(source)+1
+src = self.interface.getSourceForDestination
+if src != "":
+    self.combo.setCurrentIndex(self.combo.findText(src))
+else:
+0
-        self.connect(self.combo, QtCore.SIGNAL("activated(QString)"), self.comboCurrentChanged)
-
-
-    def peakValue(self, value):
-
+
+
-
-    def comboCurrentChanged(self, inname):
@@ -105 +106 @@
-            return
-        if self.lastin != "":
-Named
+
-
-        if inname != "Disconnected":
-Named
+
-                self.lastin = str(inname)
-            else:
@@ -124 +125 @@
-
-        self.settings = QtCore.QSettings(self)
-
-        log.info(self.interface.getDestinations())
-
-        destinations = self.interface.getDestinationNames()
@@ -152 +151 @@
-            btn = OutputSwitcher(self.interface, out, self)
-            self.layout.addWidget(btn, int(out.split(":")[-1]) + 1, self.outgroups.index(out.split(":")[0]))
-self.interface.getDestinationIndex(out)
+out
-
-        self.timer = QtCore.QTimer(self)

trunk/libffado/tests/test-dice-eap.cpp

@@ -295 +295 @@
-//                     }
-//                 }
-
-
-
-
-
-
-
-
-
-
-
-
-
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
-            }
-        }