[Scummvm-cvs-logs] SF.net SVN: scummvm:[46714] scummvm/trunk/engines/sci/sfx/soundcmd.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 46714
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46714&view=rev
Author:   m_kiewitz
Date:     2009-12-29 18:28:26 +0000 (Tue, 29 Dec 2009)

Log Message:
-----------
SCI/newmusic: Removed playlist-feature from cmdResumeHandle cause that is sci0 only

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/soundcmd.cpp

Modified: scummvm/trunk/engines/sci/sfx/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-29 18:17:14 UTC (rev 46713)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2009-12-29 18:28:26 UTC (rev 46714)
@@ -565,29 +565,15 @@
 	changeHandleStatus(obj, SOUND_STATUS_PLAYING);
 #else
 	MusicEntry *musicSlot = NULL;
-	MusicList::iterator slotLoop = NULL;
 
-	if (!obj.segment) {
-		slotLoop = _music->enumPlayList(NULL);
-		musicSlot = *slotLoop;
-	} else {
-		musicSlot = _music->getSlot(obj);
-		if (!musicSlot) {
-			warning("cmdResumeHandle: Slot not found");
-			return;
-		}
+	musicSlot = _music->getSlot(obj);
+	if (!musicSlot) {
+		warning("cmdResumeHandle: Slot not found");
+		return;
 	}
 
-	do {
-		PUT_SEL32V(_segMan, musicSlot->soundObj, state, kSoundPlaying);
-		_music->soundResume(musicSlot);
-
-		if (slotLoop) {
-			slotLoop = _music->enumPlayList(slotLoop);
-			if (slotLoop)
-				musicSlot = *slotLoop;
-		}
-	} while (slotLoop);
+	PUT_SEL32V(_segMan, musicSlot->soundObj, state, kSoundPlaying);
+	_music->soundResume(musicSlot);
 #endif
 }
 


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