diff options
| author | Matthew Hoops | 2012-08-26 15:39:18 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-08-26 15:41:56 -0400 |
| commit | 857b92f8ffececa9c1f990d21a6a8d1630199a62 (patch) | |
| tree | 420463df7bf481f8c4e0dcba9bd37e68d999b43d /engines/scumm | |
| parent | 1d58ebe133c274643a89f2f4f0d24a2a8ab343c3 (diff) | |
| parent | 18e7573dafbffdd509943c8f90f91933b17b0435 (diff) | |
| download | scummvm-rg350-857b92f8ffececa9c1f990d21a6a8d1630199a62.tar.gz scummvm-rg350-857b92f8ffececa9c1f990d21a6a8d1630199a62.tar.bz2 scummvm-rg350-857b92f8ffececa9c1f990d21a6a8d1630199a62.zip | |
Merge pull request #268 from clone2727/video-rewrite
VideoDecoder upgrade & partial rewrite
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/he/animation_he.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp index 40e99c26a8..be17a3b305 100644 --- a/engines/scumm/he/animation_he.cpp +++ b/engines/scumm/he/animation_he.cpp @@ -40,7 +40,7 @@ MoviePlayer::MoviePlayer(ScummEngine_v90he *vm, Audio::Mixer *mixer) : _vm(vm) { _video = new Video::BinkDecoder(); else #endif - _video = new Video::SmackerDecoder(mixer); + _video = new Video::SmackerDecoder(); _flags = 0; _wizResNum = 0; @@ -61,11 +61,16 @@ int MoviePlayer::load(const char *filename, int flags, int image) { if (_video->isVideoLoaded()) _video->close(); + // Ensure that Bink will use our PixelFormat + _video->setDefaultHighColorFormat(g_system->getScreenFormat()); + if (!_video->loadFile(filename)) { warning("Failed to load video file %s", filename); return -1; } + _video->start(); + debug(1, "Playing video %s", filename); if (flags & 2) |