[Scummvm-cvs-logs] SF.net SVN: scummvm:[47172] scummvm/trunk/engines/sci/sound/soundcmd.cpp
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Fri Jan 8 21:11:27 CET 2010
Revision: 47172
http://scummvm.svn.sourceforge.net/scummvm/?rev=47172&view=rev
Author: m_kiewitz
Date: 2010-01-08 20:11:27 +0000 (Fri, 08 Jan 2010)
Log Message:
-----------
SCI: updateCues() cleanup
Modified Paths:
--------------
scummvm/trunk/engines/sci/sound/soundcmd.cpp
Modified: scummvm/trunk/engines/sci/sound/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/soundcmd.cpp 2010-01-08 19:58:47 UTC (rev 47171)
+++ scummvm/trunk/engines/sci/sound/soundcmd.cpp 2010-01-08 20:11:27 UTC (rev 47172)
@@ -803,7 +803,7 @@
}
if (musicSlot->pStreamAud) {
- // Update digital sound effect slots here
+ // Update digital sound effect slots
uint currentLoopCounter = 0;
if (musicSlot->pLoopStream)
@@ -825,20 +825,15 @@
musicSlot->fadeSetVolume = false;
}
} else {
- switch (musicSlot->signal) {
- case 0:
- if (musicSlot->dataInc != GET_SEL32V(_segMan, obj, dataInc)) {
- PUT_SEL32V(_segMan, obj, dataInc, musicSlot->dataInc);
- PUT_SEL32V(_segMan, obj, signal, musicSlot->dataInc + 127);
- }
- break;
- case SIGNAL_OFFSET:
- PUT_SEL32V(_segMan, obj, signal, SIGNAL_OFFSET);
- break;
- default:
- // Sync the signal of the sound object
- PUT_SEL32V(_segMan, obj, signal, musicSlot->signal);
- break;
+ // Update MIDI slots
+ if (musicSlot->signal == 0) {
+ if (musicSlot->dataInc != GET_SEL32V(_segMan, obj, dataInc)) {
+ PUT_SEL32V(_segMan, obj, dataInc, musicSlot->dataInc);
+ PUT_SEL32V(_segMan, obj, signal, musicSlot->dataInc + 127);
+ }
+ } else {
+ // Sync the signal of the sound object
+ PUT_SEL32V(_segMan, obj, signal, musicSlot->signal);
}
}
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