[Scummvm-cvs-logs] SF.net SVN: scummvm:[35817] scummvm/trunk/graphics/video/video_player.h

[thebluegr at users.sourceforge.net]

Revision: 35817
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35817&view=rev
Author:   thebluegr
Date:     2009-01-11 04:20:59 +0000 (Sun, 11 Jan 2009)

Log Message:
-----------
Fixed compilation

Modified Paths:
--------------
    scummvm/trunk/graphics/video/video_player.h

Modified: scummvm/trunk/graphics/video/video_player.h
===================================================================
--- scummvm/trunk/graphics/video/video_player.h	2009-01-11 03:34:50 UTC (rev 35816)
+++ scummvm/trunk/graphics/video/video_player.h	2009-01-11 04:20:59 UTC (rev 35817)
@@ -26,9 +26,9 @@
 #ifndef GRAPHICS_VIDEO_PLAYER_H
 #define GRAPHICS_VIDEO_PLAYER_H
 
-#include "common/scummsys.h"
 #include "common/events.h"
 #include "common/list.h"
+#include "common/stream.h"
 
 namespace Common {
 	class SeekableReadStream;
@@ -119,12 +119,12 @@
 	/**
 	 * Return the black palette color for the current frame
 	 */
-	byte getBlack() { return _black; }
+	byte getBlack() { return _curFrameBlack; }
 
 	/**
 	 * Return the white palette color for the current frame
 	 */
-	byte getWhite() { return _white; }
+	byte getWhite() { return _curFrameWhite; }
 
 	/**
 	 * Copy current frame into the specified position of the destination
@@ -152,7 +152,7 @@
 		uint32 startTime;
 	} _videoInfo;
 
-	byte _black, _white;
+	byte _curFrameBlack, _curFrameWhite;
 
 	Common::SeekableReadStream *_fileStream;
 	byte *_videoFrameBuffer;
@@ -162,7 +162,7 @@
 public:
 	VideoPlayer(VideoDecoder* decoder) : _skipVideo(false), _decoder(decoder)
 		{ }
-	~VideoPlayer() { }
+	virtual ~VideoPlayer() { }
 	/**
 	 * A default implementation of a video player
 	 * Plays a non-interactive full screen video till it's stopped by a


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.