[Scummvm-cvs-logs] SF.net SVN: scummvm:[46774] scummvm/trunk/engines/sci/sfx
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Wed Dec 30 22:22:00 CET 2009
Revision: 46774
http://scummvm.svn.sourceforge.net/scummvm/?rev=46774&view=rev
Author: m_kiewitz
Date: 2009-12-30 21:22:00 +0000 (Wed, 30 Dec 2009)
Log Message:
-----------
SCI/newmusic: fix loop logic
Modified Paths:
--------------
scummvm/trunk/engines/sci/sfx/midiparser.cpp
scummvm/trunk/engines/sci/sfx/music.h
scummvm/trunk/engines/sci/sfx/soundcmd.cpp
Modified: scummvm/trunk/engines/sci/sfx/midiparser.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/midiparser.cpp 2009-12-30 21:11:38 UTC (rev 46773)
+++ scummvm/trunk/engines/sci/sfx/midiparser.cpp 2009-12-30 21:22:00 UTC (rev 46774)
@@ -200,9 +200,12 @@
info.ext.data = _position._play_pos;
_position._play_pos += info.length;
if (info.ext.type == 0x2F) {// end of track reached
+ if (_pSnd->loop)
+ _pSnd->loop--;
+ PUT_SEL32V(segMan, _pSnd->soundObj, loop, _pSnd->loop);
if (_pSnd->loop) {
+ // We need to play it again...
jumpToTick(_loopTick);
- _pSnd->loop--;
} else {
_pSnd->status = kSoundStopped;
PUT_SEL32V(segMan, _pSnd->soundObj, signal, 0xFFFF);
@@ -210,7 +213,6 @@
PUT_SEL32V(segMan, _pSnd->soundObj, state, kSoundStopped);
debugC(2, kDebugLevelSound, "signal EOT");
}
- PUT_SEL32V(segMan, _pSnd->soundObj, loop, _pSnd->loop);
}
break;
default:
Modified: scummvm/trunk/engines/sci/sfx/music.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.h 2009-12-30 21:11:38 UTC (rev 46773)
+++ scummvm/trunk/engines/sci/sfx/music.h 2009-12-30 21:22:00 UTC (rev 46774)
@@ -73,7 +73,7 @@
uint16 dataInc;
uint16 ticker;
byte prio;
- byte loop;
+ uint16 loop;
int16 volume;
int16 pauseCounter;
Modified: scummvm/trunk/engines/sci/sfx/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.cpp 2009-12-30 21:11:38 UTC (rev 46773)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp 2009-12-30 21:22:00 UTC (rev 46774)
@@ -297,7 +297,7 @@
if (number && _resMan->testResource(ResourceId(kResourceTypeSound, number)))
newSound->soundRes = new SoundResource(number, _resMan, _soundVersion);
newSound->soundObj = obj;
- newSound->loop = GET_SEL32V(_segMan, obj, loop) == 0xFFFF ? 1 : 0;
+ newSound->loop = GET_SEL32V(_segMan, obj, loop);
newSound->prio = GET_SEL32V(_segMan, obj, pri) & 0xFF;
newSound->volume = CLIP<int>(GET_SEL32V(_segMan, obj, vol), 0, Audio::Mixer::kMaxChannelVolume);
@@ -420,7 +420,7 @@
PUT_SEL32V(_segMan, obj, state, kSoundPlaying);
}
- musicSlot->loop = GET_SEL32V(_segMan, obj, loop) == 0xFFFF ? 1 : 0;
+ musicSlot->loop = GET_SEL32V(_segMan, obj, loop);
musicSlot->prio = GET_SEL32V(_segMan, obj, priority);
// vol selector doesnt get used before sci1late
if (_soundVersion < SCI_VERSION_1_LATE)
@@ -676,7 +676,7 @@
return;
}
- musicSlot->loop = (GET_SEL32V(_segMan, obj, loop) == 0xFFFF ? 1 : 0);
+ musicSlot->loop = GET_SEL32V(_segMan, obj, loop);
int16 objVol = CLIP<int>(GET_SEL32V(_segMan, obj, vol), 0, 255);
if (objVol != musicSlot->volume)
_music->soundSetVolume(musicSlot, objVol);
@@ -894,12 +894,11 @@
return;
}
if (value == -1) {
- musicSlot->loop = 1;
- PUT_SEL32V(_segMan, obj, loop, 0xFFFF);
+ musicSlot->loop = 0xFFFF;
} else {
- musicSlot->loop = 0;
- PUT_SEL32V(_segMan, obj, loop, 1);
+ musicSlot->loop = 1; // actually plays the music once
}
+ PUT_SEL32V(_segMan, obj, loop, musicSlot->loop);
#endif
}
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