[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_sound.cpp,1.21,1.22
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Sun Aug 31 10:29:03 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.106,2.107 script_v2.cpp,2.189,2.190 script_v5.cpp,1.164,1.165
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2 resman.cpp,1.15,1.16 sound.cpp,1.11,1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv16896/driver
Modified Files:
d_sound.cpp
Log Message:
When a fading music channel is freed to make room for new music, or when a
music channel has faded out, destroy the channel immediately. Don't wait
for the mixer to finish it off.
This seems to fix a problem where the mixer would eventually run out of
slots if you left the Quit dialog showing for too long.
Unfortunately I don't know if it fixes the "out of slots" errors I
encountered once during normal play. Oh well, time will tell...
Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- d_sound.cpp 31 Aug 2003 10:45:14 -0000 1.21
+++ d_sound.cpp 31 Aug 2003 17:28:36 -0000 1.22
@@ -1196,7 +1196,7 @@
primaryStream = 1;
musFading[primaryStream] = 0;
- g_engine->_mixer->endStream(soundHandleMusic[primaryStream]);
+ g_engine->_mixer->stop(soundHandleMusic[primaryStream]);
musStreaming[primaryStream] = 0;
soundHandleMusic[primaryStream] = 0;
}
@@ -1754,7 +1754,7 @@
if (musFading[i]) {
if (musFading[i] < 0) {
if (++musFading[i] == 0) {
- g_engine->_mixer->endStream(soundHandleMusic[i]);
+ g_engine->_mixer->stop(soundHandleMusic[i]);
musStreaming[i] = 0;
musLooping[i] = 0;
soundHandleMusic[i] = 0;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.106,2.107 script_v2.cpp,2.189,2.190 script_v5.cpp,1.164,1.165
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2 resman.cpp,1.15,1.16 sound.cpp,1.11,1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list