diff options
| author | athrxx | 2011-05-21 12:54:08 +0200 |
|---|---|---|
| committer | unknown | 2011-05-29 01:03:49 +0200 |
| commit | 187ecdd54f94026dd47b959050295f10faa65bb0 (patch) | |
| tree | 0bf2655d62ea8a942838c5275a6ef46836853972 | |
| parent | f38bc65be50dc7e778e1bf3e8707eb8dc9523d79 (diff) | |
| download | scummvm-rg350-187ecdd54f94026dd47b959050295f10faa65bb0.tar.gz scummvm-rg350-187ecdd54f94026dd47b959050295f10faa65bb0.tar.bz2 scummvm-rg350-187ecdd54f94026dd47b959050295f10faa65bb0.zip | |
KYRA: remove useless mutex from sound_towns
| -rw-r--r-- | engines/kyra/sound_intern.h | 2 | ||||
| -rw-r--r-- | engines/kyra/sound_towns.cpp | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/engines/kyra/sound_intern.h b/engines/kyra/sound_intern.h index 488dbc3742..e9cffd88e8 100644 --- a/engines/kyra/sound_intern.h +++ b/engines/kyra/sound_intern.h @@ -139,8 +139,6 @@ private: TownsEuphonyDriver *_driver; - Common::Mutex _mutex; - bool _cdaPlaying; const uint8 *_musicFadeTable; diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp index 9a9892c9a4..73d435f3e5 100644 --- a/engines/kyra/sound_towns.cpp +++ b/engines/kyra/sound_towns.cpp @@ -297,8 +297,6 @@ bool SoundTowns::loadInstruments() { if (!twm) return false; - Common::StackLock lock(_mutex); - Screen::decodeFrame4(twm, _musicTrackData, 50570); for (int i = 0; i < 128; i++) _driver->loadInstrument(0, i, &_musicTrackData[i * 48 + 8]); @@ -322,8 +320,6 @@ bool SoundTowns::loadInstruments() { } void SoundTowns::playEuphonyTrack(uint32 offset, int loop) { - Common::StackLock lock(_mutex); - uint8 *twm = _vm->resource()->fileData("twmusic.pak", 0); Screen::decodeFrame4(twm + 19312 + offset, _musicTrackData, 50570); delete[] twm; |