libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-17 23:44:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AGOS: Fix regression with sound in Smacker OmniTV videos

Browse Source
This commit is contained in:
Matthew Hoops 2012-08-18 10:22:54 -04:00
parent da9695ddc6
commit 7af4e40304
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/agos/animation.cpp
View File

@ -293,8 +293,6 @@ void MoviePlayerDXA::playVideo() {
_vm->clearSurfaces(); _vm->clearSurfaces();
} }
start();
while (!endOfVideo() && !_skipMovie && !_vm->shouldQuit()) while (!endOfVideo() && !_skipMovie && !_vm->shouldQuit())
handleNextFrame(); handleNextFrame();
} }
@ -305,6 +303,8 @@ void MoviePlayerDXA::stopVideo() {
} }
void MoviePlayerDXA::startSound() { void MoviePlayerDXA::startSound() {
start();
if (_bgSoundStream != NULL) { if (_bgSoundStream != NULL) {
_vm->_mixer->stopHandle(_bgSound); _vm->_mixer->stopHandle(_bgSound);
_vm->_mixer->playStream(Audio::Mixer::kSFXSoundType, &_bgSound, _bgSoundStream, -1, getVolume(), getBalance()); _vm->_mixer->playStream(Audio::Mixer::kSFXSoundType, &_bgSound, _bgSoundStream, -1, getVolume(), getBalance());
@ -457,8 +457,6 @@ void MoviePlayerSMK::copyFrameToBuffer(byte *dst, uint x, uint y, uint pitch) {
} }
void MoviePlayerSMK::playVideo() { void MoviePlayerSMK::playVideo() {
start();
while (!endOfVideo() && !_skipMovie && !_vm->shouldQuit()) while (!endOfVideo() && !_skipMovie && !_vm->shouldQuit())
handleNextFrame(); handleNextFrame();
} }
@ -468,6 +466,7 @@ void MoviePlayerSMK::stopVideo() {
} }
void MoviePlayerSMK::startSound() { void MoviePlayerSMK::startSound() {
start();
} }
void MoviePlayerSMK::handleNextFrame() { void MoviePlayerSMK::handleNextFrame() {