diff options
author | Max Horn | 2011-02-07 17:54:16 +0000 |
---|---|---|
committer | Max Horn | 2011-02-07 17:54:16 +0000 |
commit | 357c225f64ac91d63d31f23858f50471c158b065 (patch) | |
tree | acf958a75466d4aacfd2bca37bdb382f33c707fb /engines/sword25/fmv | |
parent | 2c00aed172f09285c8131d437b64de9d000d1762 (diff) | |
download | scummvm-rg350-357c225f64ac91d63d31f23858f50471c158b065.tar.gz scummvm-rg350-357c225f64ac91d63d31f23858f50471c158b065.tar.bz2 scummvm-rg350-357c225f64ac91d63d31f23858f50471c158b065.zip |
VIDEO: Rename VideoDecoder::load() to loadStream()
svn-id: r55810
Diffstat (limited to 'engines/sword25/fmv')
-rw-r--r-- | engines/sword25/fmv/movieplayer.cpp | 2 | ||||
-rw-r--r-- | engines/sword25/fmv/theora_decoder.cpp | 2 | ||||
-rw-r--r-- | engines/sword25/fmv/theora_decoder.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword25/fmv/movieplayer.cpp b/engines/sword25/fmv/movieplayer.cpp index 3b4d3a74b9..177bd38303 100644 --- a/engines/sword25/fmv/movieplayer.cpp +++ b/engines/sword25/fmv/movieplayer.cpp @@ -59,7 +59,7 @@ MoviePlayer::~MoviePlayer() { bool MoviePlayer::loadMovie(const Common::String &filename, uint z) { // Get the file and load it into the decoder Common::SeekableReadStream *in = Kernel::getInstance()->getPackage()->getStream(filename); - _decoder.load(in); + _decoder.loadStream(in); GraphicEngine *pGfx = Kernel::getInstance()->getGfx(); diff --git a/engines/sword25/fmv/theora_decoder.cpp b/engines/sword25/fmv/theora_decoder.cpp index ad3972cbef..b1747fd71a 100644 --- a/engines/sword25/fmv/theora_decoder.cpp +++ b/engines/sword25/fmv/theora_decoder.cpp @@ -99,7 +99,7 @@ int TheoraDecoder::bufferData() { return bytes; } -bool TheoraDecoder::load(Common::SeekableReadStream *stream) { +bool TheoraDecoder::loadStream(Common::SeekableReadStream *stream) { close(); _fileStream = stream; diff --git a/engines/sword25/fmv/theora_decoder.h b/engines/sword25/fmv/theora_decoder.h index 34349c9088..e89c394946 100644 --- a/engines/sword25/fmv/theora_decoder.h +++ b/engines/sword25/fmv/theora_decoder.h @@ -60,7 +60,7 @@ public: * Load a video file * @param stream the stream to load */ - bool load(Common::SeekableReadStream *stream); + bool loadStream(Common::SeekableReadStream *stream); void close(); void reset(); |