This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from daa9cf5 Fix crashing client when editing session from SessionManageDialog. new c3f59d2 Configure audio input in pulseaudio on Windows. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + src/configdialog.cpp | 22 ++++++++++++++++++++++ src/configdialog.h | 4 ++++ src/onmainwindow.cpp | 9 ++++++++- src/onmainwindow.h | 2 ++ 5 files changed, 37 insertions(+), 1 deletion(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit c3f59d2200e2ef722ff754af6a9dcfe3847cb566 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Tue Dec 1 17:21:27 2015 +0100 Configure audio input in pulseaudio on Windows. --- debian/changelog | 1 + src/configdialog.cpp | 22 ++++++++++++++++++++++ src/configdialog.h | 4 ++++ src/onmainwindow.cpp | 9 ++++++++- src/onmainwindow.h | 2 ++ 5 files changed, 37 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 985b168..8e1b001 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low - Replace "::" with "_" for the desktop link name on Windows. - Fix direct RDP in broker mode. - Fix crashing client when editing session from SessionManageDialog. + - Configure audio input in pulseaudio on Windows. [ Mike Gabriel ] * New upstream release (4.0.5.1): diff --git a/src/configdialog.cpp b/src/configdialog.cpp index c0b2285..190f183 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -352,6 +352,18 @@ ConfigDialog::ConfigDialog ( QWidget * parent, Qt::WFlags f ) tabWidg->addTab(xsetWidg, tr("X.Org Server settings")); #endif +#ifdef Q_OS_WIN + QFrame* frp=new QFrame(this); + tabWidg->addTab(frp, tr("Pulseaudio settings")); + QVBoxLayout* l=new QVBoxLayout(frp); + cbNoRecord=new QCheckBox(tr("Disable audio input"),frp); + QLabel* lw=new QLabel(tr("<font size=\"5\">You must restart the X2Go Client for the changes to take effect</font><br><br>"),frp); + lw->setWordWrap(true); + l->addWidget(lw); + l->addWidget(cbNoRecord); + l->addStretch(1); + cbNoRecord->setChecked ( st.setting()->value ( "pulse/norecord", false ).toBool() ); +#endif } @@ -369,6 +381,9 @@ void ConfigDialog::slot_accepted() st.setting()->setValue ( "trayicon/mincon", cbMinimizeTray->isChecked() ); st.setting()->setValue ( "trayicon/maxdiscon", cbMaxmizeTray->isChecked() ); #endif +#ifdef Q_OS_WIN + st.setting()->setValue ( "pulse/norecord", cbNoRecord->isChecked() ); +#endif #ifdef USELDAP if ( !embedMode ) { @@ -640,6 +655,13 @@ void ConfigDialog::slotDefaults() { switch ( tabWidg->currentIndex() ) { +#ifdef Q_OS_WIN + case 3: + { + cbNoRecord->setChecked(false); + } + break; +#endif case 0: { if ( embedMode ) diff --git a/src/configdialog.h b/src/configdialog.h index 3e1d9a4..8abcd85 100644 --- a/src/configdialog.h +++ b/src/configdialog.h @@ -93,6 +93,10 @@ private: XSettingsWidget* xsetWidg; #endif +#ifdef Q_OS_WIN + QCheckBox *cbNoRecord; +#endif + QGroupBox *gbTrayIcon; QCheckBox *cbMinimizeTray; QCheckBox *cbMaxmizeTray; diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 3e2f2f8..9104a2d 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -149,6 +149,8 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) clientSshPort="7022"; pulsePort=4713; pulseStarted=false; + X2goSettings st ( "settings" ); + pulseNoRecord=st.setting()->value ( "pulse/norecord", false ).toBool(); winSshdStarted=false; #else userSshd=false; @@ -9896,7 +9898,12 @@ void ONMainWindow::startPulsed() } out << "load-module module-esound-protocol-tcp port="+ QString::number ( esdPort ) <<endl; - out << "load-module module-waveout"<<endl; + out << "load-module module-waveout"; +#ifdef Q_OS_WIN + if(pulseNoRecord) + out << " record=0"; +#endif + out << endl; file.close(); pulseServer=new QProcess ( 0 ); pulseServer->setEnvironment ( pEnv ); diff --git a/src/onmainwindow.h b/src/onmainwindow.h index 224a138..5674c2c 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -844,6 +844,8 @@ private: QString pulseRuntimeDir; QString pulseCookieArg; int pulsePort; + bool pulseNoRecord; + int esdPort; bool maximizeProxyWin; int proxyWinWidth; -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org