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

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

commit 18ac184f80dd3111caac676d29493b3448ac1823
Author: Mihai Moldovan <io...@ionic.de>
Date:   Thu Dec 31 02:12:59 2015 +0100

    pulsemanager.cpp: use record and playback member variables.
---
 debian/changelog     |    1 +
 src/pulsemanager.cpp |   22 +++++++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3fc0c2d..c046f30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -234,6 +234,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - pulsemanager.cpp: reorder member variables in initializer list.
     - pulsemanager.cpp: fix compile error in startup sound function.
     - pulsemanager.h: more moving around.
+    - pulsemanager.cpp: use record and playback member variables.
 
  -- X2Go Release Manager <git-ad...@x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index 63ebf11..25f8f50 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -366,13 +366,8 @@ bool PulseManager::find_port (bool search_esd) {
 bool PulseManager::generate_server_config () {
   QString config_file_name = pulse_dir_.absolutePath () + "/config.pa";
   QTemporaryFile config_tmp_file (pulse_dir_.absolutePath () + 
"/tmp/tmpconfig");
-  X2goSettings settings ("settings");
-  bool disable_input = false;
   bool ret = false;
 
-  disable_input = settings.setting ()->value ("soundnoinput",
-                                              (QVariant) false).toBool ();
-
   if (config_tmp_file.open ()) {
     QTextStream config_tmp_file_stream (&config_tmp_file);
 
@@ -395,9 +390,22 @@ bool PulseManager::generate_server_config () {
 // FIXME Linux
 #endif // defined (Q_OS_DARWIN)
 
-    if (disable_input)
-      config_tmp_file_stream << " record=0";
+    config_tmp_file_stream << " record=";
+    if (!record_) {
+      config_tmp_file_stream << "0";
+    }
+    else {
+      config_tmp_file_stream << "1";
+    }
+    config_tmp_file_stream << endl;
 
+    config_tmp_file_stream << " playback=";
+    if (!playback_) {
+      config_tmp_file_stream << "0";
+    }
+    else {
+      config_tmp_file_stream << "1";
+    }
     config_tmp_file_stream << endl;
 
     QFile config_file (config_file_name);

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

Reply via email to