[Scummvm-cvs-logs] CVS: scummvm/saga music.h,1.21,1.22 sound.cpp,1.27,1.28 sound.h,1.19,1.20

[Max Horn]

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

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

Index: music.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- music.h	10 May 2005 23:48:38 -0000	1.21
+++ music.h	11 May 2005 00:01:25 -0000	1.22
@@ -125,7 +125,7 @@
 	Audio::Mixer *_mixer;
 
 	MusicPlayer *_player;
-	SoundHandle _musicHandle;
+	Audio::SoundHandle _musicHandle;
 	uint32 _trackNumber;
 
 	static const MUSIC_MIDITABLE _midiTableITECD[26];

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sound.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- sound.cpp	10 May 2005 23:48:38 -0000	1.27
+++ sound.cpp	11 May 2005 00:01:26 -0000	1.28
@@ -46,7 +46,7 @@
 	_soundInitialized = 0;
 }
 
-int Sound::playSoundBuffer(SoundHandle *handle, SOUNDBUFFER *buf, int volume, bool loop) {
+int Sound::playSoundBuffer(Audio::SoundHandle *handle, SOUNDBUFFER *buf, int volume, bool loop) {
 	byte flags;
 
 	if (!_soundInitialized) {

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sound.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- sound.h	10 May 2005 23:48:38 -0000	1.19
+++ sound.h	11 May 2005 00:01:26 -0000	1.20
@@ -64,7 +64,7 @@
 
  private:
 
-	int playSoundBuffer(SoundHandle *handle, SOUNDBUFFER *buf, int volume, bool loop);
+	int playSoundBuffer(Audio::SoundHandle *handle, SOUNDBUFFER *buf, int volume, bool loop);
 
 	int _soundInitialized;
 	int _enabled;
@@ -73,8 +73,8 @@
 	Audio::Mixer *_mixer;
 	Common::MemoryReadStream *_voxStream;
 
-	SoundHandle _effectHandle;
-	SoundHandle _voiceHandle;
+	Audio::SoundHandle _effectHandle;
+	Audio::SoundHandle _voiceHandle;
 
 };