libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-03 16:58:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GOB: Extend the good-measure wait to all videos with sound

Browse Source 
Fixes a glitch in Bambou, where the intro movie is cut off to
soon.

svn-id: r55432
This commit is contained in:
Sven Hesse 2011-01-22 16:29:54 +00:00
parent 755558de04
commit cbbafc962d
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/gob/inter_v6.cpp
View File

@ -183,7 +183,7 @@ void Inter_v6::o6_playVmdOrMusic() {
_vm->_vidPlayer->play(slot, props);
if (close && !props.noBlock) {
if ((props.flags & VideoPlayer::kFlagNoVideo) && (!props.canceled))
if (props.hasSound && !props.canceled)
_vm->_util->longDelay(500);
_vm->_vidPlayer->closeVideo(slot);

5
engines/gob/videoplayer.cpp
View File

@ -40,7 +40,8 @@ VideoPlayer::Properties::Properties() : type(kVideoTypeTry), sprite(Draw::kFront
x(-1), y(-1), width(-1), height(-1), flags(kFlagFrontSurface), switchColorMode(false),
startFrame(-1), lastFrame(-1), endFrame(-1), forceSeek(false),
breakKey(kShortKeyEscape), palCmd(8), palStart(0), palEnd(255), palFrame(-1),
noBlock(false), loop(false), fade(false), waitEndFrame(true), canceled(false) {
noBlock(false), loop(false), fade(false), waitEndFrame(true),
hasSound(false), canceled(false) {
}
@ -202,6 +203,8 @@ int VideoPlayer::openVideo(bool primary, const Common::String &file, Properties
if (primary)
_needBlit = (properties.flags & kFlagUseBackSurfaceContent) && (properties.sprite == Draw::kFrontSurface);
properties.hasSound = video->decoder->hasSound();
if (!video->decoder->hasSound())
video->decoder->setFrameRate(_vm->_util->getFrameRate());

1
engines/gob/videoplayer.h
View File

@ -96,6 +96,7 @@ public:
bool waitEndFrame; ///< Wait for the frame's time to run out?
bool hasSound; ///< Does the video have sound?
bool canceled; ///< Was the video canceled?
Properties();