[Scummvm-cvs-logs] SF.net SVN: scummvm:[34050] scummvm/trunk/engines/tinsel/music.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 34050
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34050&view=rev
Author:   eriktorbjorn
Date:     2008-08-20 09:15:59 +0000 (Wed, 20 Aug 2008)

Log Message:
-----------
Moved the mutex locking a bit. (Consistent with how the AGOS engine does it.)

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/music.cpp

Modified: scummvm/trunk/engines/tinsel/music.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/music.cpp	2008-08-20 09:13:40 UTC (rev 34049)
+++ scummvm/trunk/engines/tinsel/music.cpp	2008-08-20 09:15:59 UTC (rev 34050)
@@ -343,8 +343,6 @@
 }
 
 void MusicPlayer::setVolume(int volume) {
-	Common::StackLock lock(_mutex);
-
 	// FIXME: Could we simply change MAXMIDIVOL to match ScummVM's range?
 	volume = CLIP((255 * volume) / MAXMIDIVOL, 0, 255);
 	_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, volume);
@@ -354,6 +352,8 @@
 
 	_masterVolume = volume;
 
+	Common::StackLock lock(_mutex);
+
 	for (int i = 0; i < 16; ++i) {
 		if (_channel[i]) {
 			_channel[i]->volume(_channelVolume[i] * _masterVolume / 255);


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