diff options
| author | Paweł Kołodziejski | 2004-05-01 18:53:03 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2004-05-01 18:53:03 +0000 |
| commit | 78f2d348253c69180f00221caad0566a09d69345 (patch) | |
| tree | 78cb7d686dccdf306d9c59fffbcdc171c0168230 | |
| parent | 0b86e3e69cdf9361681eb8ef7bf3644882ad199a (diff) | |
| download | scummvm-rg350-78f2d348253c69180f00221caad0566a09d69345.tar.gz scummvm-rg350-78f2d348253c69180f00221caad0566a09d69345.tar.bz2 scummvm-rg350-78f2d348253c69180f00221caad0566a09d69345.zip | |
remove useless mutex
svn-id: r13722
| -rw-r--r-- | scumm/smush/smush_player.cpp | 6 | ||||
| -rw-r--r-- | scumm/smush/smush_player.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index 5cb3a5ec04..64b15a7129 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -217,8 +217,6 @@ void SmushPlayer::timerCallback(void *refCon) { SmushPlayer::SmushPlayer(ScummEngine_v6 *scumm, int speed) { _vm = scumm; - _mutex = g_system->createMutex(); - _version = -1; _nbframes = 0; _smixer = 0; @@ -248,11 +246,9 @@ SmushPlayer::SmushPlayer(ScummEngine_v6 *scumm, int speed) { SmushPlayer::~SmushPlayer() { release(); - g_system->deleteMutex(_mutex); } void SmushPlayer::init() { - Common::StackLock lock(_mutex, "SmushPlayer::init()"); _frame = 0; _vm->_videoFinished = false; _vm->setDirtyColors(0, 255); @@ -264,7 +260,6 @@ void SmushPlayer::init() { } void SmushPlayer::release() { - Common::StackLock lock(_mutex, "SmushPlayer::release()"); _vm->_timer->removeTimerProc(&timerCallback); _vm->_videoFinished = true; @@ -959,7 +954,6 @@ void SmushPlayer::setupAnim(const char *file, const char *directory) { } void SmushPlayer::parseNextFrame() { - Common::StackLock lock(_mutex, "SmushPlayer::parseNextFrame()"); if (_vm->_smushPaused) return; diff --git a/scumm/smush/smush_player.h b/scumm/smush/smush_player.h index 2b155f3e27..37e1299e10 100644 --- a/scumm/smush/smush_player.h +++ b/scumm/smush/smush_player.h @@ -42,7 +42,6 @@ private: int _version; int32 _nbframes; SmushMixer *_smixer; - OSystem::MutexRef _mutex; int16 _deltaPal[0x300]; byte _pal[0x300]; StringResource *_strings; |