From 68c25e805ad5fd41d922f359d0c024a3fb0da686 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 30 Sep 2014 14:31:40 -0700 Subject: [PATCH] Switch int64 to int --- libraries/avatars/src/Player.cpp | 4 ++-- libraries/avatars/src/Player.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/avatars/src/Player.cpp b/libraries/avatars/src/Player.cpp index 224f613497..35a822f11b 100644 --- a/libraries/avatars/src/Player.cpp +++ b/libraries/avatars/src/Player.cpp @@ -297,7 +297,7 @@ void Player::play() { _injector->setOptions(_options); } -void Player::setCurrentFrame(quint64 currentFrame) { +void Player::setCurrentFrame(unsigned int currentFrame) { if (_recording && currentFrame >= _recording->getFrameNumber()) { stopPlaying(); return; @@ -314,7 +314,7 @@ void Player::setCurrentFrame(quint64 currentFrame) { } } -void Player::setCurrentTime(quint64 currentTime) { +void Player::setCurrentTime(unsigned int currentTime) { if (currentTime >= _recording->getLength()) { stopPlaying(); return; diff --git a/libraries/avatars/src/Player.h b/libraries/avatars/src/Player.h index 8137acbfe7..043fcc4a25 100644 --- a/libraries/avatars/src/Player.h +++ b/libraries/avatars/src/Player.h @@ -44,8 +44,8 @@ public slots: void loadRecording(RecordingPointer recording); void play(); - void setCurrentFrame(quint64 currentFrame); - void setCurrentTime(quint64 currentTime); + void setCurrentFrame(unsigned int currentFrame); + void setCurrentTime(unsigned int currentTime); void setVolume(float volume); void setAudioOffset(int audioOffset); @@ -71,8 +71,8 @@ private: int _pausedFrame; QElapsedTimer _timer; - qint64 _timerOffset; - qint64 _audioOffset; + int _timerOffset; + int _audioOffset; QThread* _audioThread; QSharedPointer _injector;