Changeset 1707

Timestamp:

11/14/09 13:17:22 (13 years ago)

Author:

arnonym

Message:

Use QSettings to store the state of the VU-switch.

And do some playing with deleting panels when the devices are removed from the bus. Otherwise the timer checking the VU-values will run forever and complain about missing dbus-objects.

Files:

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

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

@@ -97 +97 @@
-        QTimer.singleShot( 1, self.connectToDBUS )
-
+    def __del__(self):
+        log.info("__del__")
+        del self.manager
+        #delattr(self, "manager")
+        log.info("__del__ finished")
+
+    def closeEvent(self, event):
+        log.info("closeEvent()")
+        self.manager.deleteLater()
+        event.accept()
+
-    def connectToDBUS(self):
-        try:
@@ -118 +129 @@
-    def setupDeviceManager(self):
-        devmgr = DeviceManagerInterface(FFADO_DBUS_SERVER, FFADO_DBUS_BASEPATH)
-
+#
-        self.manager.setManager(devmgr)
-        self.setCentralWidget(self.manager)
@@ -182 +193 @@
-    app.setWindowIcon( QIcon( SHAREDIR + "/icons/hi64-apps-ffado.png" ) )
-
+    app.setOrganizationName("FFADO")
+    app.setOrganizationDomain("ffado.org")
+    app.setApplicationName("ffado-mixer")
-
-    mainwindow = FFADOWindow(None)

trunk/libffado/support/mixer-qt4/ffado/panelmanager.py

@@ -108 +108 @@
-        if devmgr is not None:
-            self.setManager(devmgr)
+
+    def __del__(self):
+        print("PanelManager.__del__()")
+        self.polltimer.stop()
-
-    def setManager(self,devmgr):
@@ -243 +247 @@
-        # update the widget
-        for guid in to_remove:
+            print "Removing widget for device" + guid
-            w = self.panels[guid]
-            del self.panels[guid] # remove from the list
-            idx = self.tabs.indexOf(w)
-            self.tabs.removeTab(idx)
-del w # GC might also take care of that
+w.deleteLater()
-
-        for guid in to_add:

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

@@ -170 +170 @@
-        self.interface = dbus.Interface(self.dev, dbus_interface="org.ffado.Control.Element.CrossbarRouter")
-
+        self.settings = QtCore.QSettings(self)
+
-        log.info(self.interface.getDestinations())
-
@@ -185 +187 @@
-        self.biglayout.addLayout(self.toplayout)
-
-
-
-
-
-
+
+
+
+
-
-        self.layout = QtGui.QGridLayout()
@@ -203 +204 @@
-        self.timer.setInterval(200)
-        self.connect(self.timer, QtCore.SIGNAL("timeout()"), self.updateLevels)
-
+
+
+
+
+
+
-
-    def runVu(self, run=True):
+        #log.debug("CrossbarRouter.runVu( %i )" % run)
-        if run:
-            self.timer.start()