[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.244,1.245 scumm.cpp,1.712,1.713
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sat Jan 28 08:31:05 CET 2006
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/dists/msvc8 scummvm.vcproj,1.22,1.23
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.135,1.136 dimuse.h,1.79,1.80 dimuse_script.cpp,1.40,1.41 dimuse_track.cpp,1.56,1.57
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1886
Modified Files:
script.cpp scumm.cpp
Log Message:
experimental imuse without timer thread usage, it might still have issue stoped audio while switching rooms
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -d -r1.244 -r1.245
--- script.cpp 25 Jan 2006 15:06:40 -0000 1.244
+++ script.cpp 28 Jan 2006 16:30:34 -0000 1.245
@@ -31,6 +31,7 @@
#include "scumm/util.h"
#include "scumm/scumm.h"
#include "scumm/verbs.h"
+#include "scumm/imuse_digi/dimuse.h"
namespace Scumm {
@@ -463,7 +464,13 @@
}
printf("\n");
}
+
+ if (_imuseDigital) {
+ _imuseDigital->callback();
+ }
+
executeOpcode(_opcode);
+
}
CHECK_HEAP;
}
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.712
retrieving revision 1.713
diff -u -d -r1.712 -r1.713
--- scumm.cpp 27 Jan 2006 23:10:24 -0000 1.712
+++ scumm.cpp 28 Jan 2006 16:30:34 -0000 1.713
@@ -2341,9 +2341,11 @@
start_time = _system->getMillis();
while (!_quit) {
- parseEvents();
-
+ if (_imuseDigital) {
+ _imuseDigital->callback();
+ }
_sound->updateCD(); // Loop CD Audio if needed
+ parseEvents();
if (_system->getMillis() >= start_time + msec_delay)
break;
_system->delayMillis(10);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/dists/msvc8 scummvm.vcproj,1.22,1.23
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.135,1.136 dimuse.h,1.79,1.80 dimuse_script.cpp,1.40,1.41 dimuse_track.cpp,1.56,1.57
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list