[Scummvm-cvs-logs] CVS: scummvm/gob gob.cpp,1.14,1.15 sound.cpp,1.10,1.11

[Max Horn]

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

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

Index: gob.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/gob.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gob.cpp	10 May 2005 22:55:47 -0000	1.14
+++ gob.cpp	10 May 2005 23:48:36 -0000	1.15
@@ -130,8 +130,8 @@
 		warning("Sound initialization failed.");
 	}
 
-	_mixer->setVolumeForSoundType(SoundMixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
-	_mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, ConfMan.getInt("music_volume"));
+	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
+	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
 
 	_vm = this;
 }

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/sound.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sound.cpp	6 May 2005 15:59:33 -0000	1.10
+++ sound.cpp	10 May 2005 23:48:36 -0000	1.11
@@ -114,7 +114,7 @@
 void snd_speakerOn(int16 frequency, int32 length) {
 	speakerStream.playNote(frequency, length);
 	if (!_vm->_mixer->isSoundHandleActive(speakerHandle)) {
-		_vm->_mixer->playInputStream(SoundMixer::kSFXSoundType, &speakerHandle, &speakerStream, -1, 255, 0, false);
+		_vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &speakerHandle, &speakerStream, -1, 255, 0, false);
 	}
 }