[X2Go-Commits] [x2goclient] 108/142: pulsemanager.cpp: make start () wrap the "real" OS-specific start functions.
git-admin at x2go.org
git-admin at x2go.org
Thu Jan 14 05:10:37 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 36ac2faba2514ea3ee41f5269ab242c60cbc28bc
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Oct 30 03:03:44 2015 +0100
pulsemanager.cpp: make start () wrap the "real" OS-specific start functions.
---
debian/changelog | 2 ++
src/pulsemanager.cpp | 20 +++++++++-----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fdbc596..eb53765 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -196,6 +196,8 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
- pulsemanager.{cpp,h}: fixup preprocessor usage.
- pulsemanager.{cpp,h}: add server_args_, server_binary_ and
server_working_dir_ class variables.
+ - pulsemanager.cpp: make start () wrap the "real" OS-specific start
+ functions.
* 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 a46ab11..f094019 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -59,16 +59,6 @@ void PulseManager::start () {
pulse_server_ = new QProcess (0);
state_ = QProcess::Starting;
-#ifdef Q_OS_DARWIN
- start_osx ();
-#elif defined (Q_OS_WIN)
- start_win ();
-#elif defined (Q_OS_LINUX)
- start_linux ();
-#endif // defined (Q_OS_DARWIN)
-}
-
-void PulseManager::start_osx () {
// Search for a free Pulse and EsounD port.
// Note that there is no way we could find
// an esd port, if the pulse port detection
@@ -76,9 +66,17 @@ void PulseManager::start_osx () {
// optimize this statement and save some
// cycles.
if ((findPort (false)) && (findPort (true))) {
- find_port ();
+#ifdef Q_OS_DARWIN
+ start_osx ();
+#elif defined (Q_OS_WIN)
+ start_win ();
+#elif defined (Q_OS_LINUX)
+ start_linux ();
+#endif // defined (Q_OS_DARWIN)
}
+}
+void PulseManager::start_osx () {
if (generate_server_config () && generate_client_config ()) {
cleanup_client_dir ();
--
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