Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 16:33:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added pause/setCurrentTime/setCurrentFrame JShooks

Browse source
This commit is contained in:
Atlante45 2014-09-23 14:19:16 -07:00
parent 95c00b1d4e
commit 3b33db9a6b
2 changed files with 22 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -587,18 +587,13 @@ bool AvatarData::hasReferential() {
}
bool AvatarData::isPlaying() {
if (!_player) {
return false;
}
if (QThread::currentThread() != thread()) {
bool result;
QMetaObject::invokeMethod(this, "isPlaying", Qt::BlockingQueuedConnection,
Q_RETURN_ARG(bool, result));
return result;
}
return _player && _player->isPlaying();
}
bool AvatarData::isPaused() {
return _player && _player->isPaused();
}
qint64 AvatarData::playerElapsed() {
if (!_player) {
return 0;
@ -626,29 +621,11 @@ qint64 AvatarData::playerLength() {
}
int AvatarData::playerCurrentFrame() {
if (!_player) {
return 0;
}
if (QThread::currentThread() != thread()) {
int result;
QMetaObject::invokeMethod(this, "playerCurrentFrame", Qt::BlockingQueuedConnection,
Q_RETURN_ARG(int, result));
return result;
}
return _player->getCurrentFrame();
return (_player) ? _player->getCurrentFrame() : 0;
}
int AvatarData::playerFrameNumber() {
if (!_player) {
return 0;
}
if (QThread::currentThread() != thread()) {
int result;
QMetaObject::invokeMethod(this, "playerFrameNumber", Qt::BlockingQueuedConnection,
Q_RETURN_ARG(int, result));
return result;
}
return _player->getRecording()->getFrameNumber();
return (_player) ? _player->getRecording()->getFrameNumber() : 0;
}
void AvatarData::loadRecording(QString filename) {
@ -734,6 +711,20 @@ void AvatarData::play() {
}
}
void AvatarData::pausePlayer() {
if (!_player) {
return;
}
if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "pausePlayer", Qt::BlockingQueuedConnection);
return;
}
if (_player) {
_player->pausePlayer();
}
}
void AvatarData::stopPlaying() {
if (!_player) {
return;

2
libraries/avatars/src/AvatarData.h
View file

@ -296,6 +296,7 @@ public slots:
bool hasReferential();
bool isPlaying();
bool isPaused();
qint64 playerElapsed();
qint64 playerLength();
int playerCurrentFrame();
@ -312,6 +313,7 @@ public slots:
void setPlayerUseHeadModel(bool useHeadModel);
void setPlayerUseSkeletonModel(bool useSkeletonModel);
void play();
void pausePlayer();
void stopPlaying();
protected: