[Scummvm-cvs-logs] SF.net SVN: scummvm: [24335] scummvm/trunk/engines/agos/sound.cpp

[kirben at users.sourceforge.net]

Revision: 24335
          http://svn.sourceforge.net/scummvm/?rev=24335&view=rev
Author:   kirben
Date:     2006-10-15 01:08:50 -0700 (Sun, 15 Oct 2006)

Log Message:
-----------
Only stop the required sound channel, when switching sound files

Modified Paths:
--------------
    scummvm/trunk/engines/agos/sound.cpp

Modified: scummvm/trunk/engines/agos/sound.cpp
===================================================================
--- scummvm/trunk/engines/agos/sound.cpp	2006-10-15 07:51:27 UTC (rev 24334)
+++ scummvm/trunk/engines/agos/sound.cpp	2006-10-15 08:08:50 UTC (rev 24335)
@@ -488,7 +488,7 @@
 	if (_hasEffectsFile)
 		return;
 
-	stopAll();
+	_mixer->stopHandle(_effectsHandle);
 
 	File *file = new File();
 	file->open(filename);
@@ -514,7 +514,7 @@
 }
 
 void Sound::readVoiceFile(const char *filename) {
-	stopAll();
+	_mixer->stopHandle(_voiceHandle);
 
 	File *file = new File();
 	file->open(filename);
@@ -529,7 +529,7 @@
 void Sound::playVoice(uint sound) {
 	if (_filenums) {
 		if (_lastVoiceFile != _filenums[sound]) {
-			stopAll();
+			_mixer->stopHandle(_voiceHandle);
 
 			char filename[16];
 			_lastVoiceFile = _filenums[sound];
@@ -739,7 +739,7 @@
 	if (_lastVoiceFile == disc)
 		return;
 
-	stopAll();
+	_mixer->stopHandle(_voiceHandle);
 	delete _voice;
 
 	_hasVoiceFile = false;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.