[Scummvm-cvs-logs] SF.net SVN: scummvm:[55810] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Feb 7 18:54:16 CET 2011
Revision: 55810
http://scummvm.svn.sourceforge.net/scummvm/?rev=55810&view=rev
Author: fingolfin
Date: 2011-02-07 17:54:16 +0000 (Mon, 07 Feb 2011)
Log Message:
-----------
VIDEO: Rename VideoDecoder::load() to loadStream()
Modified Paths:
--------------
scummvm/trunk/engines/gob/videoplayer.cpp
scummvm/trunk/engines/mohawk/video.cpp
scummvm/trunk/engines/sci/video/robot_decoder.cpp
scummvm/trunk/engines/sci/video/robot_decoder.h
scummvm/trunk/engines/sci/video/seq_decoder.cpp
scummvm/trunk/engines/sci/video/seq_decoder.h
scummvm/trunk/engines/sword25/fmv/movieplayer.cpp
scummvm/trunk/engines/sword25/fmv/theora_decoder.cpp
scummvm/trunk/engines/sword25/fmv/theora_decoder.h
scummvm/trunk/video/avi_decoder.cpp
scummvm/trunk/video/avi_decoder.h
scummvm/trunk/video/coktel_decoder.cpp
scummvm/trunk/video/coktel_decoder.h
scummvm/trunk/video/dxa_decoder.cpp
scummvm/trunk/video/dxa_decoder.h
scummvm/trunk/video/flic_decoder.cpp
scummvm/trunk/video/flic_decoder.h
scummvm/trunk/video/qt_decoder.cpp
scummvm/trunk/video/qt_decoder.h
scummvm/trunk/video/smk_decoder.cpp
scummvm/trunk/video/smk_decoder.h
scummvm/trunk/video/video_decoder.cpp
scummvm/trunk/video/video_decoder.h
Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/engines/gob/videoplayer.cpp 2011-02-07 17:54:16 UTC (rev 55810)
@@ -842,7 +842,7 @@
return 0;
}
- if (!video->load(stream)) {
+ if (!video->loadStream(stream)) {
delete video;
return 0;
}
Modified: scummvm/trunk/engines/mohawk/video.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/video.cpp 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/engines/mohawk/video.cpp 2011-02-07 17:54:16 UTC (rev 55810)
@@ -384,7 +384,7 @@
// 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 @@
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++)
Modified: scummvm/trunk/engines/sci/video/robot_decoder.cpp
===================================================================
--- scummvm/trunk/engines/sci/video/robot_decoder.cpp 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/engines/sci/video/robot_decoder.cpp 2011-02-07 17:54:16 UTC (rev 55810)
@@ -97,10 +97,10 @@
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);
Modified: scummvm/trunk/engines/sci/video/robot_decoder.h
===================================================================
--- scummvm/trunk/engines/sci/video/robot_decoder.h 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/engines/sci/video/robot_decoder.h 2011-02-07 17:54:16 UTC (rev 55810)
@@ -57,7 +57,7 @@
RobotDecoder(Audio::Mixer *mixer, bool isBigEndian);
virtual ~RobotDecoder();
- bool load(Common::SeekableReadStream *stream);
+ bool loadStream(Common::SeekableReadStream *stream);
bool load(GuiResourceId id);
void close();
Modified: scummvm/trunk/engines/sci/video/seq_decoder.cpp
===================================================================
--- scummvm/trunk/engines/sci/video/seq_decoder.cpp 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/engines/sci/video/seq_decoder.cpp 2011-02-07 17:54:16 UTC (rev 55810)
@@ -56,7 +56,7 @@
close();
}
-bool SeqDecoder::load(Common::SeekableReadStream *stream) {
+bool SeqDecoder::loadStream(Common::SeekableReadStream *stream) {
close();
_fileStream = stream;
Modified: scummvm/trunk/engines/sci/video/seq_decoder.h
===================================================================
--- scummvm/trunk/engines/sci/video/seq_decoder.h 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/engines/sci/video/seq_decoder.h 2011-02-07 17:54:16 UTC (rev 55810)
@@ -38,7 +38,7 @@
SeqDecoder();
virtual ~SeqDecoder();
- bool load(Common::SeekableReadStream *stream);
+ bool loadStream(Common::SeekableReadStream *stream);
void close();
void setFrameDelay(int frameDelay) { _frameDelay = frameDelay; }
Modified: scummvm/trunk/engines/sword25/fmv/movieplayer.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/movieplayer.cpp 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/engines/sword25/fmv/movieplayer.cpp 2011-02-07 17:54:16 UTC (rev 55810)
@@ -59,7 +59,7 @@
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();
Modified: scummvm/trunk/engines/sword25/fmv/theora_decoder.cpp
===================================================================
--- scummvm/trunk/engines/sword25/fmv/theora_decoder.cpp 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/engines/sword25/fmv/theora_decoder.cpp 2011-02-07 17:54:16 UTC (rev 55810)
@@ -99,7 +99,7 @@
return bytes;
}
-bool TheoraDecoder::load(Common::SeekableReadStream *stream) {
+bool TheoraDecoder::loadStream(Common::SeekableReadStream *stream) {
close();
_fileStream = stream;
Modified: scummvm/trunk/engines/sword25/fmv/theora_decoder.h
===================================================================
--- scummvm/trunk/engines/sword25/fmv/theora_decoder.h 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/engines/sword25/fmv/theora_decoder.h 2011-02-07 17:54:16 UTC (rev 55810)
@@ -60,7 +60,7 @@
* Load a video file
* @param stream the stream to load
*/
- bool load(Common::SeekableReadStream *stream);
+ bool loadStream(Common::SeekableReadStream *stream);
void close();
void reset();
Modified: scummvm/trunk/video/avi_decoder.cpp
===================================================================
--- scummvm/trunk/video/avi_decoder.cpp 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/video/avi_decoder.cpp 2011-02-07 17:54:16 UTC (rev 55810)
@@ -234,7 +234,7 @@
_fileStream->seek(startPos + strfSize);
}
-bool AviDecoder::load(Common::SeekableReadStream *stream) {
+bool AviDecoder::loadStream(Common::SeekableReadStream *stream) {
close();
_fileStream = stream;
Modified: scummvm/trunk/video/avi_decoder.h
===================================================================
--- scummvm/trunk/video/avi_decoder.h 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/video/avi_decoder.h 2011-02-07 17:54:16 UTC (rev 55810)
@@ -174,7 +174,7 @@
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; }
Modified: scummvm/trunk/video/coktel_decoder.cpp
===================================================================
--- scummvm/trunk/video/coktel_decoder.cpp 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/video/coktel_decoder.cpp 2011-02-07 17:54:16 UTC (rev 55810)
@@ -665,7 +665,7 @@
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 @@
_y = y;
}
-bool IMDDecoder::load(Common::SeekableReadStream *stream) {
+bool IMDDecoder::loadStream(Common::SeekableReadStream *stream) {
close();
_stream = stream;
@@ -933,7 +933,7 @@
// 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 @@
openExternalCodec();
}
-bool VMDDecoder::load(Common::SeekableReadStream *stream) {
+bool VMDDecoder::loadStream(Common::SeekableReadStream *stream) {
close();
_stream = stream;
@@ -1677,12 +1677,12 @@
// 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 @@
_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;
Modified: scummvm/trunk/video/coktel_decoder.h
===================================================================
--- scummvm/trunk/video/coktel_decoder.h 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/video/coktel_decoder.h 2011-02-07 17:54:16 UTC (rev 55810)
@@ -234,7 +234,7 @@
// VideoDecoder interface
- bool load(Common::SeekableReadStream *stream);
+ bool loadStream(Common::SeekableReadStream *stream);
void close();
bool isVideoLoaded() const;
@@ -267,7 +267,7 @@
// VideoDecoder interface
- bool load(Common::SeekableReadStream *stream);
+ bool loadStream(Common::SeekableReadStream *stream);
void close();
bool isVideoLoaded() const;
@@ -371,7 +371,7 @@
// VideoDecoder interface
- bool load(Common::SeekableReadStream *stream);
+ bool loadStream(Common::SeekableReadStream *stream);
void close();
bool isVideoLoaded() const;
Modified: scummvm/trunk/video/dxa_decoder.cpp
===================================================================
--- scummvm/trunk/video/dxa_decoder.cpp 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/video/dxa_decoder.cpp 2011-02-07 17:54:16 UTC (rev 55810)
@@ -67,7 +67,7 @@
close();
}
-bool DXADecoder::load(Common::SeekableReadStream *stream) {
+bool DXADecoder::loadStream(Common::SeekableReadStream *stream) {
close();
_fileStream = stream;
Modified: scummvm/trunk/video/dxa_decoder.h
===================================================================
--- scummvm/trunk/video/dxa_decoder.h 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/video/dxa_decoder.h 2011-02-07 17:54:16 UTC (rev 55810)
@@ -43,7 +43,7 @@
DXADecoder();
virtual ~DXADecoder();
- bool load(Common::SeekableReadStream *stream);
+ bool loadStream(Common::SeekableReadStream *stream);
void close();
bool isVideoLoaded() const { return _fileStream != 0; }
Modified: scummvm/trunk/video/flic_decoder.cpp
===================================================================
--- scummvm/trunk/video/flic_decoder.cpp 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/video/flic_decoder.cpp 2011-02-07 17:54:16 UTC (rev 55810)
@@ -41,7 +41,7 @@
close();
}
-bool FlicDecoder::load(Common::SeekableReadStream *stream) {
+bool FlicDecoder::loadStream(Common::SeekableReadStream *stream) {
close();
_fileStream = stream;
Modified: scummvm/trunk/video/flic_decoder.h
===================================================================
--- scummvm/trunk/video/flic_decoder.h 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/video/flic_decoder.h 2011-02-07 17:54:16 UTC (rev 55810)
@@ -51,7 +51,7 @@
* Load a video file
* @param stream the stream to load
*/
- bool load(Common::SeekableReadStream *stream);
+ bool loadStream(Common::SeekableReadStream *stream);
void close();
/**
Modified: scummvm/trunk/video/qt_decoder.cpp
===================================================================
--- scummvm/trunk/video/qt_decoder.cpp 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/video/qt_decoder.cpp 2011-02-07 17:54:16 UTC (rev 55810)
@@ -452,7 +452,7 @@
return true;
}
-bool QuickTimeDecoder::load(Common::SeekableReadStream *stream) {
+bool QuickTimeDecoder::loadStream(Common::SeekableReadStream *stream) {
_fd = stream;
_foundMOOV = false;
_numStreams = 0;
Modified: scummvm/trunk/video/qt_decoder.h
===================================================================
--- scummvm/trunk/video/qt_decoder.h 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/video/qt_decoder.h 2011-02-07 17:54:16 UTC (rev 55810)
@@ -91,7 +91,7 @@
* 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
Modified: scummvm/trunk/video/smk_decoder.cpp
===================================================================
--- scummvm/trunk/video/smk_decoder.cpp 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/video/smk_decoder.cpp 2011-02-07 17:54:16 UTC (rev 55810)
@@ -370,7 +370,7 @@
return VideoDecoder::getElapsedTime();
}
-bool SmackerDecoder::load(Common::SeekableReadStream *stream) {
+bool SmackerDecoder::loadStream(Common::SeekableReadStream *stream) {
close();
_fileStream = stream;
Modified: scummvm/trunk/video/smk_decoder.h
===================================================================
--- scummvm/trunk/video/smk_decoder.h 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/video/smk_decoder.h 2011-02-07 17:54:16 UTC (rev 55810)
@@ -58,7 +58,7 @@
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; }
Modified: scummvm/trunk/video/video_decoder.cpp
===================================================================
--- scummvm/trunk/video/video_decoder.cpp 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/video/video_decoder.cpp 2011-02-07 17:54:16 UTC (rev 55810)
@@ -42,7 +42,7 @@
return false;
}
- return load(file);
+ return loadStream(file);
}
uint32 VideoDecoder::getElapsedTime() const {
Modified: scummvm/trunk/video/video_decoder.h
===================================================================
--- scummvm/trunk/video/video_decoder.h 2011-02-07 17:53:34 UTC (rev 55809)
+++ scummvm/trunk/video/video_decoder.h 2011-02-07 17:54:16 UTC (rev 55810)
@@ -92,7 +92,7 @@
* 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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list