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

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

commit 64e8a899ea5b613d5ebfa6082482ce92bf399de6
Author: Mihai Moldovan <io...@ionic.de>
Date:   Thu Dec 31 01:03:00 2015 +0100

    pulsemanager.{cpp,h}: add record and playback private members, as well as 
getters and setters.
---
 debian/changelog     |    2 ++
 src/pulsemanager.cpp |   34 +++++++++++++++++++++++++++++++++-
 src/pulsemanager.h   |    7 +++++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f0dcaa7..6e09d42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -229,6 +229,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
       number.
     - pulsemanager.{cpp,h}: only allow changing PA or ESD ports when server is
       not currently running.
+    - pulsemanager.{cpp,h}: add record and playback private members, as well
+      as getters and setters.
 
  -- 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 7ffdfcf..ea8124e 100644
--- a/src/pulsemanager.cpp
+++ b/src/pulsemanager.cpp
@@ -39,7 +39,9 @@ PulseManager::PulseManager () : pulse_X2Go_ ("/.x2go/pulse"),
                                 pulse_version_major_ (0),
                                 pulse_version_minor_ (0),
                                 pulse_version_micro_ (0),
-                                pulse_version_misc_ ("") {
+                                pulse_version_misc_ (""),
+                                record_ (true),
+                                playback_ (true) {
   pulse_dir_ = QDir (QDir::homePath ());
   pulse_dir_.mkpath (pulse_dir_.absolutePath () + pulse_X2Go_ + "/tmp");
   pulse_dir_.cd (pulse_X2Go_.mid (1));
@@ -554,6 +556,14 @@ std::uint16_t PulseManager::get_esd_port () {
   return (esd_port_);
 }
 
+bool PulseManager::get_record () {
+  return (record_);
+}
+
+bool PulseManager::get_playback () {
+  return (playback_);
+}
+
 bool PulseManager::set_pulse_port (std::uint16_t pulse_port) {
   bool ret = false;
 
@@ -576,6 +586,28 @@ bool PulseManager::set_esd_port (std::uint16_t esd_port) {
   return (ret);
 }
 
+bool PulseManager::set_record (bool record) {
+  bool ret = false;
+
+  if (!(is_server_running ())) {
+    record_ = record;
+    ret = true;
+  }
+
+  return (ret);
+}
+
+bool PulseManager::set_playback (bool playback) {
+  bool ret = false;
+
+  if (!(is_server_running ())) {
+    playback_ = playback;
+    ret = true;
+  }
+
+  return (ret);
+}
+
 void PulseManager::restart () {
   if (pulse_server_ && is_server_running ())
     shutdown ();
diff --git a/src/pulsemanager.h b/src/pulsemanager.h
index 3dbd94f..57b80bd 100644
--- a/src/pulsemanager.h
+++ b/src/pulsemanager.h
@@ -51,9 +51,13 @@ class PulseManager: public QObject {
 
     std::uint16_t get_pulse_port ();
     std::uint16_t get_esd_port ();
+    bool get_record ();
+    bool get_playback ();
 
     bool set_pulse_port (std::uint16_t pulse_port);
     bool set_esd_port (std::uint16_t esd_port);
+    bool set_record (bool record);
+    bool set_playback (bool playback);
 
 
   public slots:
@@ -113,6 +117,9 @@ class PulseManager: public QObject {
     std::uint32_t pulse_version_minor_;
     std::uint32_t pulse_version_micro_;
     QString pulse_version_misc_;
+
+    bool record_;
+    bool playback_;
 };
 
 #ifdef NDEBUG_DEFINE

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