This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 7cd6b80a7e1e3cbc6c6564b7adf918147b003c9f
Author: Mihai Moldovan <io...@ionic.de>
Date: Thu Dec 31 00:38:16 2015 +0100
pulsemanager.h: reformat a bit by adding newlines and moving lines in a
(hopefully) logical fashion.
---
debian/changelog | 2 ++
src/pulsemanager.h | 34 ++++++++++++++++++++++++++--------
2 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dcb1ad1..e604022 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -249,6 +249,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
- pulsemanager.{cpp,h}: some older PA versions used the major, minor and
micro numbering scheme together with a descriptive string. Add new
member variables for this and initialize them correctly.
+ - pulsemanager.h: reformat a bit by adding newlines and moving lines in a
+ (hopefully) logical fashion.
[ Bernard Cafarelli ]
* New upstream version (4.0.5.3):
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index 52c4dfa..ec5e27c 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -46,51 +46,69 @@ class PulseManager: public QObject {
public:
PulseManager ();
~PulseManager ();
+
+ QProcess::ProcessState state ();
+
std::uint16_t get_pulse_port ();
std::uint16_t get_esd_port ();
+
void set_pulse_port (std::uint16_t pulse_port);
void set_esd_port (std::uint16_t esd_port);
- QProcess::ProcessState state ();
+
public slots:
void start ();
void restart ();
+
private:
PulseManager (const PulseManager &other);
- void fetch_pulseaudio_version ();
+
void start_osx ();
void start_win ();
// FIXME
void start_linux ();
void start_generic ();
+
+ void fetch_pulseaudio_version ();
+
bool find_port (bool search_esd = false);
+
bool generate_server_config ();
bool generate_client_config ();
- void cleanup_client_dir ();
+
void create_client_dir ();
+ void cleanup_client_dir ();
+
void shutdown ();
+
bool is_server_running ();
+
private slots:
void on_pulse_finished (int exit_code);
void slot_play_startup_sound ();
+
signals:
void sig_pulse_server_terminated ();
+
private:
+ QString app_dir_;
QString pulse_X2Go_;
QDir pulse_dir_;
+ QStringList server_args_;
+ QString server_binary_;
+ QString server_working_dir_;
+
QProcessEnvironment env_;
QProcess *pulse_server_;
+ QProcess::ProcessState state_;
+
std::uint16_t pulse_port_;
std::uint16_t esd_port_;
- QProcess::ProcessState state_;
- QString app_dir_;
- QStringList server_args_;
- QString server_binary_;
- QString server_working_dir_;
+
std::uint32_t pulse_version_major_;
std::uint32_t pulse_version_minor_;
std::uint32_t pulse_version_micro_;
--
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
