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

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

commit f16e6191e7db879533421395da70461ba611e42b
Author: Mihai Moldovan <io...@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 047b8a4..b449e93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -274,6 +274,7 @@ x2goclient (4.0.5.3-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.
 
  -- X2Go Release Manager <git-ad...@x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 6ea2dec..f9a4ab8 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) */
@@ -6497,6 +6502,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
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

Reply via email to