[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.123,1.124 dimuse_track.cpp,1.45,1.46

Max Horn fingolfin at users.sourceforge.net
Wed Mar 9 10:14:19 CET 2005


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

Modified Files:
	dimuse.cpp dimuse_track.cpp 
Log Message:
changing AudioDataType -> SoundType, so now the constant names match the name of the data type / the SoundMixer method names

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- dimuse.cpp	6 Mar 2005 23:16:45 -0000	1.123
+++ dimuse.cpp	9 Mar 2005 18:12:43 -0000	1.124
@@ -187,14 +187,14 @@
 
 			const int pan = (track->pan != 64) ? 2 * track->pan - 127 : 0;
 			const int vol = track->vol / 1000;
-			SoundMixer::SoundType type = SoundMixer::kPlainAudioDataType;
+			SoundMixer::SoundType type = SoundMixer::kPlainSoundType;
 
 			if (track->volGroupId == 1)
-				type = SoundMixer::kSpeechAudioDataType;
+				type = SoundMixer::kSpeechSoundType;
 			if (track->volGroupId == 2)
-				type = SoundMixer::kSFXAudioDataType;
+				type = SoundMixer::kSFXSoundType;
 			if (track->volGroupId == 3)
-				type = SoundMixer::kMusicAudioDataType;
+				type = SoundMixer::kMusicSoundType;
 
 			_vm->_mixer->playInputStream(type, &track->handle, track->stream, -1, vol, pan, false);
 		}
@@ -241,14 +241,14 @@
 
 			const int pan = (track->pan != 64) ? 2 * track->pan - 127 : 0;
 			const int vol = track->vol / 1000;
-			SoundMixer::SoundType type = SoundMixer::kPlainAudioDataType;
+			SoundMixer::SoundType type = SoundMixer::kPlainSoundType;
 
 			if (track->volGroupId == 1)
-				type = SoundMixer::kSpeechAudioDataType;
+				type = SoundMixer::kSpeechSoundType;
 			if (track->volGroupId == 2)
-				type = SoundMixer::kSFXAudioDataType;
+				type = SoundMixer::kSFXSoundType;
 			if (track->volGroupId == 3)
-				type = SoundMixer::kMusicAudioDataType;
+				type = SoundMixer::kMusicSoundType;
 
 			if (track->stream) {
 				byte *data = NULL;

Index: dimuse_track.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_track.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- dimuse_track.cpp	6 Mar 2005 23:15:57 -0000	1.45
+++ dimuse_track.cpp	9 Mar 2005 18:12:43 -0000	1.46
@@ -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::kPlainAudioDataType;
+		SoundMixer::SoundType type = SoundMixer::kPlainSoundType;
 
 		if (track->volGroupId == 1)
-			type = SoundMixer::kSpeechAudioDataType;
+			type = SoundMixer::kSpeechSoundType;
 		if (track->volGroupId == 2)
-			type = SoundMixer::kSFXAudioDataType;
+			type = SoundMixer::kSFXSoundType;
 		if (track->volGroupId == 3)
-			type = SoundMixer::kMusicAudioDataType;
+			type = SoundMixer::kMusicSoundType;
 
 		// setup 1 second stream wrapped buffer
 		int32 streamBufferSize = track->iteration;
@@ -303,14 +303,14 @@
 	fadeTrack->volFadeStep = (fadeTrack->volFadeDest - fadeTrack->vol) * 60 * (1000 / _callbackFps) / (1000 * fadeDelay);
 	fadeTrack->volFadeUsed = true;
 
-	SoundMixer::SoundType type = SoundMixer::kPlainAudioDataType;
+	SoundMixer::SoundType type = SoundMixer::kPlainSoundType;
 
 	if (fadeTrack->volGroupId == 1)
-		type = SoundMixer::kSpeechAudioDataType;
+		type = SoundMixer::kSpeechSoundType;
 	if (fadeTrack->volGroupId == 2)
-		type = SoundMixer::kSFXAudioDataType;
+		type = SoundMixer::kSFXSoundType;
 	if (fadeTrack->volGroupId == 3)
-		type = SoundMixer::kMusicAudioDataType;
+		type = SoundMixer::kMusicSoundType;
 
 	// setup 1 second stream wrapped buffer
 	int32 streamBufferSize = fadeTrack->iteration;





More information about the Scummvm-git-logs mailing list