[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.184,1.185
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sat Jan 28 08:31:07 CET 2006
- Previous 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
- Next message: [Scummvm-cvs-logs] CVS: web/images/save scummvm_128.png,NONE,1.1 scummvm_icon_big.psd,NONE,1.1 scummvm_16.ico,1.1,1.2 scummvm_32.ico,1.1,1.2 scummvm_icon_big.png,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1886/smush
Modified Files:
smush_player.cpp
Log Message:
experimental imuse without timer thread usage, it might still have issue stoped audio while switching rooms
Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- smush_player.cpp 27 Jan 2006 18:04:42 -0000 1.184
+++ smush_player.cpp 28 Jan 2006 16:30:39 -0000 1.185
@@ -1102,8 +1102,6 @@
if (_insanity)
_vm->_sound->processSound();
-
- _vm->_imuseDigital->flushTracks();
}
void SmushPlayer::setPalette(const byte *palette) {
@@ -1270,6 +1268,9 @@
if (_vm->_smushVideoShouldFinish || _vm->_quit || _vm->_saveLoadFlag)
break;
+ _vm->_imuseDigital->callback();
+ _vm->_imuseDigital->flushTracks();
+
lastTime = thisTime;
thisTime = _vm->_system->getMillis();
interval = 1000 * (thisTime - lastTime - diff);
@@ -1284,7 +1285,7 @@
_vm->_system->warpMouse(_warpX, _warpY);
_warpNeeded = false;
}
-
+
int32 before = _vm->_system->getMillis();
_vm->parseEvents();
_vm->processKbd(true);
- Previous 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
- Next message: [Scummvm-cvs-logs] CVS: web/images/save scummvm_128.png,NONE,1.1 scummvm_icon_big.psd,NONE,1.1 scummvm_16.ico,1.1,1.2 scummvm_32.ico,1.1,1.2 scummvm_icon_big.png,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list