[X2Go-Commits] [x2goclient] 126/280: pulsemanager.{cpp, h}: new member function fetch_pulseaudio_version () with first skeleton.

git-admin at x2go.org git-admin at x2go.org
Wed Jan 18 12:25:26 CET 2017


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

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

commit 9d28e79cbc59dde54c9a09319665cd34a6611281
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 219a691..3cd812d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -240,6 +240,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - 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.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
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