This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit ac1d24776e437385c15c5fcef23d43c7176477e0
Author: Mihai Moldovan <io...@ionic.de>
Date:   Thu Oct 1 01:46:47 2015 +0200

    pulsemanager.{cpp,h}: reformat only.
---
 debian/changelog     |    1 +
 src/pulsemanager.cpp |  286 +++++++++++++++++++++++++-------------------------
 src/pulsemanager.h   |   17 ++-
 3 files changed, 152 insertions(+), 152 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8a54c0f..0f40297 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -166,6 +166,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - pulsemanager.{cpp,h}: use name and underscore for member variables, not
       underscore and name.
     - pulsemanager.cpp: minor non-behavior changing fixes.
+    - pulsemanager.{cpp,h}: reformat only.
 
  -- X2Go Release Manager <git-ad...@x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/src/pulsemanager.cpp b/src/pulsemanager.cpp
index ecf442e..9e70ce6 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -25,243 +25,243 @@
 #endif
 
 PulseManager::PulseManager () {
-    pulse_X2Go_ = "/.x2go/pulse";
+  pulse_X2Go_ = "/.x2go/pulse";
 
-    pulse_dir_ = QDir (QDir::homePath ());
-    pulse_dir_.mkpath (pulse_dir_.absolutePath () + pulse_X2Go_ + "/tmp");
-    pulse_dir_.cd (pulse_X2Go_.mid (1));
+  pulse_dir_ = QDir (QDir::homePath ());
+  pulse_dir_.mkpath (pulse_dir_.absolutePath () + pulse_X2Go_ + "/tmp");
+  pulse_dir_.cd (pulse_X2Go_.mid (1));
 
-    env_ = QProcessEnvironment::systemEnvironment ();
-    env_.insert ("HOME", pulse_dir_.absolutePath ());
-    env_.insert ("TEMP", pulse_dir_.absolutePath () + "/tmp");
+  env_ = QProcessEnvironment::systemEnvironment ();
+  env_.insert ("HOME", pulse_dir_.absolutePath ());
+  env_.insert ("TEMP", pulse_dir_.absolutePath () + "/tmp");
 
-    pulse_port_ = 4713;
+  pulse_port_ = 4713;
 
-    state_ = QProcess::NotRunning;
+  state_ = QProcess::NotRunning;
 
-    pulse_server_ = NULL;
+  pulse_server_ = NULL;
 
-    app_dir_ = QApplication::applicationDirPath ();
+  app_dir_ = QApplication::applicationDirPath ();
 }
 
 PulseManager::~PulseManager () {
-    if (pulse_server_ && is_server_running ())
-        shutdown ();
+  if (pulse_server_ && is_server_running ())
+    shutdown ();
 
-    delete (pulse_server_);
+  delete (pulse_server_);
 }
 
 void PulseManager::start () {
-    assert (!is_server_running ());
+  assert (!is_server_running ());
 
-    delete (pulse_server_);
+  delete (pulse_server_);
 
-    pulse_server_ = new QProcess (0);
-    state_ = QProcess::Starting;
+  pulse_server_ = new QProcess (0);
+  state_ = QProcess::Starting;
 
 #ifdef Q_OS_DARWIN
-    start_osx ();
+  start_osx ();
 #elif defined (Q_OS_WIN)
-    start_win ();
+  start_win ();
 #elif defined (Q_OS_LINUX)
-    start_linux ();
+  start_linux ();
 #endif
 }
 
 void PulseManager::start_osx () {
-    find_port ();
+  find_port ();
 
-    if (generate_server_config () && generate_client_config ()) {
-        cleanup_client_dir ();
+  if (generate_server_config () && generate_client_config ()) {
+    cleanup_client_dir ();
 
-        pulse_server_->setProcessEnvironment (env_);
+    pulse_server_->setProcessEnvironment (env_);
 
-        QStringList args;
-        args << "--exit-idle-time=-1" << "-n"
-             << "-F" << pulse_dir_.absolutePath () + "/config.pa"
-             << "-p"
-             << QDir (app_dir_
-                      + "/../Frameworks/pulse-2.0/modules").absolutePath ()
-             << "--high-priority";
+    QStringList args;
+    args << "--exit-idle-time=-1" << "-n"
+         << "-F" << pulse_dir_.absolutePath () + "/config.pa"
+         << "-p"
+         << QDir (app_dir_
+                  + "/../Frameworks/pulse-2.0/modules").absolutePath ()
+         << "--high-priority";
 #ifdef DEBUG
-        args << "--log-level=debug";
+    args << "--log-level=debug";
 #endif
 
-        pulse_server_->setWorkingDirectory (app_dir_ + "/../exe/");
-        pulse_server_->start (app_dir_ + "/../exe/pulseaudio", args);
+    pulse_server_->setWorkingDirectory (app_dir_ + "/../exe/");
+    pulse_server_->start (app_dir_ + "/../exe/pulseaudio", args);
 
-        if (pulse_server_->waitForStarted ()) {
-            x2goDebug << "pulse started with" << args << "waiting for 
finish...";
-            state_ = QProcess::Running;
+    if (pulse_server_->waitForStarted ()) {
+      x2goDebug << "pulse started with" << args << "waiting for finish...";
+      state_ = QProcess::Running;
 
-            connect (pulse_server_, SIGNAL (finished (int)),
-                     this,          SLOT (on_pulse_finished (int)));
+      connect (pulse_server_, SIGNAL (finished (int)),
+               this,          SLOT (on_pulse_finished (int)));
 
 #ifdef DEBUG
-            // Give PA a little time to come up.
-            QTimer::singleShot (5000, this, SLOT (slot_play_startup_sound ()));
+      // Give PA a little time to come up.
+      QTimer::singleShot (5000, this, SLOT (slot_play_startup_sound ()));
 #endif
-        }
     }
+  }
 }
 
 void PulseManager::find_port () {
-    QTcpSocket tcpSocket (0);
-    bool free = false;
-
-    do {
-        tcpSocket.connectToHost ("127.0.0.1", pulse_port_);
-
-        if (tcpSocket.waitForConnected (1000)) {
-            tcpSocket.close ();
-            free = false;
-            ++pulse_port_;
-        }
-        else
-            free = true;
-    } while (!free);
+  QTcpSocket tcpSocket (0);
+  bool free = false;
+
+  do {
+    tcpSocket.connectToHost ("127.0.0.1", pulse_port_);
+
+    if (tcpSocket.waitForConnected (1000)) {
+      tcpSocket.close ();
+      free = false;
+      ++pulse_port_;
+    }
+    else
+      free = true;
+  } while (!free);
 }
 
 bool PulseManager::generate_server_config () {
-    QString config_file_name = pulse_dir_.absolutePath () + "/config.pa";
-    QTemporaryFile config_tmp_file (pulse_dir_.absolutePath () + 
"/tmp/tmpconfig");
-    X2goSettings settings ("settings");
-    bool disable_input = false;
-    bool ret = false;
+  QString config_file_name = pulse_dir_.absolutePath () + "/config.pa";
+  QTemporaryFile config_tmp_file (pulse_dir_.absolutePath () + 
"/tmp/tmpconfig");
+  X2goSettings settings ("settings");
+  bool disable_input = false;
+  bool ret = false;
 
-    disable_input = settings.setting ()->value ("soundnoinput",
-                                                (QVariant) false).toBool ();
+  disable_input = settings.setting ()->value ("soundnoinput",
+                                              (QVariant) false).toBool ();
 
-    if (config_tmp_file.open ()) {
-        QTextStream config_tmp_file_stream (&config_tmp_file);
+  if (config_tmp_file.open ()) {
+    QTextStream config_tmp_file_stream (&config_tmp_file);
 
-        config_tmp_file_stream << "load-module module-native-protocol-tcp 
port=" +
-                               QString::number (pulse_port_) << endl;
-        config_tmp_file_stream << "load-module module-native-protocol-unix" << 
endl;
-        config_tmp_file_stream << "load-module module-coreaudio-detect";
+    config_tmp_file_stream << "load-module module-native-protocol-tcp port="
+                            + QString::number (pulse_port_) << endl;
+    config_tmp_file_stream << "load-module module-native-protocol-unix" << 
endl;
+    config_tmp_file_stream << "load-module module-coreaudio-detect";
 
-        if (disable_input)
-            config_tmp_file_stream << " record=0";
+    if (disable_input)
+      config_tmp_file_stream << " record=0";
 
-        config_tmp_file_stream << endl;
+    config_tmp_file_stream << endl;
 
-        QFile config_file (config_file_name);
-        if (QFile::exists (config_file_name))
-            QFile::remove (config_file_name);
+    QFile config_file (config_file_name);
+    if (QFile::exists (config_file_name))
+      QFile::remove (config_file_name);
 
-        config_tmp_file.copy (config_file_name);
-        config_tmp_file.remove ();
+    config_tmp_file.copy (config_file_name);
+    config_tmp_file.remove ();
 
-        ret = true;
-    }
+    ret = true;
+  }
 
-    return (ret);
+  return (ret);
 }
 
 bool PulseManager::generate_client_config () {
-    QTemporaryFile client_config_tmp_file (pulse_dir_.absolutePath ()
-                                           + "/tmp/tmpconfig");
-    QString client_config_file_name (pulse_dir_.absolutePath () + 
"/.pulse/client.conf");
-    bool ret = false;
+  QTemporaryFile client_config_tmp_file (pulse_dir_.absolutePath ()
+                                         + "/tmp/tmpconfig");
+  QString client_config_file_name (pulse_dir_.absolutePath () + 
"/.pulse/client.conf");
+  bool ret = false;
 
-    if (client_config_tmp_file.open ()) {
-        QTextStream config_tmp_file_stream (&client_config_tmp_file);
+  if (client_config_tmp_file.open ()) {
+    QTextStream config_tmp_file_stream (&client_config_tmp_file);
 
-        config_tmp_file_stream << "autospawn=no" << endl;
-        config_tmp_file_stream << "daemon-binary="
-                               << QDir (app_dir_
-                                        + "/../exe/pulseaudio").absolutePath ()
-                               << endl;
+    config_tmp_file_stream << "autospawn=no" << endl;
+    config_tmp_file_stream << "daemon-binary="
+                           << QDir (app_dir_
+                                    + "/../exe/pulseaudio").absolutePath ()
+                           << endl;
 
-        if (QFile::exists (client_config_file_name))
-            QFile::remove (client_config_file_name);
+    if (QFile::exists (client_config_file_name))
+      QFile::remove (client_config_file_name);
 
-        client_config_tmp_file.copy (client_config_file_name);
-        client_config_tmp_file.remove ();
+    client_config_tmp_file.copy (client_config_file_name);
+    client_config_tmp_file.remove ();
 
-        ret = true;
-    }
+    ret = true;
+  }
 
-    return (ret);
+  return (ret);
 }
 
 void PulseManager::cleanup_client_dir () {
-    // PA expects $HOME/.pulse/$HOST-runtime to be a symbolic link
-    // and will fail, if it's just a plain directory on Mac OS X.
-    // Delete it first.
-    QDir machine_dir (pulse_dir_.absolutePath () + "/.pulse/"
-                      + QHostInfo::localHostName () + "-runtime");
+  // PA expects $HOME/.pulse/$HOST-runtime to be a symbolic link
+  // and will fail, if it's just a plain directory on Mac OS X.
+  // Delete it first.
+  QDir machine_dir (pulse_dir_.absolutePath () + "/.pulse/"
+                    + QHostInfo::localHostName () + "-runtime");
 
-    if (QFile::exists (machine_dir.absolutePath () + "/pid"))
-        QFile::remove (machine_dir.absolutePath () + "/pid");
+  if (QFile::exists (machine_dir.absolutePath () + "/pid"))
+    QFile::remove (machine_dir.absolutePath () + "/pid");
 
-    if (machine_dir.exists ())
-        machine_dir.remove (machine_dir.absolutePath ());
+  if (machine_dir.exists ())
+    machine_dir.remove (machine_dir.absolutePath ());
 }
 
 void PulseManager::slot_play_startup_sound () {
-    QProcess play_file (0);
+  QProcess play_file (0);
 
-    play_file.setWorkingDirectory (pulse_server_->workingDirectory ());
-    play_file.setProcessEnvironment (env_);
-    play_file.start (app_dir_ + "/../exe/paplay "
-                     + app_dir_ + "/../Resources/startup.wav");
+  play_file.setWorkingDirectory (pulse_server_->workingDirectory ());
+  play_file.setProcessEnvironment (env_);
+  play_file.start (app_dir_ + "/../exe/paplay "
+                   + app_dir_ + "/../Resources/startup.wav");
 
-    if (play_file.waitForStarted ())
-        play_file.waitForFinished ();
+  if (play_file.waitForStarted ())
+    play_file.waitForFinished ();
 }
 
 void PulseManager::on_pulse_finished (int exit_code) {
-    if (!exit_code)
-        x2goDebug << "Warning! Pulseaudio's exit code is non-zero.";
-
-    QByteArray ba = pulse_server_->readAllStandardOutput ();
-    char *data = ba.data ();
-    std::cout << data;
-    ba = pulse_server_->readAllStandardError ();
-    data = ba.data ();
-    std::cout << data;
-
-    state_ = QProcess::NotRunning;
-    emit (sig_pulse_server_terminated ());
+  if (!exit_code)
+    x2goDebug << "Warning! Pulseaudio's exit code is non-zero.";
+
+  QByteArray ba = pulse_server_->readAllStandardOutput ();
+  char *data = ba.data ();
+  std::cout << data;
+  ba = pulse_server_->readAllStandardError ();
+  data = ba.data ();
+  std::cout << data;
+
+  state_ = QProcess::NotRunning;
+  emit (sig_pulse_server_terminated ());
 }
 
 bool PulseManager::is_server_running () {
-    if (pulse_server_)
-        return (pulse_server_->state () == QProcess::Running);
-    else
-      return (false);
+  if (pulse_server_)
+    return (pulse_server_->state () == QProcess::Running);
+  else
+    return (false);
 }
 
 void PulseManager::shutdown () {
-    QEventLoop loop;
+  QEventLoop loop;
 
-    connect (this,  SIGNAL (sig_pulse_server_terminated ()),
-             &loop, SLOT (quit ()));
+  connect (this,  SIGNAL (sig_pulse_server_terminated ()),
+           &loop, SLOT (quit ()));
 
-    pulse_server_->terminate ();
+  pulse_server_->terminate ();
 
-    loop.exec ();
+  loop.exec ();
 }
 
 int PulseManager::get_pulse_port () {
-    return (pulse_port_);
+  return (pulse_port_);
 }
 
 void PulseManager::set_pulse_port (int pulse_port) {
-    pulse_port_ = pulse_port;
+  pulse_port_ = pulse_port;
 }
 
 void PulseManager::relaunch () {
-    if (pulse_server_ && is_server_running ())
-        shutdown ();
+  if (pulse_server_ && is_server_running ())
+    shutdown ();
 
-    x2goDebug << "restarting pulse";
-    start ();
+  x2goDebug << "restarting pulse";
+  start ();
 }
 
 QProcess::ProcessState PulseManager::state () {
-    return (state_);
+  return (state_);
 }
 
 #ifdef DEBUG_UNDEF
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index 939dc56..e391af8 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -38,22 +38,21 @@
 #include "x2gologdebug.h"
 #include "x2gosettings.h"
 
-class PulseManager: public QObject
-{
-    Q_OBJECT;
+class PulseManager: public QObject {
+  Q_OBJECT;
 
-public:
+  public:
     PulseManager ();
     ~PulseManager ();
     int get_pulse_port ();
     void set_pulse_port (int pulse_port);
     QProcess::ProcessState state ();
 
-public slots:
+  public slots:
     void start ();
     void relaunch ();
 
-private:
+  private:
     PulseManager (const PulseManager &other);
     void start_osx ();
     // FIXME
@@ -67,14 +66,14 @@ private:
     void shutdown ();
     bool is_server_running ();
 
-private slots:
+  private slots:
     void on_pulse_finished (int exit_code);
     void slot_play_startup_sound ();
 
-signals:
+  signals:
     void sig_pulse_server_terminated ();
 
-private:
+  private:
     QString pulse_X2Go_;
     QDir pulse_dir_;
     QProcessEnvironment env_;

--
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

Reply via email to