Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-07 00:02:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Few fixes to make the recorder.js run

Browse source
This commit is contained in:
Sam Gateau 2015-11-12 22:24:11 -08:00
parent 1fd37b51a2
commit 89d120ab3d
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/utilities/record/recorder.js
View file

@ -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);

6
libraries/avatars/src/AvatarData.cpp
View file

@ -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) {

2
libraries/recording/src/recording/Deck.cpp
View file

@ -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() {

2
libraries/recording/src/recording/Frame.h
View file

@ -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() {}