[Scummvm-cvs-logs] SF.net SVN: scummvm:[46870] scummvm/trunk/engines/kyra/sound_adlib.cpp

[lordhoto at users.sourceforge.net]

Revision: 46870
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46870&view=rev
Author:   lordhoto
Date:     2010-01-02 00:54:11 +0000 (Sat, 02 Jan 2010)

Log Message:
-----------
Use Common::StackLock.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound_adlib.cpp

Modified: scummvm/trunk/engines/kyra/sound_adlib.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_adlib.cpp	2010-01-02 00:45:55 UTC (rev 46869)
+++ scummvm/trunk/engines/kyra/sound_adlib.cpp	2010-01-02 00:54:11 UTC (rev 46870)
@@ -410,9 +410,6 @@
 	Audio::SoundHandle _soundHandle;
 
 	bool _v2;
-
-	void lock() { _mutex.lock(); }
-	void unlock() { _mutex.unlock(); }
 };
 
 AdlibDriver::AdlibDriver(Audio::Mixer *mixer, bool v2) {
@@ -471,7 +468,7 @@
 }
 
 int AdlibDriver::callback(int opcode, ...) {
-	lock();
+	Common::StackLock lock(_mutex);
 	if (opcode >= _opcodesEntries || opcode < 0) {
 		warning("AdlibDriver: calling unknown opcode '%d'", opcode);
 		return 0;
@@ -483,7 +480,6 @@
 	va_start(args, opcode);
 	int returnValue = (this->*(_opcodeList[opcode].function))(args);
 	va_end(args);
-	unlock();
 	return returnValue;
 }
 
@@ -634,7 +630,7 @@
 // timer callback
 
 void AdlibDriver::callback() {
-	lock();
+	Common::StackLock lock(_mutex);
 	--_flagTrigger;
 	if (_flagTrigger < 0)
 		_flags &= ~8;
@@ -649,7 +645,6 @@
 			++_unkValue4;
 		}
 	}
-	unlock();
 }
 
 void AdlibDriver::setupPrograms() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.