[X2Go-Commits] [x2goclient] 111/197: pulsemanager.{cpp, h}: implement start_win () as part of Windows functionality.
git-admin at x2go.org
git-admin at x2go.org
Thu Jun 30 23:53:09 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 69bda964127130cc03504fdae4a25ce7338bafdf
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Oct 30 03:39:43 2015 +0100
pulsemanager.{cpp,h}: implement start_win () as part of Windows functionality.
---
debian/changelog | 2 ++
src/pulsemanager.cpp | 21 +++++++++++++++++++++
src/pulsemanager.h | 1 -
3 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index a89c49f..45f3c25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -219,6 +219,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
- pulsemanager.{cpp,h}: add new function start_generic () to split off
common functionality.
- pulsemanager.cpp: let start_osx () use start_generic ().
+ - pulsemanager.{cpp,h}: implement start_win () as part of Windows
+ functionality.
* debian/control:
- Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
- Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 1041797..a4419db 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -121,6 +121,27 @@ void PulseManager::start_osx () {
}
}
+void PulseManager::start_win () {
+ server_args_ = QStringList ();
+ server_args_ << "--exit-idle-time=-1" << "-n"
+ << "-F" << QDir::toNativeSeparators (QDir (pulse_dir_.absolutePath ()
+ + "/config.pa").absolutePath ())
+ << "-p" << QDir::toNativeSeparators (QDir (app_dir_ + "/pulse/lib/pulse-1.1/"
+ + "modules/").absolutePath ());
+#ifdef DEBUG
+ server_args_ << "--log-level=debug";
+#endif // defined (DEBUG)
+
+ server_working_dir_ = QString (app_dir_ + "/pulse/");
+ server_binary_ = QString (app_dir_ + "/pulse/pulseaudio.exe");
+
+ if (generateServerConfig () && generateClientConfig ()) {
+ create_client_dir ();
+
+ start_generic ();
+ }
+}
+
void PulseManager::find_port (bool search_esd) {
QTcpSocket tcpSocket (0);
bool free = false;
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index be94414..8463fb5 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -58,7 +58,6 @@ class PulseManager: public QObject {
private:
PulseManager (const PulseManager &other);
void start_osx ();
- // FIXME
void start_win ();
// FIXME
void start_linux ();
--
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