[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.19,1.20 dimuse_sndmgr.cpp,1.18,1.19 dimuse_sndmgr.h,1.12,1.13

Pawel Kolodziejski aquadran at users.sourceforge.net
Fri Jan 9 14:37:04 CET 2004


Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1:/tmp/cvs-serv6446

Modified Files:
	dimuse.cpp dimuse_sndmgr.cpp dimuse_sndmgr.h 
Log Message:
some changes to sync stuff

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- dimuse.cpp	9 Jan 2004 22:10:32 -0000	1.19
+++ dimuse.cpp	9 Jan 2004 22:36:40 -0000	1.20
@@ -585,8 +585,7 @@
 	if (msPos < 65536) {
 		for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
 			if ((_track[l].idSound == soundId) && _track[l].used) {
-				sync_size = _sound->getSyncSizeById(_track[l].soundHandle, syncId);
-				sync_ptr = _sound->getSyncPtrById(_track[l].soundHandle, syncId);
+				_sound->getSyncSizeAndPtrById(_track[l].soundHandle, syncId, sync_size, &sync_ptr);
 				if ((sync_size != 0) && (sync_ptr != NULL)) {
 					sync_size /= 4;
 					while (sync_size--) {

Index: dimuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- dimuse_sndmgr.cpp	9 Jan 2004 22:10:32 -0000	1.18
+++ dimuse_sndmgr.cpp	9 Jan 2004 22:36:40 -0000	1.19
@@ -352,18 +352,17 @@
 	return -1;
 }
 
-int ImuseDigiSndMgr::getSyncSizeById(soundStruct *soundHandle, int number) {
-	Common::StackLock tmpLock(_mutex);
-	assert(soundHandle && checkForProperHandle(soundHandle));
-	assert(number >= 0 && number < soundHandle->numSyncs);
-	return soundHandle->sync[number].size;
-}
-
-byte *ImuseDigiSndMgr::getSyncPtrById(soundStruct *soundHandle, int number) {
+void ImuseDigiSndMgr::getSyncSizeAndPtrById(soundStruct *soundHandle, int number, int32 &sync_size, byte **sync_ptr) {
 	Common::StackLock tmpLock(_mutex);
 	assert(soundHandle && checkForProperHandle(soundHandle));
-	assert(number >= 0 && number < soundHandle->numSyncs);
-	return soundHandle->sync[number].ptr;
+	assert(number >= 0);
+	if (number < soundHandle->numSyncs) {
+		sync_size = soundHandle->sync[number].size;
+		*sync_ptr = soundHandle->sync[number].ptr;
+	} else {
+		sync_size = 0;
+		*sync_ptr = NULL;
+	}
 }
 
 int ImuseDigiSndMgr::getRegionIdByHookId(soundStruct *soundHandle, int number) {

Index: dimuse_sndmgr.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- dimuse_sndmgr.h	9 Jan 2004 22:10:32 -0000	1.12
+++ dimuse_sndmgr.h	9 Jan 2004 22:36:40 -0000	1.13
@@ -130,8 +130,7 @@
 	int getJumpHookId(soundStruct *soundHandle, int number);
 	int getJumpFade(soundStruct *soundHandle, int number);
 	char *getMarker(soundStruct *soundHandle, int number);
-	int getSyncSizeById(soundStruct *soundHandle, int number);
-	byte *getSyncPtrById(soundStruct *soundHandle, int number);
+	void getSyncSizeAndPtrById(soundStruct *soundHandle, int number, int32 &sync_size, byte **sync_ptr);
 
 	int32 getDataFromRegion(soundStruct *soundHandle, int region, byte **buf, int32 offset, int32 size);
 };





More information about the Scummvm-git-logs mailing list