aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/sound_br.cpp
diff options
context:
space:
mode:
authorMax Horn2011-03-23 11:47:07 +0100
committerMax Horn2011-03-23 15:25:46 +0100
commit7b02dac3c5678bb47216495fc97130b98ff2bfe4 (patch)
treeebeba91f309e1321b4a72136d59672b696eb7849 /engines/parallaction/sound_br.cpp
parent99dbecf3b4a14382fa867610a43201fc150bfda9 (diff)
downloadscummvm-rg350-7b02dac3c5678bb47216495fc97130b98ff2bfe4.tar.gz
scummvm-rg350-7b02dac3c5678bb47216495fc97130b98ff2bfe4.tar.bz2
scummvm-rg350-7b02dac3c5678bb47216495fc97130b98ff2bfe4.zip
ENGINES: Use Common::StackLock in more places
Diffstat (limited to 'engines/parallaction/sound_br.cpp')
-rw-r--r--engines/parallaction/sound_br.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/engines/parallaction/sound_br.cpp b/engines/parallaction/sound_br.cpp
index 5be953936d..80bd95779d 100644
--- a/engines/parallaction/sound_br.cpp
+++ b/engines/parallaction/sound_br.cpp
@@ -278,24 +278,23 @@ void MidiPlayer_MSC::play(Common::SeekableReadStream *stream) {
if (_midiData) {
stream->read(_midiData, size);
delete stream;
- _mutex.lock();
+
+ Common::StackLock lock(_mutex);
_parser->loadMusic(_midiData, size);
_parser->setTrack(0);
_isLooping = true;
_isPlaying = true;
- _mutex.unlock();
}
}
void MidiPlayer_MSC::stop() {
- _mutex.lock();
+ Common::StackLock lock(_mutex);
if (_isPlaying) {
_isPlaying = false;
_parser->unloadMusic();
free(_midiData);
_midiData = 0;
}
- _mutex.unlock();
}
void MidiPlayer_MSC::pause(bool p) {
@@ -349,14 +348,14 @@ bool MidiPlayer_MSC::isOpen() const {
void MidiPlayer_MSC::close() {
stop();
- _mutex.lock();
+
+ Common::StackLock lock(_mutex);
_driver->setTimerCallback(NULL, NULL);
_driver->close();
delete _driver;
_driver = 0;
_parser->setMidiDriver(NULL);
delete _parser;
- _mutex.unlock();
}
void MidiPlayer_MSC::send(uint32 b) {