Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 18:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Extra spaces

Browse source
This commit is contained in:
Atlante45 2014-09-23 14:37:43 -07:00
parent af341247af
commit 7ab8c7750c
3 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/audio/src/AudioInjector.h
View file

@ -40,7 +40,6 @@ private:
AudioInjectorOptions _options;
bool _shouldStop;
int _currentSendPosition;
};
Q_DECLARE_METATYPE(AudioInjector*)

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

@ -625,7 +625,7 @@ int AvatarData::playerCurrentFrame() {
}
int AvatarData::playerFrameNumber() {
return (_player) ? _player->getRecording()->getFrameNumber() : 0;
return (_player && _player->getRecording()) ? _player->getRecording()->getFrameNumber() : 0;
}
void AvatarData::loadRecording(QString filename) {
@ -722,7 +722,6 @@ void AvatarData::pausePlayer() {
if (_player) {
_player->pausePlayer();
}
}
void AvatarData::stopPlaying() {

1
libraries/avatars/src/Player.cpp
View file

@ -279,7 +279,6 @@ void Player::setCurrentTime(qint64 currentTime) {
(float)(currentTime - _recording->getFrameTimestamp(lowestBound)) /
(float)(_recording->getFrameTimestamp(highestBound) - _recording->getFrameTimestamp(lowestBound));
if (_recording->getFrameTimestamp(bestGuess) <= currentTime) {
if (currentTime < _recording->getFrameTimestamp(bestGuess + 1)) {
lowestBound = bestGuess;