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

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

commit 59da29cf13722071f2a6aa2bcf955c7a55c1e05b
Author: Mihai Moldovan <io...@ionic.de>
Date:   Fri Oct 30 03:47:37 2015 +0100

    pulsemanager.cpp: make startup sound playing via slot_play_startup_sound () 
Windows-compatible.
---
 debian/changelog     |    2 ++
 src/pulsemanager.cpp |   17 ++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a1a873e..307c8a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -198,6 +198,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - pulsemanager.cpp: make generate_server_config () Windows-compatible.
     - pulsemanager.cpp: make generate_client_config () Windows-compatible.
     - pulsemanager.cpp: only play startup sound if DEBUG macro is defined.
+    - pulsemanager.cpp: make startup sound playing via
+      slot_play_startup_sound () Windows-compatible.
 
  -- X2Go Release Manager <git-ad...@x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 421e54b..512b027 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -294,11 +294,22 @@ void PulseManager::create_client_dir () {
 void PulseManager::slot_play_startup_sound () {
 #ifdef DEBUG
   QProcess play_file (0);
+  QString play_file_binary = QString (app_dir_);
+  QString play_file_file = play_file_binary;
 
-  play_file.setWorkingDirectory (pulse_server_->workingDirectory ());
+#ifdef Q_OS_DARWIN
+  play_file_binary += "/../exe/paplay";
+  play_file_file += "/../Resources/startup.wav";
+#elif defined (Q_OS_WIN)
+  playFileBinary += "/pulse/paplay.exe";
+  playFileFile += "/startup.wav";
+#endif // defined (Q_OS_DARWIN)
+
+  QStringList args;
+  args << play_file_file;
+  play_file.setWorkingDirectory (server_working_dir_);
   play_file.setProcessEnvironment (env_);
-  play_file.start (app_dir_ + "/../exe/paplay "
-                   + app_dir_ + "/../Resources/startup.wav");
+  play_file.start (play_file_binary, args);
 
   if (play_file.waitForStarted ())
     play_file.waitForFinished ();

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

Reply via email to