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/sci | |
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/sci')
-rw-r--r-- | engines/sci/video/robot_decoder.cpp | 4 | ||||
-rw-r--r-- | engines/sci/video/robot_decoder.h | 2 | ||||
-rw-r--r-- | engines/sci/video/seq_decoder.cpp | 2 | ||||
-rw-r--r-- | engines/sci/video/seq_decoder.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/video/robot_decoder.cpp b/engines/sci/video/robot_decoder.cpp index d487c6d9b4..23281e0a1a 100644 --- a/engines/sci/video/robot_decoder.cpp +++ b/engines/sci/video/robot_decoder.cpp @@ -97,10 +97,10 @@ bool RobotDecoder::load(GuiResourceId id) { return false; } - return load(stream); + return loadStream(stream); } -bool RobotDecoder::load(Common::SeekableReadStream *stream) { +bool RobotDecoder::loadStream(Common::SeekableReadStream *stream) { close(); _fileStream = new Common::SeekableSubReadStreamEndian(stream, 0, stream->size(), _isBigEndian, DisposeAfterUse::YES); diff --git a/engines/sci/video/robot_decoder.h b/engines/sci/video/robot_decoder.h index 8a52308c25..eb0a150c9d 100644 --- a/engines/sci/video/robot_decoder.h +++ b/engines/sci/video/robot_decoder.h @@ -57,7 +57,7 @@ public: RobotDecoder(Audio::Mixer *mixer, bool isBigEndian); virtual ~RobotDecoder(); - bool load(Common::SeekableReadStream *stream); + bool loadStream(Common::SeekableReadStream *stream); bool load(GuiResourceId id); void close(); diff --git a/engines/sci/video/seq_decoder.cpp b/engines/sci/video/seq_decoder.cpp index 106084d427..0e69a9a352 100644 --- a/engines/sci/video/seq_decoder.cpp +++ b/engines/sci/video/seq_decoder.cpp @@ -56,7 +56,7 @@ SeqDecoder::~SeqDecoder() { close(); } -bool SeqDecoder::load(Common::SeekableReadStream *stream) { +bool SeqDecoder::loadStream(Common::SeekableReadStream *stream) { close(); _fileStream = stream; diff --git a/engines/sci/video/seq_decoder.h b/engines/sci/video/seq_decoder.h index d67e35938a..70aaa661ae 100644 --- a/engines/sci/video/seq_decoder.h +++ b/engines/sci/video/seq_decoder.h @@ -38,7 +38,7 @@ public: SeqDecoder(); virtual ~SeqDecoder(); - bool load(Common::SeekableReadStream *stream); + bool loadStream(Common::SeekableReadStream *stream); void close(); void setFrameDelay(int frameDelay) { _frameDelay = frameDelay; } |