From 89d120ab3d42ca26f7536961d861b29e009847c2 Mon Sep 17 00:00:00 2001
From: Sam Gateau <sam@highfidelity.io>
Date: Thu, 12 Nov 2015 22:24:11 -0800
Subject: [PATCH] Few fixes to make the recorder.js run

---
 examples/utilities/record/recorder.js      | 2 +-
 libraries/avatars/src/AvatarData.cpp       | 6 +++---
 libraries/recording/src/recording/Deck.cpp | 2 ++
 libraries/recording/src/recording/Frame.h  | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/examples/utilities/record/recorder.js b/examples/utilities/record/recorder.js
index 13ea1e0c72..b44cb23aa8 100644
--- a/examples/utilities/record/recorder.js
+++ b/examples/utilities/record/recorder.js
@@ -176,7 +176,7 @@ function formatTime(time) {
     var SEC_PER_MIN = 60;
     var MSEC_PER_SEC = 1000;
 
-    time = time * (MSEC_PER_SEC * SEC_PER_MIN * MIN_PER_HOUR);
+    time = time * (MSEC_PER_SEC);
 
     var hours = Math.floor(time / (MSEC_PER_SEC * SEC_PER_MIN * MIN_PER_HOUR));
     time -= hours * (MSEC_PER_SEC * SEC_PER_MIN * MIN_PER_HOUR);
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index e2d2c05ef6..e44219977b 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -809,7 +809,7 @@ float AvatarData::playerElapsed() {
             Q_RETURN_ARG(float, result));
         return result;
     }
-    return (float)_player->position();
+    return (float)_player->position() / (float) MSECS_PER_SECOND;
 }
 
 float AvatarData::playerLength() {
@@ -822,7 +822,7 @@ float AvatarData::playerLength() {
                                   Q_RETURN_ARG(float, result));
         return result;
     }
-    return _player->length();
+    return (float)_player->length() / (float) MSECS_PER_SECOND;
 }
 
 void AvatarData::loadRecording(const QString& filename) {
@@ -870,7 +870,7 @@ void AvatarData::setPlayerTime(float time) {
         return;
     } 
 
-    _player->seek(time);
+    _player->seek(time * MSECS_PER_SECOND);
 }
 
 void AvatarData::setPlayFromCurrentLocation(bool playFromCurrentLocation) {
diff --git a/libraries/recording/src/recording/Deck.cpp b/libraries/recording/src/recording/Deck.cpp
index 4349a39732..10209c26d7 100644
--- a/libraries/recording/src/recording/Deck.cpp
+++ b/libraries/recording/src/recording/Deck.cpp
@@ -25,6 +25,8 @@ void Deck::queueClip(ClipPointer clip, Time timeOffset) {
 
     // FIXME if the time offset is not zero, wrap the clip in a OffsetClip wrapper
     _clips.push_back(clip);
+
+    _length = std::max(_length, clip->duration());
 }
 
 void Deck::play() { 
diff --git a/libraries/recording/src/recording/Frame.h b/libraries/recording/src/recording/Frame.h
index 85f5246a4e..f0f53ce144 100644
--- a/libraries/recording/src/recording/Frame.h
+++ b/libraries/recording/src/recording/Frame.h
@@ -27,7 +27,7 @@ public:
     static const FrameType TYPE_INVALID = 0xFFFF;
     static const FrameType TYPE_HEADER = 0x0;
     FrameType type { TYPE_INVALID };
-    Time timeOffset { 0 };
+    Time timeOffset { 0 }; // milliseconds
     QByteArray data;
 
     Frame() {}