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/mohawk/video.h | |
| 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/mohawk/video.h')
| -rw-r--r-- | engines/mohawk/video.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/mohawk/video.h b/engines/mohawk/video.h index 98bcadfb53..9dddcde09b 100644 --- a/engines/mohawk/video.h +++ b/engines/mohawk/video.h @@ -45,19 +45,19 @@ struct MLSTRecord { struct VideoEntry { // Playback variables - Video::SeekableVideoDecoder *video; + Video::VideoDecoder *video; uint16 x; uint16 y; bool loop; bool enabled; - Audio::Timestamp start, end; + Audio::Timestamp start; // Identification Common::String filename; // External video files int id; // Internal Mohawk files // Helper functions - Video::SeekableVideoDecoder *operator->() const { assert(video); return video; } // TODO: Remove this eventually + Video::VideoDecoder *operator->() const { assert(video); return video; } // TODO: Remove this eventually void clear(); bool endOfVideo(); }; |