[Scummvm-cvs-logs] CVS: scummvm/saga music.cpp,1.52,1.53 music.h,1.20,1.21 saga.cpp,1.108,1.109 sndres.cpp,1.42,1.43 sound.cpp,1.26,1.27 sound.h,1.18,1.19

[Max Horn]

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

Modified Files:
	music.cpp music.h saga.cpp sndres.cpp sound.cpp sound.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: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- music.cpp	10 May 2005 22:55:54 -0000	1.52
+++ music.cpp	10 May 2005 23:48:37 -0000	1.53
@@ -279,10 +279,10 @@
 	}
 }
 
-Music::Music(SoundMixer *mixer, MidiDriver *driver, int enabled) : _mixer(mixer), _enabled(enabled), _adlib(false) {
+Music::Music(Audio::Mixer *mixer, MidiDriver *driver, int enabled) : _mixer(mixer), _enabled(enabled), _adlib(false) {
 	_player = new MusicPlayer(driver);
 	_musicInitialized = 1;
-	_mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, ConfMan.getInt("music_volume"));
+	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
 
 	if (_vm->getGameType() == GType_ITE) {
 		Common::File file;
@@ -434,7 +434,7 @@
 
 	if (audioStream) {
 		debug(0, "Playing digitized music");
-		_mixer->playInputStream(SoundMixer::kMusicSoundType, &_musicHandle, audioStream);
+		_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, audioStream);
 		return SUCCESS;
 	}
 

Index: music.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- music.h	12 Mar 2005 18:55:42 -0000	1.20
+++ music.h	10 May 2005 23:48:38 -0000	1.21
@@ -106,7 +106,7 @@
 class Music {
 public:
 
-	Music(SoundMixer *mixer, MidiDriver *driver, int enabled);
+	Music(Audio::Mixer *mixer, MidiDriver *driver, int enabled);
 	~Music(void);
 	void setNativeMT32(bool b)	{ _player->setNativeMT32(b); }
 	bool hasNativeMT32()		{ return _player->hasNativeMT32(); }
@@ -122,7 +122,7 @@
 
 private:
 
-	SoundMixer *_mixer;
+	Audio::Mixer *_mixer;
 
 	MusicPlayer *_player;
 	SoundHandle _musicHandle;

Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- saga.cpp	10 May 2005 22:55:54 -0000	1.108
+++ saga.cpp	10 May 2005 23:48:38 -0000	1.109
@@ -158,8 +158,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: sndres.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sndres.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- sndres.cpp	10 May 2005 22:56:06 -0000	1.42
+++ sndres.cpp	10 May 2005 23:48:38 -0000	1.43
@@ -207,7 +207,7 @@
 		return FAILURE;
 	}
 
-	snd_buf_i->s_stereo = ((flags & SoundMixer::FLAG_STEREO) != 0);
+	snd_buf_i->s_stereo = ((flags & Audio::Mixer::FLAG_STEREO) != 0);
 	snd_buf_i->s_freq = rate;
 	snd_buf_i->s_samplebits = 16;
 	snd_buf_i->s_signed = 1;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sound.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- sound.cpp	3 May 2005 22:12:23 -0000	1.26
+++ sound.cpp	10 May 2005 23:48:38 -0000	1.27
@@ -30,7 +30,7 @@
 
 namespace Saga {
 
-Sound::Sound(SagaEngine *vm, SoundMixer *mixer, int enabled) : 
+Sound::Sound(SagaEngine *vm, Audio::Mixer *mixer, int enabled) : 
 	_vm(vm), _mixer(mixer), _enabled(enabled), _voxStream(0) {
 
 	_soundInitialized = 1;
@@ -53,20 +53,20 @@
 		return FAILURE;
 	}
 
-	flags = SoundMixer::FLAG_AUTOFREE;
+	flags = Audio::Mixer::FLAG_AUTOFREE;
 
 	if (loop)
-		flags |= SoundMixer::FLAG_LOOP;
+		flags |= Audio::Mixer::FLAG_LOOP;
 
 	if (buf->s_samplebits == 16) {
-		flags |= SoundMixer::FLAG_16BITS;
+		flags |= Audio::Mixer::FLAG_16BITS;
 		if (!(_vm->getFeatures() & GF_BIG_ENDIAN_DATA))
-			flags |= SoundMixer::FLAG_LITTLE_ENDIAN;
+			flags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
 	}
 	if (buf->s_stereo)
-		flags |= SoundMixer::FLAG_STEREO;
+		flags |= Audio::Mixer::FLAG_STEREO;
 	if (!buf->s_signed)
-		flags |= SoundMixer::FLAG_UNSIGNED;
+		flags |= Audio::Mixer::FLAG_UNSIGNED;
 
 	_mixer->playRaw(handle, buf->s_buf, buf->s_buf_len, buf->s_freq, flags, -1, volume);
 
@@ -120,7 +120,7 @@
 	_voxStream = new Common::MemoryReadStream(buf->s_buf, buf->s_buf_len);
 
 	audioStream = makeADPCMStream(*_voxStream, buf->s_buf_len, kADPCMOki);
-	_mixer->playInputStream(SoundMixer::kSFXSoundType, &_voiceHandle, audioStream);
+	_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_voiceHandle, audioStream);
 
 	return SUCCESS;
 }

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sound.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- sound.h	3 May 2005 20:36:06 -0000	1.18
+++ sound.h	10 May 2005 23:48:38 -0000	1.19
@@ -48,7 +48,7 @@
 class Sound {
 public:
 
-	Sound(SagaEngine *vm, SoundMixer *mixer, int enabled);
+	Sound(SagaEngine *vm, Audio::Mixer *mixer, int enabled);
 	~Sound();
 
 	int playSound(SOUNDBUFFER *buf, int volume, bool loop);
@@ -70,7 +70,7 @@
 	int _enabled;
 
 	SagaEngine *_vm;
-	SoundMixer *_mixer;
+	Audio::Mixer *_mixer;
 	Common::MemoryReadStream *_voxStream;
 
 	SoundHandle _effectHandle;