diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/gob/videoplayer.cpp | 2 | ||||
-rw-r--r-- | engines/mohawk/video.cpp | 4 | ||||
-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 | ||||
-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 |
9 files changed, 11 insertions, 11 deletions
diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp index f412d823f0..8222c99ef3 100644 --- a/engines/gob/videoplayer.cpp +++ b/engines/gob/videoplayer.cpp @@ -842,7 +842,7 @@ Common::String VideoPlayer::findFile(const Common::String &file, Properties &pro return 0; } - if (!video->load(stream)) { + if (!video->loadStream(stream)) { delete video; return 0; } diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp index 472b69a761..dba4482b2b 100644 --- a/engines/mohawk/video.cpp +++ b/engines/mohawk/video.cpp @@ -384,7 +384,7 @@ VideoHandle VideoManager::createVideoHandle(uint16 id, uint16 x, uint16 y, bool // Otherwise, create a new entry Video::QuickTimeDecoder *decoder = new Video::QuickTimeDecoder(); decoder->setChunkBeginOffset(_vm->getResourceOffset(ID_TMOV, id)); - decoder->load(_vm->getResource(ID_TMOV, id)); + decoder->loadStream(_vm->getResource(ID_TMOV, id)); VideoEntry entry; entry.clear(); @@ -429,7 +429,7 @@ VideoHandle VideoManager::createVideoHandle(const Common::String &filename, uint return NULL_VID_HANDLE; } - entry->load(file); + entry->loadStream(file); // Search for any deleted videos so we can take a formerly used slot for (uint32 i = 0; i < _videoStreams.size(); i++) 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; } 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(); |