[X2Go-Commits] [x2goclient] 137/138: pulsemanager.cpp: use record and playback member variables.
git-admin at x2go.org
git-admin at x2go.org
Thu Mar 31 20:58:45 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 39fa4bc4143ada706a9f4b5529c8c3250a8293d7
Author: Mihai Moldovan <ionic at 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 5545361..95d8f3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -235,6 +235,7 @@ x2goclient (4.0.5.2-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.
[ Mike DePaulo ]
* New upstream release (4.0.5.2):
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
More information about the x2go-commits
mailing list