[X2Go-Commits] [x2goclient] 113/138: pulsemanager.cpp: make generate_server_config () Windows-compatible.
git-admin at x2go.org
git-admin at x2go.org
Mon Jan 18 22:48:54 CET 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 7f32cc16849ff89a31ad4b269f02622d17df152a
Author: Mihai Moldovan <ionic at 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 633dd76..0b2afc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -210,6 +210,7 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
- 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.
* debian/control:
- Change apache2-dev | libc6-dev build dependency back to apache2-dev
only. Otherwise, apache2-dev is not installed at all, even though
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
More information about the x2go-commits
mailing list