[Scummvm-cvs-logs] CVS: scummvm/sword2/driver animation.cpp,1.64,1.65 animation.h,1.38,1.39 d_sound.cpp,1.150,1.151

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv451/sword2/driver

Modified Files:
	animation.cpp animation.h d_sound.cpp 
Log Message:
Moved some more stuff to namespace Audio (enough for tonight)

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- animation.cpp	10 May 2005 23:48:48 -0000	1.64
+++ animation.cpp	11 May 2005 00:01:38 -0000	1.65
@@ -168,7 +168,7 @@
  */
 
 int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], int32 leadInRes, int32 leadOutRes) {
-	SoundHandle leadInHandle;
+	Audio::SoundHandle leadInHandle;
 
 	// This happens if the user quits during the "eye" smacker
 	if (_vm->_quit)
@@ -246,7 +246,7 @@
 
 void MoviePlayer::playMPEG(const char *filename, MovieTextObject *text[], byte *leadOut, uint32 leadOutLen) {
 	uint frameCounter = 0, textCounter = 0;
-	SoundHandle handle;
+	Audio::SoundHandle handle;
 	bool skipCutscene = false, textVisible = false;
 	uint32 flags = Audio::Mixer::FLAG_16BITS;
 	bool startNextText = false;
@@ -452,7 +452,7 @@
 	tmpPal[255 * 4 + 2] = 255;
 	_vm->_screen->setPalette(0, 256, tmpPal, RDPAL_INSTANT);
 
-	SoundHandle handle;
+	Audio::SoundHandle handle;
 
 	bool skipCutscene = false;
 

Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- animation.h	10 May 2005 23:48:48 -0000	1.38
+++ animation.h	11 May 2005 00:01:38 -0000	1.39
@@ -78,7 +78,7 @@
 
 	byte *_textSurface;
 
-	SoundHandle _leadOutHandle;
+	Audio::SoundHandle _leadOutHandle;
 
 	uint _leadOutFrame;
 	bool _seamless;

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- d_sound.cpp	10 May 2005 23:48:48 -0000	1.150
+++ d_sound.cpp	11 May 2005 00:01:44 -0000	1.151
@@ -441,7 +441,7 @@
 
 		if (!_musicMuted) {
 			for (int j = 0; j < len; j++) {
-				clampedAdd(buffer[j], _mixBuffer[j]);
+				Audio::clampedAdd(buffer[j], _mixBuffer[j]);
 			}
 		}
 	}