[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.h,1.71,1.72 dimuse_script.cpp,1.32,1.33
Max Horn
fingolfin at users.sourceforge.net
Sat Mar 12 10:56:53 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga music.cpp,1.48,1.49 music.h,1.19,1.20 sound.cpp,1.23,1.24 sound.h,1.16,1.17
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_mixer.cpp,1.38,1.39 smush_mixer.h,1.12,1.13 smush_player.cpp,1.148,1.149 smush_player.h,1.42,1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9326/scumm/imuse_digi
Modified Files:
dimuse.h dimuse_script.cpp
Log Message:
PlayingSoundHandle -> SoundHandle; also, turned the handle activity check into a mixer method
Index: dimuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- dimuse.h 12 Mar 2005 18:54:06 -0000 1.71
+++ dimuse.h 12 Mar 2005 18:55:44 -0000 1.72
@@ -77,7 +77,7 @@
int32 mixerFlags;
ImuseDigiSndMgr::soundStruct *soundHandle;
- PlayingSoundHandle handle;
+ SoundHandle handle;
AppendableAudioStream *stream;
AudioStream *stream2;
Index: dimuse_script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_script.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- dimuse_script.cpp 10 Jan 2005 22:06:09 -0000 1.32
+++ dimuse_script.cpp 12 Mar 2005 18:55:44 -0000 1.33
@@ -279,7 +279,7 @@
for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
Track *track = _track[l];
if (track->soundId == sound) {
- if ((track->stream2 && track->handle.isActive()) ||
+ if ((track->stream2 && _vm->_mixer->isSoundHandleActive(track->handle)) ||
(track->stream && track->used && !track->readyToRemove)) {
return 1;
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga music.cpp,1.48,1.49 music.h,1.19,1.20 sound.cpp,1.23,1.24 sound.h,1.16,1.17
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_mixer.cpp,1.38,1.39 smush_mixer.h,1.12,1.13 smush_player.cpp,1.148,1.149 smush_player.h,1.42,1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list