[X2Go-Commits] [x2goclient] 145/197: src/pulsemanager.cpp: backport fix for 526.

git-admin at x2go.org git-admin at x2go.org
Thu Jun 30 23:53:22 CEST 2016


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 666d68c51fbe8a865a6d570824b429ef394157ca
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Apr 27 01:47:43 2016 +0200

    src/pulsemanager.cpp: backport fix for 526.
---
 debian/changelog     |    1 +
 src/pulsemanager.cpp |   19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 63c5427..502bf1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -273,6 +273,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
     - src/pulsemanager.cpp: replace hardcoded modules paths with dynamic ones
       depending on the detected PA version.
     - src/pulsemanager.cpp: add "FIXME" debug logging (and cleanup.)
+    - src/pulsemanager.cpp: backport fix for 526.
   * debian/control:
     - Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
     - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 03e321f..c8fc7cd 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -19,6 +19,7 @@
 
 #include <unistd.h>
 #include <stdlib.h>
+#include <QSysInfo>
 
 #include "pulsemanager.h"
 
@@ -188,6 +189,24 @@ void PulseManager::start_win () {
                << "--log-target=file:" + pulse_dir_.absolutePath () + "\\pulse.log";
 #endif // defined (DEBUG)
 
+  /*
+   * Fix for x2goclient bug #526.
+   * Works around PulseAudio bug #80772.
+   * Tested with PulseAudio 5.0.
+   * This argument will not cause PulseAudio 0.9.6 or 1.1 (the legacy versions)
+   * to fail to launch.
+   * However, 0.9.6 defaults to normal priority anyway,
+   * and 1.1 ignores it for some reason.
+   * So yes, the fact that 1.1 ignores it would be a bug in x2goclient if we
+   * ever ship 1.1 again.
+   */
+  if ((QSysInfo::WindowsVersion == QSysInfo::WV_XP) || (QSysInfo::WindowsVersion == QSysInfo::WV_2003)) {
+    x2goDebug << "Windows XP or Server 2003 (R2) detected."
+              << "Setting PulseAudio to \"normal\" CPU priority.";
+
+    server_args_ << "--high-priority=no";
+  }
+
   if (generate_server_config () && generate_client_config ()) {
     create_client_dir ();
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list