TITANIC: Fixes and simplification of AVISurface

1 files changed, 7 insertions, 5 deletions

diff --git a/engines/titanic/support/avi_surface.h b/engines/titanic/support/avi_surface.h
index dfd4c59267..4372757bc6 100644
--- a/engines/titanic/support/avi_surface.h
+++ b/engines/titanic/support/avi_surface.h
@@ -52,8 +52,6 @@ class AVISurface {
 private:
 	AVIDecoder *_decoders[2];
 	CVideoSurface *_videoSurface;
-	int _currentPos;
-	int _priorFrame;
 	CMovieRangeInfoList _movieRangeInfo;
 	int _streamCount;
 	Graphics::ManagedSurface *_movieFrameSurface[2];
@@ -69,9 +67,9 @@ private:
 	void setupDecompressor();
 protected:
 	/**
-	 * Change the frame with ??? checking
+	 * Start playback at the specified frame
 	 */
-	virtual bool changeFrame(int frameNumber);
+	virtual bool startAtFrame(int frameNumber);
 
 	/**
 	 * Seeks to a given frame number in the video
@@ -80,7 +78,6 @@ protected:
 public:
 	CSoundManager *_soundManager;
 	bool _hasAudio;
-	bool _isPlaying;
 	double _frameRate;
 public:
 	AVISurface(const CResourceKey &key);
@@ -107,6 +104,11 @@ public:
 	virtual void stop();
 
 	/**
+	 * Return true if a video is currently playing
+	 */
+	virtual bool isPlaying() const { return _decoders[0]->isPlaying(); }
+
+	/**
 	 * Handle any movie events relevent for the frame
 	 */
 	virtual bool handleEvents(CMovieEventList &events);