mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-23 02:11:38 +00:00
remove useless mutex
svn-id: r13722
This commit is contained in:
parent
0b86e3e69c
commit
78f2d34825
@ -217,8 +217,6 @@ void SmushPlayer::timerCallback(void *refCon) {
|
|||||||
|
|
||||||
SmushPlayer::SmushPlayer(ScummEngine_v6 *scumm, int speed) {
|
SmushPlayer::SmushPlayer(ScummEngine_v6 *scumm, int speed) {
|
||||||
_vm = scumm;
|
_vm = scumm;
|
||||||
_mutex = g_system->createMutex();
|
|
||||||
|
|
||||||
_version = -1;
|
_version = -1;
|
||||||
_nbframes = 0;
|
_nbframes = 0;
|
||||||
_smixer = 0;
|
_smixer = 0;
|
||||||
@ -248,11 +246,9 @@ SmushPlayer::SmushPlayer(ScummEngine_v6 *scumm, int speed) {
|
|||||||
|
|
||||||
SmushPlayer::~SmushPlayer() {
|
SmushPlayer::~SmushPlayer() {
|
||||||
release();
|
release();
|
||||||
g_system->deleteMutex(_mutex);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void SmushPlayer::init() {
|
void SmushPlayer::init() {
|
||||||
Common::StackLock lock(_mutex, "SmushPlayer::init()");
|
|
||||||
_frame = 0;
|
_frame = 0;
|
||||||
_vm->_videoFinished = false;
|
_vm->_videoFinished = false;
|
||||||
_vm->setDirtyColors(0, 255);
|
_vm->setDirtyColors(0, 255);
|
||||||
@ -264,7 +260,6 @@ void SmushPlayer::init() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void SmushPlayer::release() {
|
void SmushPlayer::release() {
|
||||||
Common::StackLock lock(_mutex, "SmushPlayer::release()");
|
|
||||||
_vm->_timer->removeTimerProc(&timerCallback);
|
_vm->_timer->removeTimerProc(&timerCallback);
|
||||||
|
|
||||||
_vm->_videoFinished = true;
|
_vm->_videoFinished = true;
|
||||||
@ -959,7 +954,6 @@ void SmushPlayer::setupAnim(const char *file, const char *directory) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void SmushPlayer::parseNextFrame() {
|
void SmushPlayer::parseNextFrame() {
|
||||||
Common::StackLock lock(_mutex, "SmushPlayer::parseNextFrame()");
|
|
||||||
if (_vm->_smushPaused)
|
if (_vm->_smushPaused)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -42,7 +42,6 @@ private:
|
|||||||
int _version;
|
int _version;
|
||||||
int32 _nbframes;
|
int32 _nbframes;
|
||||||
SmushMixer *_smixer;
|
SmushMixer *_smixer;
|
||||||
OSystem::MutexRef _mutex;
|
|
||||||
int16 _deltaPal[0x300];
|
int16 _deltaPal[0x300];
|
||||||
byte _pal[0x300];
|
byte _pal[0x300];
|
||||||
StringResource *_strings;
|
StringResource *_strings;
|
||||||
|
Loading…
Reference in New Issue
Block a user