diff options
author | Filippos Karapetis | 2009-01-11 03:34:50 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-01-11 03:34:50 +0000 |
commit | 0b4dd7c4593587355c1965eb0d266040c83f0382 (patch) | |
tree | c9f6b62c14ba25ccbdf5e8773d5c4e0dc367b7ea /graphics/video/dxa_player.h | |
parent | 08c71e39490590125645215ce65fdcb71f11fae6 (diff) | |
download | scummvm-rg350-0b4dd7c4593587355c1965eb0d266040c83f0382.tar.gz scummvm-rg350-0b4dd7c4593587355c1965eb0d266040c83f0382.tar.bz2 scummvm-rg350-0b4dd7c4593587355c1965eb0d266040c83f0382.zip |
Committed a modified version of wjp's patch for the video player:
- Split the video player from the video decoders. It's now possible to have one video player for multiple decoders
- Added the palette weight calculation from the BS1 engine into VideoPlayer::setPalette. It's now possible to find the values of the white and black colors via getWhite() and getBlack() (useful for subtitle overlays)
- Adapted FTA2's movie playing code to the new changes to video player
- Fixed a slight bug in the DXA decoder (_videoinfo.startTime was not initialized)
svn-id: r35816
Diffstat (limited to 'graphics/video/dxa_player.h')
-rw-r--r-- | graphics/video/dxa_player.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/video/dxa_player.h b/graphics/video/dxa_player.h index fb5645c089..78825dc6f1 100644 --- a/graphics/video/dxa_player.h +++ b/graphics/video/dxa_player.h @@ -30,7 +30,7 @@ namespace Graphics { -class DXAPlayer : public VideoPlayer { +class DXAPlayer : public VideoDecoder { public: DXAPlayer(); virtual ~DXAPlayer(); |