[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.407,1.408 sound.h,1.75,1.76

[Max Horn]

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

Modified Files:
	sound.cpp sound.h 
Log Message:
Merge startSfxSound into startTalkSound

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -d -r1.407 -r1.408
--- sound.cpp	27 Dec 2004 00:26:56 -0000	1.407
+++ sound.cpp	27 Dec 2004 16:24:48 -0000	1.408
@@ -732,8 +732,44 @@
 		_mouthSyncMode = true;
 	}
 
-	if (!_soundsPaused && _vm->_mixer->isReady())
-		startSfxSound(_sfxFile, size, handle, id);
+	if (!_soundsPaused && _vm->_mixer->isReady()) {
+		AudioStream *input = NULL;
+		
+		switch (_soundMode) {
+		case kMP3Mode:
+	#ifdef USE_MAD
+			assert(size > 0);
+			input = makeMP3Stream(_sfxFile, size);
+	#endif
+			break;
+		case kVorbisMode:
+	#ifdef USE_VORBIS
+			assert(size > 0);
+			input = makeVorbisStream(_sfxFile, size);
+	#endif
+			break;
+		case kFlacMode:
+	#ifdef USE_FLAC
+			assert(size > 0);
+			input = makeFlacStream(_sfxFile, size);
+	#endif
+			break;
+		default:
+			input = makeVOCStream(*_sfxFile);
+		}
+		
+		if (!input) {
+			warning("startSfxSound failed to load sound");
+			return;
+		}
+	
+		if (_vm->_imuseDigital) {
+			//_vm->_imuseDigital->stopSound(kTalkSoundID);
+			_vm->_imuseDigital->startVoice(kTalkSoundID, input);
+		} else {
+			_vm->_mixer->playInputStream(SoundMixer::kSFXAudioDataType, handle, input, id);
+		}
+	}
 }
 
 void Sound::stopTalkSound() {
@@ -993,46 +1029,6 @@
 	}
 }
 
-void Sound::startSfxSound(File *file, int file_size, PlayingSoundHandle *handle, int id) {
-
-	AudioStream *input = NULL;
-	
-	switch (_soundMode) {
-	case kMP3Mode:
-#ifdef USE_MAD
-		assert(file_size > 0);
-		input = makeMP3Stream(file, file_size);
-#endif
-		break;
-	case kVorbisMode:
-#ifdef USE_VORBIS
-		assert(file_size > 0);
-		input = makeVorbisStream(file, file_size);
-#endif
-		break;
-	case kFlacMode:
-#ifdef USE_FLAC
-		assert(file_size > 0);
-		input = makeFlacStream(file, file_size);
-#endif
-		break;
-	default:
-		input = makeVOCStream(*_sfxFile);
-	}
-	
-	if (!input) {
-		warning("startSfxSound failed to load sound");
-		return;
-	}
-
-	if (_vm->_imuseDigital) {
-		//_vm->_imuseDigital->stopSound(kTalkSoundID);
-		_vm->_imuseDigital->startVoice(kTalkSoundID, input);
-	} else {
-		_vm->_mixer->playInputStream(SoundMixer::kSFXAudioDataType, handle, input, id);
-	}
-}
-
 ScummFile *Sound::openSfxFile() {
 	struct SoundFileExtensions {
 		const char *ext;

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- sound.h	13 Oct 2004 07:52:42 -0000	1.75
+++ sound.h	27 Dec 2004 16:24:49 -0000	1.76
@@ -123,7 +123,6 @@
 
 protected:
 	ScummFile *openSfxFile();
-	void startSfxSound(File *file, int file_size, PlayingSoundHandle *handle, int id = -1);
 	bool isSfxFinished() const;
 	void processSfxQueues();