This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit a6ab2c7879e3fb23edee2acaa4e3e21d978aa201 Author: Mike DePaulo <mikedep333@gmail.com> Date: Sun Apr 6 14:34:53 2014 -0400 Windows: Force PulseAudio 3.0 & later to use the original cookie file path. --- onmainwindow.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 1456d9d..7249c49 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -9677,11 +9677,11 @@ void ONMainWindow::startPulsed() if (pulseVersionIsLegacy) { - x2goDebug <<"PulseAudio <= 2.1 Detected. Using .pulse-cookie"; + x2goDebug <<"PulseAudio <= 2.1 Detected. PulseAudio will automatically use .pulse-cookie"; } else { - x2goDebug <<"PulseAudio >= 3.0 Detected. Using .config/pulse/cookie or .pulse-cookie in that order."; + x2goDebug <<"PulseAudio >= 3.0 Detected. x2goclient will tell PulseAudio to use .pulse-cookie."; } #endif while ( isServerRunning ( pulsePort ) ) @@ -9723,8 +9723,19 @@ void ONMainWindow::startPulsed() if ( !file.open ( QIODevice::WriteOnly | QIODevice::Text ) ) return; QTextStream out ( &file ); - out << "load-module module-native-protocol-tcp port="+ - QString::number ( pulsePort ) <<endl; + // http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/Modul... + // auth-cookie is relative to %USERPROFILE% + if (pulseVersionIsLegacy) + { + out << "load-module module-native-protocol-tcp port="+ + QString::number ( pulsePort ) <<endl; + } + else + { + out << "load-module module-native-protocol-tcp port="+ + QString::number ( pulsePort )+ + " auth-cookie="+"\\.pulse-cookie" <<endl; + } out << "load-module module-esound-protocol-tcp port="+ QString::number ( esdPort ) <<endl; out << "load-module module-waveout"<<endl; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git