From 5f95cbc10122e019b446d8095bf302a3b1ef01bf Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 30 Sep 2014 11:23:33 -0700 Subject: [PATCH] JS hooks --- libraries/avatars/src/AvatarData.cpp | 12 ++++++++++++ libraries/avatars/src/AvatarData.h | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp index 126da654ae..76bb64481e 100644 --- a/libraries/avatars/src/AvatarData.cpp +++ b/libraries/avatars/src/AvatarData.cpp @@ -652,6 +652,18 @@ void AvatarData::startPlaying() { _player->startPlaying(); } +void AvatarData::setPlayerVolume(float volume) { + if (_player) { + _player->setVolume(volume); + } +} + +void AvatarData::setPlayerAudioOffset(qint64 audioOffset) { + if (_player) { + _player->setAudioOffset(audioOffset); + } +} + void AvatarData::setPlayerFrame(int frame) { if (_player) { _player->setCurrentFrame(frame); diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 9b28fdc258..3436e35972 100755 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -100,8 +100,6 @@ enum KeyState { DELETE_KEY_DOWN }; -const glm::vec3 vec3Zero(0.0f); - class QDataStream; class AttachmentData; @@ -304,6 +302,8 @@ public slots: void loadRecording(QString filename); void startPlaying(); + void setPlayerVolume(float volume); + void setPlayerAudioOffset(qint64 audioOffset); void setPlayerFrame(int frame); void setPlayerTime(qint64 time); void setPlayFromCurrentLocation(bool playFromCurrentLocation);