[Scummvm-cvs-logs] SF.net SVN: scummvm:[54358] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Fri Nov 19 02:37:05 CET 2010
Revision: 54358
http://scummvm.svn.sourceforge.net/scummvm/?rev=54358&view=rev
Author: fingolfin
Date: 2010-11-19 01:37:04 +0000 (Fri, 19 Nov 2010)
Log Message:
-----------
ALL: Push down deps on stream.h from .h to .cpp files
Modified Paths:
--------------
scummvm/trunk/engines/agi/detection.cpp
scummvm/trunk/engines/agi/saveload.cpp
scummvm/trunk/engines/gob/videoplayer.cpp
scummvm/trunk/engines/gob/videoplayer.h
scummvm/trunk/engines/kyra/saveload.cpp
scummvm/trunk/engines/lastexpress/data/animation.cpp
scummvm/trunk/engines/lastexpress/data/animation.h
scummvm/trunk/engines/lastexpress/data/background.cpp
scummvm/trunk/engines/lastexpress/data/background.h
scummvm/trunk/engines/lastexpress/data/cursor.cpp
scummvm/trunk/engines/lastexpress/data/cursor.h
scummvm/trunk/engines/lastexpress/data/font.cpp
scummvm/trunk/engines/lastexpress/data/font.h
scummvm/trunk/engines/lastexpress/data/scene.cpp
scummvm/trunk/engines/lastexpress/data/scene.h
scummvm/trunk/engines/lastexpress/data/sequence.cpp
scummvm/trunk/engines/lastexpress/data/sequence.h
scummvm/trunk/engines/lastexpress/data/snd.h
scummvm/trunk/engines/lastexpress/data/subtitle.cpp
scummvm/trunk/engines/lastexpress/data/subtitle.h
scummvm/trunk/engines/sci/detection.cpp
scummvm/trunk/engines/sci/video/seq_decoder.cpp
scummvm/trunk/engines/sword1/detection.cpp
scummvm/trunk/graphics/dither.cpp
scummvm/trunk/graphics/dither.h
scummvm/trunk/graphics/imagedec.cpp
scummvm/trunk/graphics/imagedec.h
scummvm/trunk/graphics/jpeg.cpp
scummvm/trunk/graphics/jpeg.h
scummvm/trunk/graphics/sjis.cpp
scummvm/trunk/graphics/sjis.h
scummvm/trunk/graphics/thumbnail.cpp
scummvm/trunk/graphics/thumbnail.h
scummvm/trunk/graphics/video/codecs/codec.h
scummvm/trunk/graphics/video/codecs/mjpeg.h
scummvm/trunk/graphics/video/codecs/msrle.cpp
scummvm/trunk/graphics/video/codecs/msvideo1.cpp
scummvm/trunk/graphics/video/codecs/rpza.cpp
scummvm/trunk/graphics/video/codecs/smc.cpp
scummvm/trunk/graphics/video/codecs/truemotion1.cpp
scummvm/trunk/graphics/video/coktel_decoder.cpp
scummvm/trunk/graphics/video/coktel_decoder.h
scummvm/trunk/graphics/video/dxa_decoder.cpp
scummvm/trunk/graphics/video/qt_decoder.cpp
scummvm/trunk/graphics/video/qt_decoder.h
scummvm/trunk/graphics/video/video_decoder.h
Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/agi/detection.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -30,6 +30,7 @@
#include "common/file.h"
#include "common/savefile.h"
#include "graphics/thumbnail.h"
+#include "graphics/surface.h"
#include "agi/agi.h"
#include "agi/preagi.h"
Modified: scummvm/trunk/engines/agi/saveload.cpp
===================================================================
--- scummvm/trunk/engines/agi/saveload.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/agi/saveload.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -29,9 +29,10 @@
//
#include "common/file.h"
-#include "graphics/thumbnail.h"
#include "common/config-manager.h"
#include "common/savefile.h"
+#include "graphics/thumbnail.h"
+#include "graphics/surface.h"
#include "agi/agi.h"
#include "agi/graphics.h"
Modified: scummvm/trunk/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/gob/videoplayer.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -500,7 +500,7 @@
return video->decoder->hasEmbeddedFile(fileName);
}
-Common::MemoryReadStream *VideoPlayer::getEmbeddedFile(const Common::String &fileName, int slot) {
+Common::SeekableReadStream *VideoPlayer::getEmbeddedFile(const Common::String &fileName, int slot) {
const Video *video = getVideoBySlot(slot);
if (!video)
return 0;
Modified: scummvm/trunk/engines/gob/videoplayer.h
===================================================================
--- scummvm/trunk/engines/gob/videoplayer.h 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/gob/videoplayer.h 2010-11-19 01:37:04 UTC (rev 54358)
@@ -121,7 +121,7 @@
const Common::List<Common::Rect> *getDirtyRects(int slot = 0) const;
bool hasEmbeddedFile(const Common::String &fileName, int slot = 0) const;
- Common::MemoryReadStream *getEmbeddedFile(const Common::String &fileName, int slot = 0);
+ Common::SeekableReadStream *getEmbeddedFile(const Common::String &fileName, int slot = 0);
int32 getSubtitleIndex(int slot = 0) const;
Modified: scummvm/trunk/engines/kyra/saveload.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/kyra/saveload.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -27,6 +27,7 @@
#include "common/savefile.h"
#include "common/system.h"
#include "graphics/thumbnail.h"
+#include "graphics/surface.h"
#include "kyra/kyra_v1.h"
#include "kyra/util.h"
Modified: scummvm/trunk/engines/lastexpress/data/animation.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/data/animation.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/lastexpress/data/animation.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -35,6 +35,7 @@
#include "common/events.h"
#include "common/rational.h"
+#include "common/stream.h"
#include "engines/engine.h"
Modified: scummvm/trunk/engines/lastexpress/data/animation.h
===================================================================
--- scummvm/trunk/engines/lastexpress/data/animation.h 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/lastexpress/data/animation.h 2010-11-19 01:37:04 UTC (rev 54358)
@@ -41,8 +41,11 @@
#include "lastexpress/drawable.h"
#include "common/array.h"
-#include "common/stream.h"
+namespace Common {
+class SeekableReadStream;
+}
+
namespace LastExpress {
class AnimFrame;
Modified: scummvm/trunk/engines/lastexpress/data/background.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/data/background.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/lastexpress/data/background.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -31,6 +31,8 @@
#include "lastexpress/debug.h"
+#include "common/stream.h"
+
namespace LastExpress {
Background::Background() : _data(NULL) {
Modified: scummvm/trunk/engines/lastexpress/data/background.h
===================================================================
--- scummvm/trunk/engines/lastexpress/data/background.h 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/lastexpress/data/background.h 2010-11-19 01:37:04 UTC (rev 54358)
@@ -46,7 +46,9 @@
#include "lastexpress/drawable.h"
-#include "common/stream.h"
+namespace Common {
+class SeekableReadStream;
+}
namespace LastExpress {
Modified: scummvm/trunk/engines/lastexpress/data/cursor.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/data/cursor.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/lastexpress/data/cursor.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -27,6 +27,7 @@
#include "lastexpress/lastexpress.h"
+#include "common/stream.h"
#include "common/system.h"
#include "graphics/cursorman.h"
Modified: scummvm/trunk/engines/lastexpress/data/cursor.h
===================================================================
--- scummvm/trunk/engines/lastexpress/data/cursor.h 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/lastexpress/data/cursor.h 2010-11-19 01:37:04 UTC (rev 54358)
@@ -43,7 +43,9 @@
#include "lastexpress/shared.h"
-#include "common/stream.h"
+namespace Common {
+class SeekableReadStream;
+}
namespace LastExpress {
Modified: scummvm/trunk/engines/lastexpress/data/font.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/data/font.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/lastexpress/data/font.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -25,6 +25,7 @@
#include "lastexpress/data/font.h"
+#include "common/stream.h"
#include "common/system.h"
namespace LastExpress {
Modified: scummvm/trunk/engines/lastexpress/data/font.h
===================================================================
--- scummvm/trunk/engines/lastexpress/data/font.h 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/lastexpress/data/font.h 2010-11-19 01:37:04 UTC (rev 54358)
@@ -39,9 +39,12 @@
byte {x} - Unknown data (probably just garbage)
*/
-#include "common/stream.h"
#include "graphics/surface.h"
+namespace Common {
+class SeekableReadStream;
+}
+
namespace LastExpress {
class Font {
Modified: scummvm/trunk/engines/lastexpress/data/scene.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/data/scene.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/lastexpress/data/scene.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -31,6 +31,8 @@
#include "lastexpress/lastexpress.h"
#include "lastexpress/resource.h"
+#include "common/stream.h"
+
namespace LastExpress {
SceneHotspot::~SceneHotspot() {
Modified: scummvm/trunk/engines/lastexpress/data/scene.h
===================================================================
--- scummvm/trunk/engines/lastexpress/data/scene.h 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/lastexpress/data/scene.h 2010-11-19 01:37:04 UTC (rev 54358)
@@ -72,8 +72,11 @@
#include "lastexpress/shared.h"
#include "common/array.h"
-#include "common/stream.h"
+namespace Common {
+class SeekableReadStream;
+}
+
namespace LastExpress {
class Scene;
Modified: scummvm/trunk/engines/lastexpress/data/sequence.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/data/sequence.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/lastexpress/data/sequence.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -29,6 +29,8 @@
#include "lastexpress/debug.h"
+#include "common/stream.h"
+
namespace LastExpress {
void FrameInfo::read(Common::SeekableReadStream *in, bool isSequence) {
Modified: scummvm/trunk/engines/lastexpress/data/sequence.h
===================================================================
--- scummvm/trunk/engines/lastexpress/data/sequence.h 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/lastexpress/data/sequence.h 2010-11-19 01:37:04 UTC (rev 54358)
@@ -77,8 +77,11 @@
#include "lastexpress/shared.h"
#include "common/array.h"
-#include "common/stream.h"
+namespace Common {
+class SeekableReadStream;
+}
+
namespace LastExpress {
enum FrameSubType {
Modified: scummvm/trunk/engines/lastexpress/data/snd.h
===================================================================
--- scummvm/trunk/engines/lastexpress/data/snd.h 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/lastexpress/data/snd.h 2010-11-19 01:37:04 UTC (rev 54358)
@@ -39,7 +39,6 @@
byte {x} - IMA ADPCM sample codes
*/
-#include "common/stream.h"
#include "sound/mixer.h"
namespace Audio {
@@ -47,6 +46,10 @@
class QueuingAudioStream;
}
+namespace Common {
+class SeekableReadStream;
+}
+
namespace LastExpress {
class SimpleSound {
Modified: scummvm/trunk/engines/lastexpress/data/subtitle.cpp
===================================================================
--- scummvm/trunk/engines/lastexpress/data/subtitle.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/lastexpress/data/subtitle.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -33,6 +33,7 @@
#include "lastexpress/debug.h"
#include "common/debug.h"
+#include "common/stream.h"
namespace LastExpress {
Modified: scummvm/trunk/engines/lastexpress/data/subtitle.h
===================================================================
--- scummvm/trunk/engines/lastexpress/data/subtitle.h 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/lastexpress/data/subtitle.h 2010-11-19 01:37:04 UTC (rev 54358)
@@ -45,8 +45,11 @@
#include "lastexpress/drawable.h"
#include "common/array.h"
-#include "common/stream.h"
+namespace Common {
+class SeekableReadStream;
+}
+
namespace LastExpress {
class Font;
Modified: scummvm/trunk/engines/sci/detection.cpp
===================================================================
--- scummvm/trunk/engines/sci/detection.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/sci/detection.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -29,6 +29,7 @@
#include "common/savefile.h"
#include "common/system.h"
#include "graphics/thumbnail.h"
+#include "graphics/surface.h"
#include "sci/sci.h"
#include "sci/engine/kernel.h"
Modified: scummvm/trunk/engines/sci/video/seq_decoder.cpp
===================================================================
--- scummvm/trunk/engines/sci/video/seq_decoder.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/sci/video/seq_decoder.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -26,6 +26,7 @@
#include "common/debug.h"
#include "common/endian.h"
#include "common/archive.h"
+#include "common/stream.h"
#include "common/system.h"
#include "common/util.h"
Modified: scummvm/trunk/engines/sword1/detection.cpp
===================================================================
--- scummvm/trunk/engines/sword1/detection.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/engines/sword1/detection.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -33,6 +33,7 @@
#include "common/savefile.h"
#include "common/system.h"
#include "graphics/thumbnail.h"
+#include "graphics/surface.h"
#include "engines/metaengine.h"
Modified: scummvm/trunk/graphics/dither.cpp
===================================================================
--- scummvm/trunk/graphics/dither.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/dither.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -22,9 +22,11 @@
* $Id$
*/
-#include "common/endian.h"
#include "graphics/dither.h"
+#include "common/endian.h"
+#include "common/stream.h"
+
namespace Graphics {
PaletteLUT::PaletteLUT(byte depth, PaletteFormat format) {
Modified: scummvm/trunk/graphics/dither.h
===================================================================
--- scummvm/trunk/graphics/dither.h 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/dither.h 2010-11-19 01:37:04 UTC (rev 54358)
@@ -26,8 +26,12 @@
#define GRAPHICS_DITHER_H
#include "common/util.h"
-#include "common/stream.h"
+namespace Common {
+class SeekableReadStream;
+class WriteStream;
+}
+
namespace Graphics {
/** A palette lookup table to find the nearest matching entry of a fixed palette to a true color.
Modified: scummvm/trunk/graphics/imagedec.cpp
===================================================================
--- scummvm/trunk/graphics/imagedec.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/imagedec.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -23,6 +23,7 @@
*/
#include "graphics/imagedec.h"
+#include "graphics/surface.h"
#include "common/file.h"
Modified: scummvm/trunk/graphics/imagedec.h
===================================================================
--- scummvm/trunk/graphics/imagedec.h 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/imagedec.h 2010-11-19 01:37:04 UTC (rev 54358)
@@ -27,13 +27,17 @@
#include "common/scummsys.h"
#include "common/str.h"
-#include "common/stream.h"
-#include "graphics/surface.h"
#include "graphics/pixelformat.h"
+namespace Common{
+class SeekableReadStream;
+}
+
namespace Graphics {
+struct Surface;
+
class ImageDecoder {
public:
ImageDecoder() {}
Modified: scummvm/trunk/graphics/jpeg.cpp
===================================================================
--- scummvm/trunk/graphics/jpeg.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/jpeg.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -27,6 +27,7 @@
#include "common/endian.h"
#include "common/util.h"
+#include "common/stream.h"
namespace Graphics {
Modified: scummvm/trunk/graphics/jpeg.h
===================================================================
--- scummvm/trunk/graphics/jpeg.h 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/jpeg.h 2010-11-19 01:37:04 UTC (rev 54358)
@@ -26,9 +26,12 @@
#ifndef GRAPHICS_JPEG_H
#define GRAPHICS_JPEG_H
-#include "common/stream.h"
#include "graphics/surface.h"
+namespace Common {
+class SeekableReadStream;
+}
+
namespace Graphics {
#define JPEG_MAX_QUANT_TABLES 4
Modified: scummvm/trunk/graphics/sjis.cpp
===================================================================
--- scummvm/trunk/graphics/sjis.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/sjis.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -29,7 +29,10 @@
#include "common/debug.h"
#include "common/archive.h"
#include "common/endian.h"
+#include "common/stream.h"
+#include "graphics/surface.h"
+
namespace Graphics {
FontSJIS *FontSJIS::createFont(const Common::Platform platform) {
@@ -52,6 +55,10 @@
return 0;
}
+void FontSJIS::drawChar(Graphics::Surface &dst, uint16 ch, int x, int y, uint32 c1, uint32 c2) const {
+ drawChar(dst.getBasePtr(x, y), ch, dst.pitch, dst.bytesPerPixel, c1, c2, dst.w - x, dst.h - y);
+}
+
template<typename Color>
void FontSJISBase::blitCharacter(const uint8 *glyph, const int w, const int h, uint8 *dst, int pitch, Color c) const {
for (int y = 0; y < h; ++y) {
Modified: scummvm/trunk/graphics/sjis.h
===================================================================
--- scummvm/trunk/graphics/sjis.h 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/sjis.h 2010-11-19 01:37:04 UTC (rev 54358)
@@ -46,13 +46,12 @@
#endif
#include "common/scummsys.h"
-#include "common/stream.h"
#include "common/util.h"
-#include "graphics/surface.h"
-
namespace Graphics {
+struct Surface;
+
/**
* A font that is able to draw SJIS encoded characters.
*/
@@ -116,9 +115,7 @@
/**
* Draws a SJIS encoded character on the given surface.
*/
- void drawChar(Graphics::Surface &dst, uint16 ch, int x, int y, uint32 c1, uint32 c2) const {
- drawChar(dst.getBasePtr(x, y), ch, dst.pitch, dst.bytesPerPixel, c1, c2, dst.w - x, dst.h - y);
- }
+ void drawChar(Graphics::Surface &dst, uint16 ch, int x, int y, uint32 c1, uint32 c2) const;
/**
* Draws a SJIS char on the given raw buffer.
Modified: scummvm/trunk/graphics/thumbnail.cpp
===================================================================
--- scummvm/trunk/graphics/thumbnail.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/thumbnail.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -27,6 +27,7 @@
#include "graphics/colormasks.h"
#include "common/endian.h"
#include "common/system.h"
+#include "common/stream.h"
namespace Graphics {
Modified: scummvm/trunk/graphics/thumbnail.h
===================================================================
--- scummvm/trunk/graphics/thumbnail.h 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/thumbnail.h 2010-11-19 01:37:04 UTC (rev 54358)
@@ -25,11 +25,17 @@
#ifndef GRAPHICS_THUMBNAIL_H
#define GRAPHICS_THUMBNAIL_H
-#include "common/stream.h"
-#include "graphics/surface.h"
+#include "common/scummsys.h"
+namespace Common{
+class SeekableReadStream;
+class WriteStream;
+}
+
namespace Graphics {
+struct Surface;
+
/**
* Checks for presence of the thumbnail save header.
* Seeks automatically back to start position after check.
Modified: scummvm/trunk/graphics/video/codecs/codec.h
===================================================================
--- scummvm/trunk/graphics/video/codecs/codec.h 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/video/codecs/codec.h 2010-11-19 01:37:04 UTC (rev 54358)
@@ -26,10 +26,13 @@
#ifndef GRAPHICS_CODEC_H
#define GRAPHICS_CODEC_H
-#include "common/stream.h"
#include "graphics/surface.h"
#include "graphics/pixelformat.h"
+namespace Common{
+class SeekableReadStream;
+}
+
namespace Graphics {
class Codec {
Modified: scummvm/trunk/graphics/video/codecs/mjpeg.h
===================================================================
--- scummvm/trunk/graphics/video/codecs/mjpeg.h 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/video/codecs/mjpeg.h 2010-11-19 01:37:04 UTC (rev 54358)
@@ -27,7 +27,6 @@
#define GRAPHICS_MJPEG_H
#include "common/scummsys.h"
-#include "common/stream.h"
#include "graphics/video/codecs/codec.h"
#include "graphics/jpeg.h"
Modified: scummvm/trunk/graphics/video/codecs/msrle.cpp
===================================================================
--- scummvm/trunk/graphics/video/codecs/msrle.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/video/codecs/msrle.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -26,6 +26,7 @@
// Based off ffmpeg's msrledec.c
#include "graphics/video/codecs/msrle.h"
+#include "common/stream.h"
namespace Graphics {
Modified: scummvm/trunk/graphics/video/codecs/msvideo1.cpp
===================================================================
--- scummvm/trunk/graphics/video/codecs/msvideo1.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/video/codecs/msvideo1.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -26,6 +26,7 @@
// Based off ffmpeg's msvideo.cpp
#include "graphics/video/codecs/msvideo1.h"
+#include "common/stream.h"
namespace Graphics {
Modified: scummvm/trunk/graphics/video/codecs/rpza.cpp
===================================================================
--- scummvm/trunk/graphics/video/codecs/rpza.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/video/codecs/rpza.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -28,6 +28,7 @@
#include "graphics/video/codecs/rpza.h"
#include "common/system.h"
+#include "common/stream.h"
#include "graphics/colormasks.h"
namespace Graphics {
Modified: scummvm/trunk/graphics/video/codecs/smc.cpp
===================================================================
--- scummvm/trunk/graphics/video/codecs/smc.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/video/codecs/smc.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -26,6 +26,7 @@
// Based off ffmpeg's SMC decoder
#include "graphics/video/codecs/smc.h"
+#include "common/stream.h"
namespace Graphics {
Modified: scummvm/trunk/graphics/video/codecs/truemotion1.cpp
===================================================================
--- scummvm/trunk/graphics/video/codecs/truemotion1.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/video/codecs/truemotion1.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -30,6 +30,7 @@
#ifdef GRAPHICS_TRUEMOTION1_H
#include "graphics/video/codecs/truemotion1data.h"
+#include "common/stream.h"
namespace Graphics {
Modified: scummvm/trunk/graphics/video/coktel_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/coktel_decoder.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/video/coktel_decoder.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -31,6 +31,7 @@
#include "sound/audiostream.h"
#include "sound/decoders/raw.h"
+#include "common/stream.h"
static const uint32 kVideoCodecIndeo3 = MKID_BE('iv32');
@@ -219,7 +220,7 @@
return false;
}
-Common::MemoryReadStream *CoktelDecoder::getEmbeddedFile(const Common::String &fileName) const {
+Common::SeekableReadStream *CoktelDecoder::getEmbeddedFile(const Common::String &fileName) const {
return 0;
}
@@ -2440,7 +2441,7 @@
return false;
}
-Common::MemoryReadStream *VMDDecoder::getEmbeddedFile(const Common::String &fileName) const {
+Common::SeekableReadStream *VMDDecoder::getEmbeddedFile(const Common::String &fileName) const {
const File *file = 0;
for (Common::Array<File>::const_iterator it = _files.begin(); it != _files.end(); ++it)
Modified: scummvm/trunk/graphics/video/coktel_decoder.h
===================================================================
--- scummvm/trunk/graphics/video/coktel_decoder.h 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/video/coktel_decoder.h 2010-11-19 01:37:04 UTC (rev 54358)
@@ -108,7 +108,7 @@
virtual bool hasEmbeddedFile(const Common::String &fileName) const;
/** Return that embedded file. */
- virtual Common::MemoryReadStream *getEmbeddedFile(const Common::String &fileName) const;
+ virtual Common::SeekableReadStream *getEmbeddedFile(const Common::String &fileName) const;
/** Return the current subtitle index. */
virtual int32 getSubtitleIndex() const;
@@ -352,7 +352,7 @@
bool hasEmbeddedFiles() const;
bool hasEmbeddedFile(const Common::String &fileName) const;
- Common::MemoryReadStream *getEmbeddedFile(const Common::String &fileName) const;
+ Common::SeekableReadStream *getEmbeddedFile(const Common::String &fileName) const;
int32 getSubtitleIndex() const;
Modified: scummvm/trunk/graphics/video/dxa_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/dxa_decoder.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/video/dxa_decoder.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -27,6 +27,7 @@
#include "common/endian.h"
#include "common/archive.h"
#include "common/system.h"
+#include "common/stream.h"
#include "common/util.h"
#include "graphics/video/dxa_decoder.h"
Modified: scummvm/trunk/graphics/video/qt_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/qt_decoder.cpp 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/video/qt_decoder.cpp 2010-11-19 01:37:04 UTC (rev 54358)
@@ -1331,4 +1331,23 @@
}
}
+QuickTimeDecoder::MOVStreamContext::MOVStreamContext() {
+ // FIXME: Setting all members to 0 via memset is a hack -- it works
+ // because the only non-POD member of MOVStreamContext is of type
+ // Common::Rational, and that luckily has no virtual methods nor
+ // does it keep internal pointers or anything like that. But watch
+ // out if you ever extend MOVStreamContext!
+ memset(this, 0, sizeof(MOVStreamContext));
+}
+
+QuickTimeDecoder::MOVStreamContext::~MOVStreamContext() {
+ delete[] chunk_offsets;
+ delete[] stts_data;
+ delete[] ctts_data;
+ delete[] sample_to_chunk;
+ delete[] sample_sizes;
+ delete[] keyframes;
+ delete extradata;
+}
+
} // End of namespace Graphics
Modified: scummvm/trunk/graphics/video/qt_decoder.h
===================================================================
--- scummvm/trunk/graphics/video/qt_decoder.h 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/video/qt_decoder.h 2010-11-19 01:37:04 UTC (rev 54358)
@@ -155,16 +155,8 @@
};
struct MOVStreamContext {
- MOVStreamContext() { memset(this, 0, sizeof(MOVStreamContext)); }
- ~MOVStreamContext() {
- delete[] chunk_offsets;
- delete[] stts_data;
- delete[] ctts_data;
- delete[] sample_to_chunk;
- delete[] sample_sizes;
- delete[] keyframes;
- delete extradata;
- }
+ MOVStreamContext();
+ ~MOVStreamContext();
int ffindex; /* the ffmpeg stream id */
int is_ff_stream; /* Is this stream presented to ffmpeg ? i.e. is this an audio or video stream ? */
Modified: scummvm/trunk/graphics/video/video_decoder.h
===================================================================
--- scummvm/trunk/graphics/video/video_decoder.h 2010-11-19 01:03:05 UTC (rev 54357)
+++ scummvm/trunk/graphics/video/video_decoder.h 2010-11-19 01:37:04 UTC (rev 54358)
@@ -29,7 +29,6 @@
#include "common/events.h"
#include "common/list.h"
#include "common/rational.h"
-#include "common/stream.h"
#include "graphics/surface.h"
#include "graphics/pixelformat.h"
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