aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Menshakov2011-10-27 02:56:32 +0400
committerVladimir Menshakov2011-10-27 02:56:32 +0400
commit5b89ef436628f8e1c82d4067abad6fed6f393d1b (patch)
treecd4864a92db3a151f3e783c2550ae5404bffb941
parentf4a938d0f8535203ebb917dc78d181b3adf24c97 (diff)
downloadscummvm-rg350-5b89ef436628f8e1c82d4067abad6fed6f393d1b.tar.gz
scummvm-rg350-5b89ef436628f8e1c82d4067abad6fed6f393d1b.tar.bz2
scummvm-rg350-5b89ef436628f8e1c82d4067abad6fed6f393d1b.zip
TEENAGENT: Added missing lock in music player, replaced protected with private.
-rw-r--r--engines/teenagent/music.cpp1
-rw-r--r--engines/teenagent/music.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/engines/teenagent/music.cpp b/engines/teenagent/music.cpp
index 6cc2fd8d6b..1f44e9cfcb 100644
--- a/engines/teenagent/music.cpp
+++ b/engines/teenagent/music.cpp
@@ -51,6 +51,7 @@ bool MusicPlayer::load(int id) {
stream->read(header, 4);
//check header?
+ Common::StackLock lock(_mutex);
// Load the samples
sampleCount = stream->readByte();
diff --git a/engines/teenagent/music.h b/engines/teenagent/music.h
index bf36ac7057..22b4fa5e8e 100644
--- a/engines/teenagent/music.h
+++ b/engines/teenagent/music.h
@@ -40,7 +40,7 @@ public:
void start();
void stop();
-protected:
+private:
int _id;
struct Row {