[Scummvm-cvs-logs] CVS: scummvm/sword2 sound.cpp,1.60,1.61 sound.h,1.21,1.22

[Max Horn]

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

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

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sound.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- sound.cpp	10 May 2005 23:48:48 -0000	1.60
+++ sound.cpp	11 May 2005 00:01:37 -0000	1.61
@@ -250,7 +250,7 @@
 	return playFx(&fx->handle, fx->data, fx->len, fx->volume, fx->pan, (fx->type == FX_LOOP), Audio::Mixer::kSFXSoundType);
 }
 
-int32 Sound::playFx(SoundHandle *handle, byte *data, uint32 len, uint8 vol, int8 pan, bool loop, Audio::Mixer::SoundType soundType) {
+int32 Sound::playFx(Audio::SoundHandle *handle, byte *data, uint32 len, uint8 vol, int8 pan, bool loop, Audio::Mixer::SoundType soundType) {
 	if (_fxMuted)
 		return RD_OK;
 

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sound.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- sound.h	10 May 2005 23:48:48 -0000	1.21
+++ sound.h	11 May 2005 00:01:38 -0000	1.22
@@ -172,7 +172,7 @@
 	Common::Mutex _mutex;
 
 	struct FxQueueEntry {
-		SoundHandle handle;	// sound handle
+		Audio::SoundHandle handle;	// sound handle
 		uint32 resource;		// resource id of sample
 		byte *data;			// pointer to WAV data
 		uint32 len;			// WAV data length
@@ -198,7 +198,7 @@
 
 	int32 _loopingMusicId;
 
-	SoundHandle _soundHandleSpeech;
+	Audio::SoundHandle _soundHandleSpeech;
 
 	MusicInputStream *_music[MAXMUS];
 	//Common::File _musicFile[MAXMUS];
@@ -253,7 +253,7 @@
 
 	void queueFx(int32 res, int32 type, int32 delay, int32 volume, int32 pan);
 	int32 playFx(FxQueueEntry *fx);
-	int32 playFx(SoundHandle *handle, byte *data, uint32 len, uint8 vol, int8 pan, bool loop, Audio::Mixer::SoundType soundType);
+	int32 playFx(Audio::SoundHandle *handle, byte *data, uint32 len, uint8 vol, int8 pan, bool loop, Audio::Mixer::SoundType soundType);
 	int32 stopFx(int32 i);
 	int32 setFxIdVolumePan(int32 id, int vol, int pan = 255);