[Scummvm-cvs-logs] SF.net SVN: scummvm: [31432] scummvm/trunk/engines/kyra

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sun Apr 6 16:58:03 CEST 2008


Revision: 31432
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31432&view=rev
Author:   lordhoto
Date:     2008-04-06 07:58:02 -0700 (Sun, 06 Apr 2008)

Log Message:
-----------
Fixed potentional crash.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/scene_v2.cpp
    scummvm/trunk/engines/kyra/sound.h

Modified: scummvm/trunk/engines/kyra/scene_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_v2.cpp	2008-04-06 14:57:01 UTC (rev 31431)
+++ scummvm/trunk/engines/kyra/scene_v2.cpp	2008-04-06 14:58:02 UTC (rev 31432)
@@ -115,7 +115,7 @@
 
 	if (newSoundFile) {
 		if (_sound->getMusicType() == Sound::kAdlib) {
-			while (((SoundAdlibPC*)_sound)->isPlaying())
+			while (_sound->isPlaying())
 				_system->delayMillis(10);
 		} else {
 			while (waitTime > _system->getMillis())

Modified: scummvm/trunk/engines/kyra/sound.h
===================================================================
--- scummvm/trunk/engines/kyra/sound.h	2008-04-06 14:57:01 UTC (rev 31431)
+++ scummvm/trunk/engines/kyra/sound.h	2008-04-06 14:58:02 UTC (rev 31432)
@@ -138,6 +138,13 @@
 	virtual void playSoundEffect(uint8 track) = 0;
 
 	/**
+	 * Checks if the sound driver plays any sound
+	 *
+	 * @return true if playing, false otherwise
+	 */
+	virtual bool isPlaying() const { return false; }
+
+	/**
 	 * Starts fading out the volume.
 	 *
 	 * This keeps fading out the output until
@@ -465,6 +472,7 @@
 
 	void playTrack(uint8 track) { _music->playTrack(track); }
 	void haltTrack() { _music->haltTrack(); }
+	bool isPlaying() const { return _music->isPlaying() | _sfx->isPlaying(); }
 
 	void playSoundEffect(uint8 track) { _sfx->playSoundEffect(track); }
 


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




More information about the Scummvm-git-logs mailing list