[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.127,1.128 dimuse_script.cpp,1.34,1.35 dimuse_track.cpp,1.49,1.50

[Max Horn]

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

Modified Files:
	dimuse.cpp dimuse_script.cpp dimuse_track.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: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- dimuse.cpp	26 Apr 2005 13:17:09 -0000	1.127
+++ dimuse.cpp	10 May 2005 23:48:40 -0000	1.128
@@ -171,19 +171,19 @@
 			track->iteration = freq * channels;
 			track->mixerFlags = 0;
 			if (channels == 2)
-				track->mixerFlags = SoundMixer::FLAG_STEREO | SoundMixer::FLAG_REVERSE_STEREO;
+				track->mixerFlags = Audio::Mixer::FLAG_STEREO | Audio::Mixer::FLAG_REVERSE_STEREO;
 
 			if ((bits == 12) || (bits == 16)) {
-				track->mixerFlags |= SoundMixer::FLAG_16BITS;
+				track->mixerFlags |= Audio::Mixer::FLAG_16BITS;
 				track->iteration *= 2;
 			} else if (bits == 8) {
-				track->mixerFlags |= SoundMixer::FLAG_UNSIGNED;
+				track->mixerFlags |= Audio::Mixer::FLAG_UNSIGNED;
 			} else
 				error("IMuseDigital::saveOrLoad(): Can't handle %d bit samples", bits);
 
 #ifdef SCUMM_LITTLE_ENDIAN
 			if (track->compressed)
-				track->mixerFlags |= SoundMixer::FLAG_LITTLE_ENDIAN;
+				track->mixerFlags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
 #endif
 
 			int32 streamBufferSize = track->iteration;
@@ -192,14 +192,14 @@
 
 			const int pan = (track->pan != 64) ? 2 * track->pan - 127 : 0;
 			const int vol = track->vol / 1000;
-			SoundMixer::SoundType type = SoundMixer::kPlainSoundType;
+			Audio::Mixer::SoundType type = Audio::Mixer::kPlainSoundType;
 
 			if (track->volGroupId == 1)
-				type = SoundMixer::kSpeechSoundType;
+				type = Audio::Mixer::kSpeechSoundType;
 			if (track->volGroupId == 2)
-				type = SoundMixer::kSFXSoundType;
+				type = Audio::Mixer::kSFXSoundType;
 			if (track->volGroupId == 3)
-				type = SoundMixer::kMusicSoundType;
+				type = Audio::Mixer::kMusicSoundType;
 
 			_vm->_mixer->playInputStream(type, &track->handle, track->stream, -1, vol, pan, false);
 		}
@@ -246,14 +246,14 @@
 
 			const int pan = (track->pan != 64) ? 2 * track->pan - 127 : 0;
 			const int vol = track->vol / 1000;
-			SoundMixer::SoundType type = SoundMixer::kPlainSoundType;
+			Audio::Mixer::SoundType type = Audio::Mixer::kPlainSoundType;
 
 			if (track->volGroupId == 1)
-				type = SoundMixer::kSpeechSoundType;
+				type = Audio::Mixer::kSpeechSoundType;
 			if (track->volGroupId == 2)
-				type = SoundMixer::kSFXSoundType;
+				type = Audio::Mixer::kSFXSoundType;
 			if (track->volGroupId == 3)
-				type = SoundMixer::kMusicSoundType;
+				type = Audio::Mixer::kMusicSoundType;
 
 			if (track->stream) {
 				byte *data = NULL;

Index: dimuse_script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_script.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- dimuse_script.cpp	8 May 2005 21:49:46 -0000	1.34
+++ dimuse_script.cpp	10 May 2005 23:48:41 -0000	1.35
@@ -170,7 +170,7 @@
 	 				track->stream->finish();
 	 			}
 				if (track->stream->endOfStream()
-						|| _vm->_mixer->isPaused() // hack for paused SoundMixer
+						|| _vm->_mixer->isPaused() // hack for paused Mixer
 						|| _vm->_insaneRunning) { // INSANE hack for sync timer mode
 					_vm->_mixer->stopHandle(track->handle);
 					delete track->stream;

Index: dimuse_track.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_track.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- dimuse_track.cpp	8 Apr 2005 20:51:34 -0000	1.49
+++ dimuse_track.cpp	10 May 2005 23:48:41 -0000	1.50
@@ -140,19 +140,19 @@
 
 		track->iteration = freq * channels;
 		if (channels == 2)
-			track->mixerFlags = SoundMixer::FLAG_STEREO | SoundMixer::FLAG_REVERSE_STEREO;
+			track->mixerFlags = Audio::Mixer::FLAG_STEREO | Audio::Mixer::FLAG_REVERSE_STEREO;
 
 		if ((bits == 12) || (bits == 16)) {
-			track->mixerFlags |= SoundMixer::FLAG_16BITS;
+			track->mixerFlags |= Audio::Mixer::FLAG_16BITS;
 			track->iteration *= 2;
 		} else if (bits == 8) {
-			track->mixerFlags |= SoundMixer::FLAG_UNSIGNED;
+			track->mixerFlags |= Audio::Mixer::FLAG_UNSIGNED;
 		} else
 			error("IMuseDigital::startSound(): Can't handle %d bit samples", bits);
 
 #ifdef SCUMM_LITTLE_ENDIAN
 		if (track->compressed)
-			track->mixerFlags |= SoundMixer::FLAG_LITTLE_ENDIAN;
+			track->mixerFlags |= Audio::Mixer::FLAG_LITTLE_ENDIAN;
 #endif
 	}
 
@@ -163,14 +163,14 @@
 	} else {
 		const int pan = (track->pan != 64) ? 2 * track->pan - 127 : 0;
 		const int vol = track->vol / 1000;
-		SoundMixer::SoundType type = SoundMixer::kPlainSoundType;
+		Audio::Mixer::SoundType type = Audio::Mixer::kPlainSoundType;
 
 		if (track->volGroupId == 1)
-			type = SoundMixer::kSpeechSoundType;
+			type = Audio::Mixer::kSpeechSoundType;
 		if (track->volGroupId == 2)
-			type = SoundMixer::kSFXSoundType;
+			type = Audio::Mixer::kSFXSoundType;
 		if (track->volGroupId == 3)
-			type = SoundMixer::kMusicSoundType;
+			type = Audio::Mixer::kMusicSoundType;
 
 		// setup 1 second stream wrapped buffer
 		int32 streamBufferSize = track->iteration;
@@ -340,14 +340,14 @@
 	fadeTrack->volFadeStep = (fadeTrack->volFadeDest - fadeTrack->vol) * 60 * (1000 / _callbackFps) / (1000 * fadeDelay);
 	fadeTrack->volFadeUsed = true;
 
-	SoundMixer::SoundType type = SoundMixer::kPlainSoundType;
+	Audio::Mixer::SoundType type = Audio::Mixer::kPlainSoundType;
 
 	if (fadeTrack->volGroupId == 1)
-		type = SoundMixer::kSpeechSoundType;
+		type = Audio::Mixer::kSpeechSoundType;
 	if (fadeTrack->volGroupId == 2)
-		type = SoundMixer::kSFXSoundType;
+		type = Audio::Mixer::kSFXSoundType;
 	if (fadeTrack->volGroupId == 3)
-		type = SoundMixer::kMusicSoundType;
+		type = Audio::Mixer::kMusicSoundType;
 
 	// setup 1 second stream wrapped buffer
 	int32 streamBufferSize = fadeTrack->iteration;