[X2Go-Commits] [x2goclient] 01/02: src/pulsemanager.{cpp, h}: rename shutdownState to shutdown_state_, reorder in initializer list.
git-admin at x2go.org
git-admin at x2go.org
Sat Sep 30 19:44:33 CEST 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit 07ce91ea10e49270e1b260611ae5f3d8c7379fb2
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sat Sep 30 19:37:19 2017 +0200
src/pulsemanager.{cpp,h}: rename shutdownState to shutdown_state_, reorder in initializer list.
---
debian/changelog | 2 ++
src/pulsemanager.cpp | 10 +++++-----
src/pulsemanager.h | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4915f32..5b207d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -198,6 +198,8 @@ x2goclient (4.1.1.0-0x2go1) UNRELEASED; urgency=medium
be found.
- src/onmainwindow.cpp: fix up main window position check; use
QRect.intersects ().
+ - src/pulsemanager.{cpp,h}: rename shutdownState to shutdown_state_,
+ reorder in initializer list.
* x2goclient.spec:
- Respect %{optflags} and pass QMAKE_STRIP=: to fix missing debug info
issues.
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index a7d93c0..1bd94c4 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -47,8 +47,8 @@ PulseManager::PulseManager () : app_dir_ (QApplication::applicationDirPath ()),
record_ (true),
playback_ (true),
debug_ (false),
- shutdownState(false),
- system_pulse_ (false) {
+ system_pulse_ (false),
+ shutdown_state_ (false) {
pulse_dir_ = QDir (QDir::homePath ());
pulse_dir_.mkpath (pulse_dir_.absolutePath () + pulse_X2Go_ + "/tmp");
pulse_dir_.cd (pulse_X2Go_.mid (1));
@@ -774,12 +774,12 @@ void PulseManager::slot_play_startup_sound () {
}
void PulseManager::slot_on_pulse_finished (int exit_code) {
- if (exit_code && !shutdownState)
+ if (exit_code && !shutdown_state_)
{
x2goDebug << "Warning! Pulseaudio's exit code is non-zero.";
show_startup_warning(true);
}
- shutdownState=false;
+ shutdown_state_ = false;
x2goDebug << "Pulseaudio finished with code:"<<exit_code;
QByteArray ba (pulse_server_->readAllStandardOutput ());
char *data = ba.data ();
@@ -826,7 +826,7 @@ bool PulseManager::is_server_running () const {
void PulseManager::shutdown () {
QEventLoop loop;
- shutdownState=true;
+ shutdown_state_ = true;
connect (this, SIGNAL (sig_pulse_server_terminated ()),
&loop, SLOT (quit ()));
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index 237ebe0..e935596 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -129,7 +129,7 @@ class PulseManager: public QObject {
bool debug_;
bool system_pulse_;
- bool shutdownState;
+ bool shutdown_state_;
};
#endif // PULSEMANAGER_H
--
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