This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.2.x in repository x2goclient. commit d2e0bf707653cbd5ba140cd0e04af00f4aab8872 Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Jul 12 17:38:58 2014 -0400 Revert "Don't start pulse on Windows, until we have not session with pulse support." & "Check if sound is activated before starting pulse." (Fixes: #546) --- debian/changelog | 3 --- onmainwindow.cpp | 21 ++++----------------- onmainwindow.h | 1 - 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index d964232..9641a8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,9 +33,6 @@ x2goclient (4.0.2.1-0x2go1) unstable; urgency=low - Wrong cmd line option throw error dialog if running not from terminal. - Add command line option "close-disconnect", which make client close after session is disconnected. - - Don't start pulse on Windows, until we really have to start a session - that requires pulse support. - - Check if sound is activated before starting pulse. - Fix starting sshd on Win XP. (Fixes: #421). - Fix "fullscreen" mode on Windows 7 with multiple monitors. diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 96914c0..0a035e3 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -140,7 +140,6 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) #ifdef Q_OS_WIN clientSshPort="7022"; pulsePort=4713; - pulseStarted=false; winSshdStarted=false; #else userSshd=false; @@ -1372,7 +1371,7 @@ void ONMainWindow::closeClient() } #endif #ifdef Q_OS_WIN - if ( pulseServer && pulseStarted ) + if ( pulseServer ) { x2goDebug<<"Deleting the pulse timer..."; delete pulseTimer; @@ -4940,10 +4939,6 @@ void ONMainWindow::slotRetResumeSess ( bool result, switch ( sndSystem ) { case PULSE: - if(!pulseStarted && sound) - { - startPulsed(); - } sndPort=QString::number ( pulsePort ); break; case ESD: @@ -9606,13 +9601,10 @@ void ONMainWindow::startWinServers() generateEtcFiles(); sshStarter->start(); } - if(embedMode) + if ( !embedMode || !config.confSnd || + ( config.confSnd && config.useSnd ) ) { - if ( !config.confSnd || - ( config.confSnd && config.useSnd ) ) - { - startPulsed(); - } + startPulsed(); } // #ifdef CFGCLIENT @@ -9690,10 +9682,6 @@ void ONMainWindow::removeCygwinEntry() void ONMainWindow::startPulsed() { #ifdef Q_OS_WIN - if(pulseStarted) - { - return; - } pulseVersionTest=new QProcess ( 0 ); pulseVersionTest->start ( "pulse\\pulseaudio.exe --version" ); @@ -9822,7 +9810,6 @@ void ONMainWindow::startPulsed() connect (pulseTimer, SIGNAL(timeout()), this, SLOT(slotCheckPulse())); x2goDebug<<"Connected timer."; pulseTimer->start(2000); - pulseStarted=true; } void ONMainWindow::slotCheckPulse() diff --git a/onmainwindow.h b/onmainwindow.h index 6227c18..575ebc7 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -780,7 +780,6 @@ private: PROCESS_INFORMATION sshd; bool winSshdStarted; static QString u3Device; - bool pulseStarted; QString pulseVersionTestOutput; QProcess* pulseVersionTest; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git