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 /video | |
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 'video')
-rw-r--r-- | video/avi_decoder.cpp | 2 | ||||
-rw-r--r-- | video/avi_decoder.h | 2 | ||||
-rw-r--r-- | video/coktel_decoder.cpp | 14 | ||||
-rw-r--r-- | video/coktel_decoder.h | 6 | ||||
-rw-r--r-- | video/dxa_decoder.cpp | 2 | ||||
-rw-r--r-- | video/dxa_decoder.h | 2 | ||||
-rw-r--r-- | video/flic_decoder.cpp | 2 | ||||
-rw-r--r-- | video/flic_decoder.h | 2 | ||||
-rw-r--r-- | video/qt_decoder.cpp | 2 | ||||
-rw-r--r-- | video/qt_decoder.h | 2 | ||||
-rw-r--r-- | video/smk_decoder.cpp | 2 | ||||
-rw-r--r-- | video/smk_decoder.h | 2 | ||||
-rw-r--r-- | video/video_decoder.cpp | 2 | ||||
-rw-r--r-- | video/video_decoder.h | 2 |
14 files changed, 22 insertions, 22 deletions
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp index a49b54a7f9..87072410db 100644 --- a/video/avi_decoder.cpp +++ b/video/avi_decoder.cpp @@ -234,7 +234,7 @@ void AviDecoder::handleStreamHeader() { _fileStream->seek(startPos + strfSize); } -bool AviDecoder::load(Common::SeekableReadStream *stream) { +bool AviDecoder::loadStream(Common::SeekableReadStream *stream) { close(); _fileStream = stream; diff --git a/video/avi_decoder.h b/video/avi_decoder.h index 57a39ea941..063df1ee72 100644 --- a/video/avi_decoder.h +++ b/video/avi_decoder.h @@ -174,7 +174,7 @@ public: Audio::Mixer::SoundType soundType = Audio::Mixer::kPlainSoundType); virtual ~AviDecoder(); - bool load(Common::SeekableReadStream *stream); + bool loadStream(Common::SeekableReadStream *stream); void close(); bool isVideoLoaded() const { return _fileStream != 0; } diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp index a4bf2d2e19..3c092d5cf9 100644 --- a/video/coktel_decoder.cpp +++ b/video/coktel_decoder.cpp @@ -665,7 +665,7 @@ bool PreIMDDecoder::seek(int32 frame, int whence, bool restart) { return true; } -bool PreIMDDecoder::load(Common::SeekableReadStream *stream) { +bool PreIMDDecoder::loadStream(Common::SeekableReadStream *stream) { // Since PreIMDs don't have any width and height values stored, // we need them to be specified in the constructor assert((_width > 0) && (_height > 0)); @@ -921,7 +921,7 @@ void IMDDecoder::setXY(uint16 x, uint16 y) { _y = y; } -bool IMDDecoder::load(Common::SeekableReadStream *stream) { +bool IMDDecoder::loadStream(Common::SeekableReadStream *stream) { close(); _stream = stream; @@ -933,7 +933,7 @@ bool IMDDecoder::load(Common::SeekableReadStream *stream) { // Version checking if ((handle != 0) || (_version < 2)) { - warning("IMDDecoder::load(): Version incorrect (%d, 0x%X)", handle, _version); + warning("IMDDecoder::loadStream(): Version incorrect (%d, 0x%X)", handle, _version); close(); return false; } @@ -1660,7 +1660,7 @@ void VMDDecoder::colorModeChanged() { openExternalCodec(); } -bool VMDDecoder::load(Common::SeekableReadStream *stream) { +bool VMDDecoder::loadStream(Common::SeekableReadStream *stream) { close(); _stream = stream; @@ -1677,12 +1677,12 @@ bool VMDDecoder::load(Common::SeekableReadStream *stream) { // Version checking if (headerLength == 50) { // Newer version, used in Addy 5 upwards - warning("VMDDecoder::load(): TODO: Addy 5 videos"); + warning("VMDDecoder::loadStream(): TODO: Addy 5 videos"); } else if (headerLength == 814) { // Old version _features |= kFeaturesPalette; } else { - warning("VMDDecoder::load(): Version incorrect (%d, %d, %d)", headerLength, handle, _version); + warning("VMDDecoder::loadStream(): Version incorrect (%d, %d, %d)", headerLength, handle, _version); close(); return false; } @@ -1710,7 +1710,7 @@ bool VMDDecoder::load(Common::SeekableReadStream *stream) { _bytesPerPixel = handle + 1; if (_bytesPerPixel > 3) { - warning("VMDDecoder::load(): Requested %d bytes per pixel (%d, %d, %d)", + warning("VMDDecoder::loadStream(): Requested %d bytes per pixel (%d, %d, %d)", _bytesPerPixel, headerLength, handle, _version); close(); return false; diff --git a/video/coktel_decoder.h b/video/coktel_decoder.h index 6ef72eb513..152cf5941d 100644 --- a/video/coktel_decoder.h +++ b/video/coktel_decoder.h @@ -234,7 +234,7 @@ public: // VideoDecoder interface - bool load(Common::SeekableReadStream *stream); + bool loadStream(Common::SeekableReadStream *stream); void close(); bool isVideoLoaded() const; @@ -267,7 +267,7 @@ public: // VideoDecoder interface - bool load(Common::SeekableReadStream *stream); + bool loadStream(Common::SeekableReadStream *stream); void close(); bool isVideoLoaded() const; @@ -371,7 +371,7 @@ public: // VideoDecoder interface - bool load(Common::SeekableReadStream *stream); + bool loadStream(Common::SeekableReadStream *stream); void close(); bool isVideoLoaded() const; diff --git a/video/dxa_decoder.cpp b/video/dxa_decoder.cpp index bf476def44..3a8b3acae9 100644 --- a/video/dxa_decoder.cpp +++ b/video/dxa_decoder.cpp @@ -67,7 +67,7 @@ DXADecoder::~DXADecoder() { close(); } -bool DXADecoder::load(Common::SeekableReadStream *stream) { +bool DXADecoder::loadStream(Common::SeekableReadStream *stream) { close(); _fileStream = stream; diff --git a/video/dxa_decoder.h b/video/dxa_decoder.h index e480298a90..614cb2d90b 100644 --- a/video/dxa_decoder.h +++ b/video/dxa_decoder.h @@ -43,7 +43,7 @@ public: DXADecoder(); virtual ~DXADecoder(); - bool load(Common::SeekableReadStream *stream); + bool loadStream(Common::SeekableReadStream *stream); void close(); bool isVideoLoaded() const { return _fileStream != 0; } diff --git a/video/flic_decoder.cpp b/video/flic_decoder.cpp index 347eae4034..3afeef2874 100644 --- a/video/flic_decoder.cpp +++ b/video/flic_decoder.cpp @@ -41,7 +41,7 @@ FlicDecoder::~FlicDecoder() { close(); } -bool FlicDecoder::load(Common::SeekableReadStream *stream) { +bool FlicDecoder::loadStream(Common::SeekableReadStream *stream) { close(); _fileStream = stream; diff --git a/video/flic_decoder.h b/video/flic_decoder.h index 7736cdf604..954fed7bfa 100644 --- a/video/flic_decoder.h +++ b/video/flic_decoder.h @@ -51,7 +51,7 @@ public: * Load a video file * @param stream the stream to load */ - bool load(Common::SeekableReadStream *stream); + bool loadStream(Common::SeekableReadStream *stream); void close(); /** diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp index 49cab3527e..9187f261bd 100644 --- a/video/qt_decoder.cpp +++ b/video/qt_decoder.cpp @@ -452,7 +452,7 @@ bool QuickTimeDecoder::loadFile(const Common::String &filename) { return true; } -bool QuickTimeDecoder::load(Common::SeekableReadStream *stream) { +bool QuickTimeDecoder::loadStream(Common::SeekableReadStream *stream) { _fd = stream; _foundMOOV = false; _numStreams = 0; diff --git a/video/qt_decoder.h b/video/qt_decoder.h index ef701b3756..cc6b6738c5 100644 --- a/video/qt_decoder.h +++ b/video/qt_decoder.h @@ -91,7 +91,7 @@ public: * Load a QuickTime video file from a SeekableReadStream * @param stream the stream to load */ - bool load(Common::SeekableReadStream *stream); + bool loadStream(Common::SeekableReadStream *stream); /** * Close a QuickTime encoded video file diff --git a/video/smk_decoder.cpp b/video/smk_decoder.cpp index 0a1bcea1dc..15f2b93948 100644 --- a/video/smk_decoder.cpp +++ b/video/smk_decoder.cpp @@ -370,7 +370,7 @@ uint32 SmackerDecoder::getElapsedTime() const { return VideoDecoder::getElapsedTime(); } -bool SmackerDecoder::load(Common::SeekableReadStream *stream) { +bool SmackerDecoder::loadStream(Common::SeekableReadStream *stream) { close(); _fileStream = stream; diff --git a/video/smk_decoder.h b/video/smk_decoder.h index 6150335763..146d8a7935 100644 --- a/video/smk_decoder.h +++ b/video/smk_decoder.h @@ -58,7 +58,7 @@ public: Audio::Mixer::SoundType soundType = Audio::Mixer::kSFXSoundType); virtual ~SmackerDecoder(); - bool load(Common::SeekableReadStream *stream); + bool loadStream(Common::SeekableReadStream *stream); void close(); bool isVideoLoaded() const { return _fileStream != 0; } diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp index 8a95e23fef..3e27b3c050 100644 --- a/video/video_decoder.cpp +++ b/video/video_decoder.cpp @@ -42,7 +42,7 @@ bool VideoDecoder::loadFile(const Common::String &filename) { return false; } - return load(file); + return loadStream(file); } uint32 VideoDecoder::getElapsedTime() const { diff --git a/video/video_decoder.h b/video/video_decoder.h index aa88dda4a4..7c59108fe3 100644 --- a/video/video_decoder.h +++ b/video/video_decoder.h @@ -92,7 +92,7 @@ public: * Load a video file * @param stream the stream to load */ - virtual bool load(Common::SeekableReadStream *stream) = 0; + virtual bool loadStream(Common::SeekableReadStream *stream) = 0; /** * Close a video file |