Now that the cutscene handling in both BS1 and BS2 has been extended to play

DXA movies (the MPEG movies still work, of course), there is no longer any need
for the MPEG decoder to handle sound and frame syncing. That is now the
responsibility of the player, not the decoder.

The obvious next step, then, would be to put that in a new player class, and
have both BS1 and BS2 use that. Maybe FF as well.

svn-id: r23757

1 files changed, 4 insertions, 15 deletions

diff --git a/graphics/animation.h b/graphics/animation.h
index 1881f0149c..aff644d2d3 100644
--- a/graphics/animation.h
+++ b/graphics/animation.h
@@ -25,12 +25,6 @@
 
 #include "common/scummsys.h"
 
-#include "sound/mixer.h"
-
-namespace Audio {
-	class AudioStream;
-}
-
 // Uncomment this if you are using libmpeg2 0.3.1.
 // #define USE_MPEG2_0_3_1
 
@@ -72,6 +66,8 @@ namespace Common {
 	class File;
 }
 
+class OSystem;
+
 namespace Graphics {
 
 class BaseAnimationState {
@@ -86,12 +82,9 @@ protected:
 	int _movieScale;
 #endif
 
-	Audio::Mixer *_snd;
 	OSystem *_sys;
 
 	uint _frameNum;
-	uint _frameSkipped;
-	uint32 _ticks;
 
 #ifdef USE_MPEG2
 	mpeg2dec_t *_mpegDecoder;
@@ -100,9 +93,6 @@ protected:
 
 	Common::File *_mpegFile;
 
-	Audio::SoundHandle _bgSound;
-	Audio::AudioStream *_bgSoundStream;
-
 #ifdef BACKEND_8BIT
 	int _palNum;
 	int _maxPalNum;
@@ -129,10 +119,10 @@ protected:
 #endif
 
 public:
-	BaseAnimationState(Audio::Mixer *snd, OSystem *sys, int width, int height);
+	BaseAnimationState(OSystem *sys, int width, int height);
 	virtual ~BaseAnimationState();
 
-	bool init(const char *name, void *audioArg = NULL);
+	bool init(const char *name);
 	bool decodeFrame();
 	void handleScreenChanged();
 	void updateScreen();
@@ -147,7 +137,6 @@ public:
 protected:
 	bool checkPaletteSwitch();
 	virtual void drawYUV(int width, int height, byte *const *dat) = 0;
-	virtual Audio::AudioStream *createAudioStream(const char *name, void *arg);
 
 #ifdef BACKEND_8BIT
 	void buildLookup(int p, int lines);