[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_sndmgr.cpp,1.67,1.68

Max Horn fingolfin at users.sourceforge.net
Thu Mar 31 13:51:56 CEST 2005


Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2195/imuse_digi

Modified Files:
	dimuse_sndmgr.cpp 
Log Message:
Started to move some resource related code into a new class ResourceManager (hypothetic goal for the future: use ResourceManager in ScummEx)

Index: dimuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- dimuse_sndmgr.cpp	6 Feb 2005 10:09:37 -0000	1.67
+++ dimuse_sndmgr.cpp	31 Mar 2005 21:39:31 -0000	1.68
@@ -342,7 +342,7 @@
 		assert(soundName[0] == 0);	// Paranoia check
 
 		_vm->ensureResourceLoaded(rtSound, soundId);
-		_vm->lock(rtSound, soundId);
+		_vm->res.lock(rtSound, soundId);
 		ptr = _vm->getResourceAddress(rtSound, soundId);
 		if (ptr == NULL) {
 			closeSound(sound);
@@ -413,7 +413,7 @@
 				found = true;
 		}
 		if (!found)
-			_vm->unlock(rtSound, soundHandle->soundId);
+			_vm->res.unlock(rtSound, soundHandle->soundId);
 	}
 
 	if (soundHandle->compressedStream)





More information about the Scummvm-git-logs mailing list