diff options
| author | Matthew Hoops | 2012-07-25 11:22:28 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-07-25 11:22:28 -0400 |
| commit | 57a06e383b7c3c950653a99c81c1c7fd7dcd5b1d (patch) | |
| tree | 26d5770e1b8507fb0e518aba7a809f2d50b2d812 /engines/scumm | |
| parent | c0cece8d1335a3397ea980d9a2abc4075656068c (diff) | |
| download | scummvm-rg350-57a06e383b7c3c950653a99c81c1c7fd7dcd5b1d.tar.gz scummvm-rg350-57a06e383b7c3c950653a99c81c1c7fd7dcd5b1d.tar.bz2 scummvm-rg350-57a06e383b7c3c950653a99c81c1c7fd7dcd5b1d.zip | |
VIDEO: Convert Bink to the new AdvancedVideoDecoder API
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/he/animation_he.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp index b37a565aab..8329511c14 100644 --- a/engines/scumm/he/animation_he.cpp +++ b/engines/scumm/he/animation_he.cpp @@ -40,10 +40,7 @@ MoviePlayer::MoviePlayer(ScummEngine_v90he *vm, Audio::Mixer *mixer) : _vm(vm) { _video = new Video::BinkDecoder(); else #endif - { _video = new Video::SmackerDecoder(); - ((Video::AdvancedVideoDecoder *)_video)->start(); - } _flags = 0; _wizResNum = 0; @@ -64,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::AdvancedVideoDecoder *)_video)->setDefaultHighColorFormat(g_system->getScreenFormat()); + if (!_video->loadFile(filename)) { warning("Failed to load video file %s", filename); return -1; } + ((Video::AdvancedVideoDecoder *)_video)->start(); + debug(1, "Playing video %s", filename); if (flags & 2) |