[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.63,1.64 dimuse_sndmgr.cpp,1.32,1.33 dimuse_track.cpp,1.2,1.3
Max Horn
fingolfin at users.sourceforge.net
Fri Apr 9 17:33:01 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.323,1.324 sound.h,1.63,1.64
- Next message: [Scummvm-cvs-logs] CVS: tools extract-common.c,1.7,1.8 extract.c,1.38,1.39 extract.h,1.10,1.11 simon2mp3.c,1.32,1.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18252/imuse_digi
Modified Files:
dimuse.cpp dimuse_sndmgr.cpp dimuse_track.cpp
Log Message:
cleanup
Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- dimuse.cpp 9 Apr 2004 21:44:29 -0000 1.63
+++ dimuse.cpp 10 Apr 2004 00:17:42 -0000 1.64
@@ -82,7 +82,7 @@
if (_track[l].used) {
if (_track[l].stream2) {
if (!_track[l].handle.isActive() && _track[l].started) {
- debug(5, "IMuseDigital::callback(): stoped sound: %d", _track[l].soundId);
+ debug(5, "IMuseDigital::callback() A: stopped sound: %d", _track[l].soundId);
delete _track[l].stream2;
_track[l].stream2 = NULL;
_track[l].used = false;
@@ -90,7 +90,7 @@
}
} else if (_track[l].stream) {
if (_track[l].toBeRemoved) {
- debug(5, "IMuseDigital::callback(): stoped sound: %d", _track[l].soundId);
+ debug(5, "IMuseDigital::callback() B: stopped sound: %d", _track[l].soundId);
_track[l].stream->finish();
_track[l].stream = NULL;
_sound->closeSound(_track[l].soundHandle);
Index: dimuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- dimuse_sndmgr.cpp 9 Apr 2004 21:44:29 -0000 1.32
+++ dimuse_sndmgr.cpp 10 Apr 2004 00:17:42 -0000 1.33
@@ -341,22 +341,13 @@
void ImuseDigiSndMgr::closeSound(soundStruct *soundHandle) {
assert(soundHandle && checkForProperHandle(soundHandle));
- for (int l = 0; l < MAX_IMUSE_SOUNDS; l++) {
- if (&_sounds[l] == soundHandle) {
- if (_sounds[l].bundle)
- delete _sounds[l].bundle;
- for (int r = 0; r < _sounds[l].numSyncs; r++)
- if (_sounds[l].sync[r].ptr)
- free(_sounds[l].sync[r].ptr);
- if (_sounds[l].region)
- free(_sounds[l].region);
- if (_sounds[l].jump)
- free(_sounds[l].jump);
- if (_sounds[l].sync)
- free(_sounds[l].sync);
- memset(&_sounds[l], 0, sizeof(soundStruct));
- }
- }
+ delete soundHandle->bundle;
+ for (int r = 0; r < soundHandle->numSyncs; r++)
+ free(soundHandle->sync[r].ptr);
+ free(soundHandle->region);
+ free(soundHandle->jump);
+ free(soundHandle->sync);
+ memset(soundHandle, 0, sizeof(soundStruct));
}
bool ImuseDigiSndMgr::checkForProperHandle(soundStruct *soundHandle) {
Index: dimuse_track.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_track.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dimuse_track.cpp 9 Apr 2004 06:17:20 -0000 1.2
+++ dimuse_track.cpp 10 Apr 2004 00:17:42 -0000 1.3
@@ -165,8 +165,7 @@
}
}
- warning("it should not happen");
- assert(0);
+ error("IMuseDigital::startSound(): We should never get here");
}
void IMuseDigital::setPriority(int soundId, int priority) {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.323,1.324 sound.h,1.63,1.64
- Next message: [Scummvm-cvs-logs] CVS: tools extract-common.c,1.7,1.8 extract.c,1.38,1.39 extract.h,1.10,1.11 simon2mp3.c,1.32,1.33
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list