Merge branch 'master' of github.com:falkTX/Cadence into pulseaudio_channels

Makefile

@@ -159,12 +159,12 @@ install:
 	install -m 644 resources/scalable/claudia-launcher.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/
 
 	# Install main code
-	install -m 755 src/*.py $(DESTDIR)$(PREFIX)/share/cadence/src/
+	install -m 644 src/*.py $(DESTDIR)$(PREFIX)/share/cadence/src/
 
 	# Install addtional stuff for Cadence
 	install -m 644 data/pulse2jack/*     $(DESTDIR)$(PREFIX)/share/cadence/pulse2jack/
 	install -m 644 data/pulse2loopback/* $(DESTDIR)$(PREFIX)/share/cadence/pulse2loopback/
-	install -m 755 data/61cadence-session-inject $(X11_RC_DIR)
+	install -m 755 data/61-cadence-session-inject.sh $(X11_RC_DIR)
 
 	# Install addtional stuff for Claudia
 	cp -r data/icons/*     $(DESTDIR)$(PREFIX)/share/cadence/icons/
@@ -184,10 +184,11 @@ install:
 		$(DESTDIR)$(PREFIX)/bin/catia \
 		$(DESTDIR)$(PREFIX)/bin/claudia \
 		$(DESTDIR)$(PREFIX)/bin/claudia-launcher \
-		$(X11_RC_DIR)/61cadence-session-inject
+		$(X11_RC_DIR)/61-cadence-session-inject.sh
 
-	# Delete old files
+	# Delete old scripts
 	rm -f $(X11_RC_DIR)/21cadence-session-inject
+	rm -f $(X11_RC_DIR)/61cadence-session-inject
 	rm -f $(X11_RC_DIR)/70cadence-plugin-paths
 	rm -f $(X11_RC_DIR)/99cadence-session-start
 
@@ -214,10 +215,11 @@ uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/claudia.svg
 	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/claudia-launcher.svg
 	rm -f $(DESTDIR)/etc/xdg/autostart/cadence-session-start.desktop
-	rm -f $(X11_RC_DIR)/61cadence-session-inject
+	rm -f $(X11_RC_DIR)/61-cadence-session-inject.sh
 	rm -rf $(DESTDIR)$(PREFIX)/share/cadence/
 
-	# Old stuff
+	# Delete old scripts
 	rm -f $(X11_RC_DIR)/21cadence-session-inject
+	rm -f $(X11_RC_DIR)/61cadence-session-inject
 	rm -f $(X11_RC_DIR)/70cadence-plugin-paths
 	rm -f $(X11_RC_DIR)/99cadence-session-start

data/61cadence-session-inject → data/61-cadence-session-inject.sh

@@ -1,3 +1,5 @@
+#!/bin/sh
+
 # Cadence Session Startup Injection
 # Set plugin paths and start JACK (or not) according to user settings
 

data/cadence-session-start

@@ -9,7 +9,7 @@ fi
 INSTALL_PREFIX="X-PREFIX-X"
 
 if [ "$1"x == "--system-start-by-x11-startup"x ]; then
-  # called via $STARTUP in 21cadence-session-inject
+  # called via $STARTUP in 61-cadence-session-inject.sh
   $PYTHON $INSTALL_PREFIX/share/cadence/src/cadence_session_start.py --system-start &
   shift
   if [ "$1"x != ""x ]; then

src/cadence.py

@@ -52,10 +52,15 @@ from subprocess import getoutput
 
 try:
     import dbus
-    from dbus.mainloop.pyqt5 import DBusQtMainLoop
+    from dbus.mainloop.pyqt5 import DBusQtMainLoop as DBusMainLoop
     haveDBus = True
 except:
-    haveDBus = False
+    try:
+        # Try falling back to GMainLoop
+        from dbus.mainloop.glib import DBusGMainLoop as DBusMainLoop
+        haveDBus = True
+    except:
+        haveDBus = False
 
 # ------------------------------------------------------------------------------------------------------------
 # Check for PulseAudio and Wine
@@ -113,8 +118,6 @@ XDG_APPLICATIONS_PATH = [
     "/usr/local/share/applications"
 ]
 
-WINEASIO_PREFIX = "HKEY_CURRENT_USER\Software\Wine\WineASIO"
-
 # ---------------------------------------------------------------------
 class PulseAudioJackBridgeValues(object):
     clientIdCapture    = -1
@@ -1550,16 +1553,14 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW):
         self.label_app_comment.setText(comment)
 
     def updateSystrayTooltip(self):
-        systrayText  = "Cadence<br/>"
-        systrayText += "<font size=\"-1\">"
-        systrayText += "<b>%s:</b>&nbsp;%s<br/>" % (self.tr("JACK Status"), self.label_jack_status.text())
-        systrayText += "<b>%s:</b>&nbsp;%s<br/>" % (self.tr("Realtime"), self.label_jack_realtime.text())
-        systrayText += "<b>%s:</b>&nbsp;%s<br/>" % (self.tr("DSP Load"), self.label_jack_dsp.text())
-        systrayText += "<b>%s:</b>&nbsp;%s<br/>" % (self.tr("Xruns"), self.label_jack_xruns.text())
-        systrayText += "<b>%s:</b>&nbsp;%s<br/>" % (self.tr("Buffer Size"), self.label_jack_bfsize.text())
-        systrayText += "<b>%s:</b>&nbsp;%s<br/>" % (self.tr("Sample Rate"), self.label_jack_srate.text())
-        systrayText += "<b>%s:</b>&nbsp;%s" % (self.tr("Block Latency"), self.label_jack_latency.text())
-        systrayText += "</font><font size=\"-2\"><br/></font>"
+        systrayText  = "Cadence\n"
+        systrayText += "%s: %s\n" % (self.tr("JACK Status"), self.label_jack_status.text())
+        systrayText += "%s: %s\n" % (self.tr("Realtime"), self.label_jack_realtime.text())
+        systrayText += "%s: %s\n" % (self.tr("DSP Load"), self.label_jack_dsp.text())
+        systrayText += "%s: %s\n" % (self.tr("Xruns"), self.label_jack_xruns.text())
+        systrayText += "%s: %s\n" % (self.tr("Buffer Size"), self.label_jack_bfsize.text())
+        systrayText += "%s: %s\n" % (self.tr("Sample Rate"), self.label_jack_srate.text())
+        systrayText += "%s: %s" % (self.tr("Block Latency"), self.label_jack_latency.text())
 
         self.systray.setToolTip(systrayText)
 
@@ -2420,7 +2421,7 @@ if __name__ == '__main__':
     app.setWindowIcon(QIcon(":/scalable/cadence.svg"))
 
     if haveDBus:
-        gDBus.loop = DBusQtMainLoop(set_as_default=True)
+        gDBus.loop = DBusMainLoop(set_as_default=True)
         gDBus.bus  = dbus.SessionBus(mainloop=gDBus.loop)
 
     initSystemChecks()