diff options
| author | Max Horn | 2011-03-23 11:47:07 +0100 |
|---|---|---|
| committer | Max Horn | 2011-03-23 15:25:46 +0100 |
| commit | 7b02dac3c5678bb47216495fc97130b98ff2bfe4 (patch) | |
| tree | ebeba91f309e1321b4a72136d59672b696eb7849 /engines/queen | |
| parent | 99dbecf3b4a14382fa867610a43201fc150bfda9 (diff) | |
| download | scummvm-rg350-7b02dac3c5678bb47216495fc97130b98ff2bfe4.tar.gz scummvm-rg350-7b02dac3c5678bb47216495fc97130b98ff2bfe4.tar.bz2 scummvm-rg350-7b02dac3c5678bb47216495fc97130b98ff2bfe4.zip | |
ENGINES: Use Common::StackLock in more places
Diffstat (limited to 'engines/queen')
| -rw-r--r-- | engines/queen/music.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/engines/queen/music.cpp b/engines/queen/music.cpp index 044717878b..e04527d42a 100644 --- a/engines/queen/music.cpp +++ b/engines/queen/music.cpp @@ -218,10 +218,9 @@ void MidiMusic::metaEvent(byte type, byte *data, uint16 length) { } void MidiMusic::onTimer() { - _mutex.lock(); + Common::StackLock lock(_mutex); if (_isPlaying) _parser->onTimer(); - _mutex.unlock(); } void MidiMusic::queueTuneList(int16 tuneList) { @@ -319,11 +318,10 @@ void MidiMusic::playMusic() { stopMusic(); - _mutex.lock(); + Common::StackLock lock(_mutex); _parser->loadMusic(musicPtr, size); _parser->setTrack(0); _isPlaying = true; - _mutex.unlock(); debug(8, "Playing song %d [queue position: %d]", songNum, _queuePos); queueUpdatePos(); @@ -349,14 +347,13 @@ uint8 MidiMusic::randomQueuePos() { if (!queueSize) return 0; - return (uint8) _rnd.getRandomNumber(queueSize - 1) & 0xFF; + return (uint8)_rnd.getRandomNumber(queueSize - 1) & 0xFF; } void MidiMusic::stopMusic() { - _mutex.lock(); + Common::StackLock lock(_mutex); _isPlaying = false; _parser->unloadMusic(); - _mutex.unlock(); } uint32 MidiMusic::songOffset(uint16 songNum) const { |