From 7b02dac3c5678bb47216495fc97130b98ff2bfe4 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 23 Mar 2011 11:47:07 +0100
Subject: ENGINES: Use Common::StackLock in more places

---
 engines/sky/music/musicbase.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'engines/sky/music/musicbase.cpp')

diff --git a/engines/sky/music/musicbase.cpp b/engines/sky/music/musicbase.cpp
index 0d3cb65e1b..e1044a9505 100644
--- a/engines/sky/music/musicbase.cpp
+++ b/engines/sky/music/musicbase.cpp
@@ -44,7 +44,7 @@ MusicBase::~MusicBase() {
 }
 
 void MusicBase::loadSection(uint8 pSection) {
-	_mutex.lock();
+	Common::StackLock lock(_mutex);
 	if (_currentMusic)
 		stopMusicInternal();
 	free(_musicData);
@@ -58,7 +58,6 @@ void MusicBase::loadSection(uint8 pSection) {
 	_numberOfChannels = _currentMusic = 0;
 	setupPointers();
 	startDriver();
-	_mutex.unlock();
 }
 
 bool MusicBase::musicIsPlaying() {
@@ -69,9 +68,8 @@ bool MusicBase::musicIsPlaying() {
 }
 
 void MusicBase::stopMusic() {
-	_mutex.lock();
+	Common::StackLock lock(_mutex);
 	stopMusicInternal();
-	_mutex.unlock();
 }
 
 void MusicBase::stopMusicInternal() {
@@ -113,7 +111,7 @@ void MusicBase::loadNewMusic() {
 }
 
 void MusicBase::pollMusic() {
-	_mutex.lock();
+	Common::StackLock lock(_mutex);
 	uint8 newTempo;
 	if (_onNextPoll.musicToProcess != _currentMusic)
 		loadNewMusic();
@@ -127,7 +125,6 @@ void MusicBase::pollMusic() {
 			updateTempo();
 		}
 	}
-	_mutex.unlock();
 	_aktTime &= 0xFFFF;
 }
 
-- 
cgit v1.2.3