Changeset 1668

Timestamp:

09/18/09 14:00:59 (14 years ago)

Author:

arnonym

Message:

• Use logging for the debug-output.
  
• Add the ability to completely disconnect outputs from their input. This removes (should remove?) routes from the routing table.
  

Files:

• trunk/libffado/support/mixer-qt4/ffado-mixer.in (modified) (3 diffs)
• trunk/libffado/support/mixer-qt4/ffado/widgets/crossbarrouter.py (modified) (7 diffs)
• trunk/libffado/support/mixer-qt4/ffado/widgets/matrixmixer.py (modified) (3 diffs)

trunk/libffado/support/mixer-qt4/ffado-mixer.in

@@ -150 +150 @@
-        debug_level = logging.INFO
-
+    # main loggers:
-    logging.getLogger('main').setLevel(debug_level)
-    logging.getLogger('dbus').setLevel(debug_level)
@@ -156 +157 @@
-    logging.getLogger('configparser').setLevel(logging.INFO)
-
-
+
+
+
-
+    # mixers:
-    logging.getLogger('audiofire').setLevel(debug_level)
-    logging.getLogger('bridgeco').setLevel(debug_level)
@@ -170 +174 @@
-    logging.getLogger('saffire').setLevel(debug_level)
-    logging.getLogger('saffirepro').setLevel(debug_level)
+
+    logging.getLogger('global').setLevel(debug_level)
-
-    log = logging.getLogger('main')

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

@@ -21 +21 @@
-from PyQt4 import QtGui, QtCore
-import dbus
+
+import logging
+log = logging.getLogger("crossbarrouter")
-
-class VuMeter(QtGui.QFrame):
@@ -39 +42 @@
-
-    def setInput(self, input):
-print "VuMeter.setInput() %i->%i" % (self.output, input
+log.debug("VuMeter.setInput() %i->%i" % (self.output, input)
-        self.input = input
-
@@ -91 +94 @@
-                self.ingroups[tmp] = 0
-            self.ingroups[tmp] += 1
-print "Detected ingroups: %s" % str(self.ingroups
+log.debug("Detected ingroups: %s" % str(self.ingroups)
-
-        self.menu = QtGui.QMenu(self)
-        self.btn.setMenu(self.menu)
+
+        action = QtGui.QAction("Disconnect", self)
+        action.setCheckable(True)
+        self.connect(action, QtCore.SIGNAL("toggled(bool)"), self.disconnectRoute)
+        self.exclusiveGroup.addAction(action)
+        self.menu.addAction(action)
-
-        for group in self.ingroups:
@@ -103 +112 @@
-        self.vu.updateLevel(value)
-
+    def disconnectRoute(self, checked):
+        log.debug("disconnectRoute( %s ) sender: %s" % (str(checked),str(self.sender())))
+        dest = self.interface.getDestinationIndex(self.outname)
+        src = self.interface.getSourceName( self.interface.getSourceForDestination( dest ) )
+        #log.debug(" source=%s destination=%s  possible? %s" % (src, self.outname, self.interface.canConnectNamed(src, self.outname)))
+        if not self.interface.setConnectionStateNamed(src, self.outname, False):
+            log.debug(" Changing the connection table was successfull.")
+        else:
+            log.warning(" Failed to change the connection table!")
+        self.peakValue(0)
-
-class InGroupMenu(QtGui.QMenu):
@@ -121 +140 @@
-    def showMenu(self):
-        #print "About to show the menu"
-
++1
-            # Do a lazy init of the sub-items.
-            for i in range(self.insize):
@@ -140 +159 @@
-    def connectionSwitched(self, checked):
-        if self.lock: return
-print "connectionSwitched( %s ) sender: %s" % (str(checked),str(self.sender(
+#log.debug("connectionSwitched( %s ) sender: %s" % (str(checked),str(self.sender()
-        inname = str(self.sender().text())
-
-
+
+
+
-
-
@@ -153 +173 @@
-        self.interface = dbus.Interface(self.dev, dbus_interface="org.ffado.Control.Element.CrossbarRouter")
-
-print self.interface.getDestinations(
+log.info(self.interface.getDestinations()
-
-        destinations = self.interface.getDestinationNames()

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

@@ -21 +21 @@
-from PyQt4 import QtGui, QtCore, Qt
-import dbus
+
+import logging
+log = logging.getLogger("matrixmixer")
-
-class MixerNode(QtGui.QFrame):
@@ -181 +184 @@
-        self.setPalette(palette)
-
-
-
+
+
+
-
-        layout = QtGui.QGridLayout(self)
@@ -270 +274 @@
-
-    def valueChanged(self, n):
-#print "MatrixNode.valueChanged( %s )" % str(n
+log.debug("MatrixNode.valueChanged( %s )" % str(n)
-        for tmp in n:
-            self.interface.setValue(tmp[1], tmp[0], tmp[2])