[Scummvm-cvs-logs] CVS: scummvm/graphics animation.cpp,1.14,1.15 animation.h,1.9,1.10

[Robert Göffringmann]

Update of /cvsroot/scummvm/scummvm/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21535/graphics

Modified Files:
	animation.cpp animation.h 
Log Message:
added support for an international BS1 cutscene pack (which we didn't release yet)

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/animation.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- animation.cpp	28 Nov 2004 23:02:05 -0000	1.14
+++ animation.cpp	5 Dec 2004 02:55:06 -0000	1.15
@@ -46,7 +46,7 @@
 }
 
 
-bool BaseAnimationState::init(const char *name) {
+bool BaseAnimationState::init(const char *name, void *audioArg) {
 #ifdef USE_MPEG2
 	char tempFile[512];
 
@@ -130,7 +130,7 @@
 	ticks = _sys->getMillis();
 
 	// Play audio
-	bgSoundStream = AudioStream::openStreamFile(name);
+	bgSoundStream = createAudioStream(name, audioArg);
 
 	if (bgSoundStream != NULL) {
 		_snd->playInputStream(&bgSound, bgSoundStream, false, -1, 255, 0, false);
@@ -144,6 +144,10 @@
 #endif
 }
 
+AudioStream *BaseAnimationState::createAudioStream(const char *name, void *arg) {
+	return AudioStream::openStreamFile(name);
+}
+
 bool BaseAnimationState::decodeFrame() {
 #ifdef USE_MPEG2
 	mpeg2_state_t state;

Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/animation.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- animation.h	17 Oct 2004 17:57:32 -0000	1.9
+++ animation.h	5 Dec 2004 02:55:06 -0000	1.10
@@ -117,7 +117,7 @@
 	BaseAnimationState(SoundMixer *snd, OSystem *sys, int width, int height);
 	virtual ~BaseAnimationState();
 
-	bool init(const char *name);
+	bool init(const char *name, void *audioArg = NULL);
 	bool decodeFrame();
 #ifndef BACKEND_8BIT
 	void invalidateLookup(bool rebuild);
@@ -126,6 +126,7 @@
 protected:
 	bool checkPaletteSwitch();
 	virtual void drawYUV(int width, int height, byte *const *dat) = 0;
+	virtual AudioStream *createAudioStream(const char *name, void *arg);
 
 #ifdef BACKEND_8BIT
 	void buildLookup(int p, int lines);