Merge branch 'master' into pulseaudio_channels

For Librazik3 package

INSTALL.md

@@ -23,7 +23,7 @@ The required build dependencies are: <i>(devel packages of these)</i>
  - PyQt5 (Py3 version)
 
 On Debian and Ubuntu, use these commands to install all build dependencies: <br/>
-`$ sudo apt-get install libjack-jackd2-dev qtbase5-dev, qtbase5-dev-tools` <br/>
+`$ sudo apt-get install libjack-jackd2-dev qtbase5-dev qtbase5-dev-tools` <br/>
 `$ sudo apt-get install python3-pyqt5 python3-pyqt5.qtsvg pyqt5-dev-tools`
 
 To run all the apps/tools, you'll additionally need:
@@ -47,7 +47,7 @@ After install, the app/tools will still work on distributions with python2 as de
 
 ===== RUNTIME DEPENDENCIES =====
 ----------------------------------
-All tools require Python3 and Qt4, some of them work on Windows and Mac. <br/>
+All tools require Python3 and Qt5 (PyQt5), some of them work on Windows and Mac. <br/>
 Here's the required run-time dependencies of each of the main tools:
 
 ### Cadence

c++/widgets/pixmapdial.cpp

@@ -22,6 +22,7 @@
 #include <QtCore/QTimer>
 #include <QtGui/QPainter>
 #include <QtGui/QPaintEvent>
+#include <QtGui/QPainterPath>
 
 PixmapDial::PixmapDial(QWidget* parent)
     : QDial(parent),

src/cadence_session_start.py

@@ -234,9 +234,9 @@ if __name__ == '__main__':
         elif arg == "--reset":
             forceReset()
         elif arg in ("--system-start", "--system-start-desktop"):
-            sys.exit(startSession(True, arg == "--system-start-desktop"))
+            sys.exit(0 if startSession(True, arg == "--system-start-desktop") else 1)
         elif arg in ("-s", "--s", "-start", "--start"):
-            sys.exit(startSession(False, False))
+            sys.exit(0 if startSession(False, False) else 1)
         elif arg in ("-h", "--h", "-help", "--help"):
             printHelp(cmd)
         elif arg in ("-v", "--v", "-version", "--version"):

src/catia.py

@@ -1009,7 +1009,7 @@ class CatiaMainW(AbstractCanvasJackClass):
         if gDBus.jack and not gDBus.jack.IsStarted():
             self.ui.act_tools_a2j_start.setEnabled(False)
             self.ui.act_tools_a2j_stop.setEnabled(False)
-            self.ui.act_tools_a2j_export_hw.setEnabled(gDBus.a2j and not gDBus.a2j.is_started())
+            self.ui.act_tools_a2j_export_hw.setEnabled(bool(gDBus.a2j) and not gDBus.a2j.is_started())
         else:
             self.ui.act_tools_a2j_start.setEnabled(not started)
             self.ui.act_tools_a2j_stop.setEnabled(started)

src/claudia.py

@@ -1515,7 +1515,7 @@ class ClaudiaMainW(AbstractCanvasJackClass):
         if not gDBus.jack.IsStarted():
             self.ui.act_tools_a2j_start.setEnabled(False)
             self.ui.act_tools_a2j_stop.setEnabled(False)
-            self.ui.act_tools_a2j_export_hw.setEnabled(gDBus.a2j and not gDBus.a2j.is_started())
+            self.ui.act_tools_a2j_export_hw.setEnabled(bool(gDBus.a2j) and not gDBus.a2j.is_started())
         else:
             self.ui.act_tools_a2j_start.setEnabled(not started)
             self.ui.act_tools_a2j_stop.setEnabled(started)