[Scummvm-cvs-logs] CVS: scummvm/graphics animation.cpp,1.29,1.30 animation.h,1.16,1.17

[Max Horn]

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

Modified Files:
	animation.cpp animation.h 
Log Message:
Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name)

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/animation.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- animation.cpp	10 May 2005 22:55:47 -0000	1.29
+++ animation.cpp	10 May 2005 23:48:36 -0000	1.30
@@ -30,7 +30,7 @@
 
 namespace Graphics {
 
-BaseAnimationState::BaseAnimationState(SoundMixer *snd, OSystem *sys, int width, int height) 
+BaseAnimationState::BaseAnimationState(Audio::Mixer *snd, OSystem *sys, int width, int height) 
 	: _movieWidth(width), _movieHeight(height), _snd(snd), _sys(sys) {
 #ifndef BACKEND_8BIT
 	_colorTab = NULL;
@@ -143,7 +143,7 @@
 	_bgSoundStream = createAudioStream(name, audioArg);
 
 	if (_bgSoundStream != NULL) {
-		_snd->playInputStream(SoundMixer::kSFXSoundType, &_bgSound, _bgSoundStream, -1, 255, 0, false);
+		_snd->playInputStream(Audio::Mixer::kSFXSoundType, &_bgSound, _bgSoundStream, -1, 255, 0, false);
 	} else {
 		warning("Cutscene: Could not open Audio Track for %s", name);
 	}

Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/animation.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- animation.h	10 May 2005 22:55:47 -0000	1.16
+++ animation.h	10 May 2005 23:48:36 -0000	1.17
@@ -74,7 +74,7 @@
 	const int _movieWidth;
 	const int _movieHeight;
 	
-	SoundMixer *_snd;
+	Audio::Mixer *_snd;
 	OSystem *_sys;
 
 	uint _frameNum;
@@ -117,7 +117,7 @@
 #endif
 
 public:
-	BaseAnimationState(SoundMixer *snd, OSystem *sys, int width, int height);
+	BaseAnimationState(Audio::Mixer *snd, OSystem *sys, int width, int height);
 	virtual ~BaseAnimationState();
 
 	bool init(const char *name, void *audioArg = NULL);