From cf453a8953c03715aa7d6cd29b571072b940fd7a Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 25 Sep 2014 19:32:57 -0700
Subject: [PATCH] removed _isPaused

---
 libraries/avatars/src/Player.cpp | 17 +++++++----------
 libraries/avatars/src/Player.h   |  4 +---
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/libraries/avatars/src/Player.cpp b/libraries/avatars/src/Player.cpp
index 94696e5ace..9732ccd780 100644
--- a/libraries/avatars/src/Player.cpp
+++ b/libraries/avatars/src/Player.cpp
@@ -19,10 +19,10 @@
 
 Player::Player(AvatarData* avatar) :
     _recording(new Recording()),
+    _pausedFrame(-1),
     _timerOffset(0),
     _avatar(avatar),
     _audioThread(NULL),
-    _isPaused(false),
     _playFromCurrentPosition(true),
     _loop(false),
     _useAttachments(true),
@@ -40,7 +40,7 @@ bool Player::isPlaying() const {
 }
 
 bool Player::isPaused() const {
-    return _isPaused;
+    return (_pausedFrame != -1);
 }
 
 qint64 Player::elapsed() const {
@@ -58,7 +58,7 @@ void Player::startPlaying() {
         return;
     }
     
-    if (!_isPaused) {
+    if (!isPaused()) {
         _currentContext.globalTimestamp = usecTimestampNow();
         _currentContext.domain = NodeList::getInstance()->getDomainHandler().getHostname();
         _currentContext.position = _avatar->getPosition();
@@ -118,9 +118,9 @@ void Player::startPlaying() {
         qDebug() << "Recorder::startPlaying(): Unpause";
         setupAudioThread();
         _timer.start();
-        _isPaused = false;
         
         setCurrentFrame(_pausedFrame);
+        _pausedFrame = -1;
     }
 }
 
@@ -128,7 +128,7 @@ void Player::stopPlaying() {
     if (!isPlaying()) {
         return;
     }
-    _isPaused = false;
+    _pausedFrame = -1;
     _timer.invalidate();
     cleanupAudioThread();
     _avatar->clearJointsData();
@@ -157,7 +157,6 @@ void Player::pausePlayer() {
     _timer.invalidate();
     cleanupAudioThread();
     
-    _isPaused = true;
     _pausedFrame = _currentFrame;
     qDebug() << "Recorder::pausePlayer()";
 }
@@ -200,12 +199,12 @@ void Player::loadFromFile(const QString& file) {
     }
     readRecordingFromFile(_recording, file);
     
-    _isPaused = false;
+    _pausedFrame = -1;
 }
 
 void Player::loadRecording(RecordingPointer recording) {
     _recording = recording;
-    _isPaused = false;
+    _pausedFrame = -1;
 }
 
 void Player::play() {
@@ -262,7 +261,6 @@ void Player::setCurrentFrame(int currentFrame) {
         _timer.start();
         setAudionInjectorPosition();
     } else {
-        _isPaused = true;
         _pausedFrame = currentFrame;
     }
 }
@@ -308,7 +306,6 @@ void Player::setCurrentTime(qint64 currentTime) {
         _timer.start();
         setAudionInjectorPosition();
     } else {
-        _isPaused = true;
         _pausedFrame = lowestBound;
     }
 }
diff --git a/libraries/avatars/src/Player.h b/libraries/avatars/src/Player.h
index 5746279bac..51e120917c 100644
--- a/libraries/avatars/src/Player.h
+++ b/libraries/avatars/src/Player.h
@@ -64,6 +64,7 @@ private:
     QElapsedTimer _timer;
     RecordingPointer _recording;
     int _currentFrame;
+    int _pausedFrame;
     qint64 _timerOffset;
     
     QSharedPointer<AudioInjector> _injector;
@@ -72,9 +73,6 @@ private:
     AvatarData* _avatar;
     QThread* _audioThread;
     
-    bool _isPaused;
-    int _pausedFrame;
-    
     RecordingContext _currentContext;
     bool _playFromCurrentPosition;
     bool _loop;