[X2Go-Commits] [x2goclient] 163/179: src/onmainwindow.cpp: port to new debugging feature of PulseManager.
git-admin at x2go.org
git-admin at x2go.org
Mon Jun 20 23:56: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 270aea0ffe4b415ac25c50b8e1b39d0da3f3294d
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sat May 7 03:10:34 2016 +0200
src/onmainwindow.cpp: port to new debugging feature of PulseManager.
---
debian/changelog | 1 +
src/onmainwindow.cpp | 9 ++++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index f11daee..40c27e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -299,6 +299,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
we'll get compile failures on non-Windows platforms.
- src/pulsemanager.{cpp,h}: add debugging setter and private variable.
- src/pulsemanager.{cpp,h}: port to new debugging feature.
+ - src/onmainwindow.cpp: port to new debugging feature of PulseManager.
* debian/control:
- Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 64c08f9..8a0b35d 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -2129,7 +2129,12 @@ void ONMainWindow::slotConfig()
(QVariant) false).toBool ();
if (oldDisableInput != newDisableInput) {
- pulseManager->set_record (!newDisableInput);
+ bool ret = pulseManager->set_record (!newDisableInput);
+
+ if (!ret) {
+ x2goDebug << "Failed to change recording status of PulseManager. PulseAudio not started?" << endl;
+ }
+
pulseManager->restart ();
}
#endif /* defined (Q_OS_WIN) || defined (Q_OS_DARWIN) */
@@ -6496,6 +6501,8 @@ void ONMainWindow::pulseManagerWrapper () {
pulseManagerThread = new QThread (0);
pulseManager = new PulseManager ();
+ pulseManager->set_debug (debugging);
+
pulseManager->moveToThread (pulseManagerThread);
/*
--
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