[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.63,1.64
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Wed Sep 8 02:25:28 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2 console.cpp,1.46,1.47 console.h,1.21,1.22 controls.cpp,1.71,1.72 layers.cpp,1.29,1.30 logic.cpp,1.43,1.44 logic.h,1.36,1.37 resman.cpp,1.96,1.97 resman.h,1.20,1.21 startup.cpp,1.42,1.43 sword2.cpp,1.113,1.114 sword2.h,1.64,1.65
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.61,1.61.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12024
Modified Files:
midi.cpp
Log Message:
Fingolfin's suggested fix for bug #1004919.
Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- midi.cpp 4 Sep 2004 00:04:36 -0000 1.63
+++ midi.cpp 8 Sep 2004 09:24:18 -0000 1.64
@@ -397,9 +397,12 @@
// 1 BYTE : Always seems to be 0x00
// 1 BYTE : Ranges from 0x02 to 0x08 (always 0x02 for SFX, though)
// 1 BYTE : Loop control. 0 = no loop, 1 = loop
- if (!sfx)
- setLoop(p->data[6] != 0);
-
+ if (!sfx) {
+ // According to bug #1004919 calling setLoop() from
+ // within a lock causes a lockup, though I have no
+ // idea when this actually happens.
+ _loopTrack = (p->data[6] != 0);
+ }
}
MidiParser *parser = MidiParser::createParser_SMF();
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sword2 console.cpp,1.46,1.47 console.h,1.21,1.22 controls.cpp,1.71,1.72 layers.cpp,1.29,1.30 logic.cpp,1.43,1.44 logic.h,1.36,1.37 resman.cpp,1.96,1.97 resman.h,1.20,1.21 startup.cpp,1.42,1.43 sword2.cpp,1.113,1.114 sword2.h,1.64,1.65
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.61,1.61.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list