From 81fc0d3696ca49630d312000be591862dcbe0ea9 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 16 Sep 2014 14:50:20 -0700
Subject: [PATCH] Added options to use recording context

---
 libraries/avatars/src/Recorder.cpp | 33 +++++++++++++++++++++++++++++-
 libraries/avatars/src/Recorder.h   |  5 +++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/libraries/avatars/src/Recorder.cpp b/libraries/avatars/src/Recorder.cpp
index a453c045d0..6b6d9dc64e 100644
--- a/libraries/avatars/src/Recorder.cpp
+++ b/libraries/avatars/src/Recorder.cpp
@@ -220,7 +220,11 @@ Player::Player(AvatarData* avatar) :
     _avatar(avatar),
     _audioThread(NULL),
     _playFromCurrentPosition(true),
-    _loop(false)
+    _loop(false),
+    _useAttachments(true),
+    _useDisplayName(true),
+    _useHeadURL(true),
+    _useSkeletonURL(true)
 {
     _timer.invalidate();
     _options.setLoop(false);
@@ -253,6 +257,20 @@ void Player::startPlaying() {
         
         _currentContext.orientationInv = glm::inverse(_currentContext.orientation);
         
+        RecordingContext& context = _recording->getContext();
+        if (_useAttachments) {
+            _avatar->setAttachmentData(context.attachments);
+        }
+        if (_useDisplayName) {
+            _avatar->setDisplayName(context.displayName);
+        }
+        if (_useHeadURL) {
+            _avatar->setFaceModelURL(context.headModel);
+        }
+        if (_useSkeletonURL) {
+            _avatar->setSkeletonModelURL(context.skeletonModel);
+        }
+        
         bool wantDebug = false;
         if (wantDebug) {
             qDebug() << "Player::startPlaying(): Recording Context";
@@ -295,6 +313,19 @@ void Player::stopPlaying() {
     // Turn off fake faceshift connection
     _avatar->setForceFaceshiftConnected(false);
     
+    if (_useAttachments) {
+        _avatar->setAttachmentData(_currentContext.attachments);
+    }
+    if (_useDisplayName) {
+        _avatar->setDisplayName(_currentContext.displayName);
+    }
+    if (_useHeadURL) {
+        _avatar->setFaceModelURL(_currentContext.headModel);
+    }
+    if (_useSkeletonURL) {
+        _avatar->setSkeletonModelURL(_currentContext.skeletonModel);
+    }
+    
     qDebug() << "Recorder::stopPlaying()";
 }
 
diff --git a/libraries/avatars/src/Recorder.h b/libraries/avatars/src/Recorder.h
index 65488e0696..f40904cd9b 100644
--- a/libraries/avatars/src/Recorder.h
+++ b/libraries/avatars/src/Recorder.h
@@ -191,6 +191,11 @@ private:
     RecordingContext _currentContext;
     bool _playFromCurrentPosition;
     bool _loop;
+    bool _useAttachments;
+    bool _useDisplayName;
+    bool _useHeadURL;
+    bool _useSkeletonURL;
+    
 };
 
 void writeRecordingToFile(RecordingPointer recording, QString file);