[X2Go-Commits] [x2goclient] 127/139: pulsemanager.{cpp, h}: new member function fetch_pulseaudio_version () with first skeleton.
git-admin at x2go.org
git-admin at x2go.org
Wed Jan 13 18:42:31 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 b1e1e49e960bcd5e1a0da78011534f458835e9a9
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon Nov 30 04:58:52 2015 +0100
pulsemanager.{cpp,h}: new member function fetch_pulseaudio_version () with first skeleton.
Call it in the constructor.
---
debian/changelog | 2 ++
src/pulsemanager.cpp | 9 +++++++++
src/pulsemanager.h | 1 +
3 files changed, 12 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 0bd38d7..45f397e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -222,6 +222,8 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
- pulsemanager.cpp: generate platform-dependent values for member
variables server_working_dir_ and server_binary_ in constructor. We need
them right away.
+ - pulsemanager.{cpp,h}: new member function fetch_pulseaudio_version ()
+ with first skeleton. Call it in the constructor.
* 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 bb0bf73..ade1ec6 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -86,6 +86,8 @@ PulseManager::PulseManager () : pulse_X2Go_ ("/.x2go/pulse"),
free (buf);
buf = ptr = NULL;
#endif // defined (Q_OS_DARWIN)
+
+ fetch_pulseaudio_version ();
}
PulseManager::~PulseManager () {
@@ -180,6 +182,13 @@ void PulseManager::start_linux () {
/* Do nothing - assumed to be already running. */
}
+void PulseManager::fetch_pulseaudio_version () {
+ QStringList args = "--version";
+ QProcess tmp_server (this);
+
+ tmp_server->setWorkingDirectory (server_working_dir_);
+}
+
bool PulseManager::find_port (bool search_esd) {
QTcpSocket tcpSocket (0);
bool free = false;
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index e1a088a..fb21992 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -58,6 +58,7 @@ class PulseManager: public QObject {
private:
PulseManager (const PulseManager &other);
+ void fetch_pulseaudio_version ();
void start_osx ();
void start_win ();
// FIXME
--
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