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

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

commit 96a230b5eb7b71e0840004de35c69c8fb0c77d5e
Author: Mihai Moldovan <io...@ionic.de>
Date:   Fri Oct 30 03:44:07 2015 +0100

    pulsemanager.cpp: make generate_server_config () Windows-compatible.
---
 debian/changelog     |    1 +
 src/pulsemanager.cpp |    8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index afecb17..0946bde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -191,6 +191,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - pulsemanager.{cpp,h}: implement start_win () as part of Windows
       functionality.
     - pulsemanager.cpp: also load module-esound-protocol-tcp module.
+    - pulsemanager.cpp: make generate_server_config () 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 d705486..3704000 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -198,14 +198,22 @@ bool PulseManager::generate_server_config () {
 
     config_tmp_file_stream << "load-module module-native-protocol-tcp port="
                             + QString::number (pulse_port_) << endl;
+
+#ifdef Q_OS_UNIX
     config_tmp_file_stream << "load-module module-native-protocol-unix" << 
endl;
     config_tmp_file_stream << "load-module module-esound-protocol-unix" << 
endl;
+#endif // defined(Q_OS_UNIX)
 
     config_tmp_file_stream << "load-module module-esound-protocol-tcp port="
                            << QString::number (esd_port_)
                            << endl;
 
+#ifdef Q_OS_DARWIN
     config_tmp_file_stream << "load-module module-coreaudio-detect";
+#elif defined (Q_OS_WIN)
+    config_tmp_file_stream << "load-module module-waveout";
+// FIXME Linux
+#endif // defined (Q_OS_DARWIN)
 
     if (disable_input)
       config_tmp_file_stream << " record=0";

--
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