[X2Go-Commits] [x2goclient] 143/173: src/pulsemanager.cpp: replace hardcoded modules paths with dynamic ones depending on the detected PA version.
git-admin at x2go.org
git-admin at x2go.org
Wed Jun 1 22:25:39 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 32d40405ee204494132b096c60195418deb4a771
Author: Mihai Moldovan <ionic at ionic.de>
Date: Wed Apr 27 01:17:09 2016 +0200
src/pulsemanager.cpp: replace hardcoded modules paths with dynamic ones depending on the detected PA version.
---
debian/changelog | 2 ++
src/pulsemanager.cpp | 13 ++++++++++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 86762dc..0f2f50e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -264,6 +264,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
- pulsemanager.cpp: remove config.pa while doing post-exit cleanups.
- src/pulsemanager.{cpp,h}: add get_pulse_dir () for fetching the
(OS-dependent) PulseAudio config and cookie directory.
+ - src/pulsemanager.cpp: replace hardcoded modules paths with dynamic ones
+ depending on the detected PA version.
[ Mike DePaulo ]
* New upstream release (4.0.5.2):
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 4ac7ba5..9f57525 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -152,7 +152,11 @@ void PulseManager::start_osx () {
<< "-F" << pulse_dir_.absolutePath () + "/config.pa"
<< "-p"
<< QDir (app_dir_
- + "/../Frameworks/pulse-2.0/modules").absolutePath ()
+ + "/../Frameworks/pulse-"
+ + QString::number (pulse_version_major_)
+ + "."
+ + QString::number (pulse_version_minor_)
+ + "/modules").absolutePath ()
<< "--high-priority";
#ifdef DEBUG
server_args_ << "--log-level=debug";
@@ -170,8 +174,11 @@ void PulseManager::start_win () {
server_args_ << "--exit-idle-time=-1" << "-n"
<< "-F" << QDir::toNativeSeparators (QDir (pulse_dir_.absolutePath ()
+ "/config.pa").absolutePath ())
- << "-p" << QDir::toNativeSeparators (QDir (app_dir_ + "/pulse/lib/pulse-1.1/"
- + "modules/").absolutePath ());
+ << "-p" << QDir::toNativeSeparators (QDir (app_dir_ + "/pulse/lib/pulse-"
+ + QString::number (pulse_version_major_)
+ + "."
+ + QString::number (pulse_version_minor_)
+ + "/modules/").absolutePath ());
#ifdef DEBUG
server_args_ << "--log-level=debug";
#endif // defined (DEBUG)
--
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