[X2Go-Commits] [x2goclient] 05/06: src/pulsemanager.cpp: fix startup sound playback when using the system-PA version.
git-admin at x2go.org
git-admin at x2go.org
Wed Jun 22 04:19:53 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 8e74448ad9b8b6bc962096c647792c375231934d
Author: Mihai Moldovan <ionic at ionic.de>
Date: Wed Jun 22 04:15:03 2016 +0200
src/pulsemanager.cpp: fix startup sound playback when using the system-PA version.
---
debian/changelog | 2 ++
src/pulsemanager.cpp | 14 ++++++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 43c3fb6..2d2aa17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -350,6 +350,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
- src/x2goutils.h: fix compile error due to typo.
- src/pulsemanager.cpp: fix compile error on Windows.
- src/pulsemanager.cpp: fix startup when using the system-PA version.
+ - src/pulsemanager.cpp: fix startup sound playback when using the
+ system-PA version.
* debian/control:
- Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 9582027..e837a97 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -702,14 +702,20 @@ void PulseManager::create_client_dir () {
void PulseManager::slot_play_startup_sound () {
if (debug_) {
QProcess play_file (0);
- QString play_file_binary (app_dir_);
- QString play_file_file (play_file_binary);
+
+ /*
+ * Assume paplay is located at the same place as
+ * the pulseaudio binary.
+ */
+ QString play_file_binary (server_working_dir_);
+
+ QString play_file_file (app_dir_);
#ifdef Q_OS_DARWIN
- play_file_binary += "/../exe/paplay";
+ play_file_binary += "/paplay";
play_file_file += "/../Resources/startup.wav";
#elif defined (Q_OS_WIN)
- play_file_binary += "/pulse/paplay.exe";
+ play_file_binary += "/paplay.exe";
play_file_file += "/startup.wav";
#else
/* FIXME: implement Linux section. */
--
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