libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

added mutex into smush player

Browse Source 
svn-id: r13639
This commit is contained in:
Paweł Kołodziejski 2004-04-26 09:04:08 +00:00
parent 883fdfdb7c
commit 17332e393e
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scumm/smush/smush_player.cpp
View File

@ -217,6 +217,8 @@ void SmushPlayer::timerCallback(void *refCon) {
SmushPlayer::SmushPlayer(ScummEngine_v6 *scumm, int speed) {
_vm = scumm;
_mutex = g_system->createMutex();
_version = -1;
_nbframes = 0;
_smixer = 0;
@ -245,27 +247,28 @@ SmushPlayer::SmushPlayer(ScummEngine_v6 *scumm, int speed) {
}
SmushPlayer::~SmushPlayer() {
deinit();
release();
g_system->deleteMutex(_mutex);
}
void SmushPlayer::init() {
Common::StackLock lock(_mutex, "SmushPlayer::init()");
_frame = 0;
_vm->_videoFinished = false;
_smixer = new SmushMixer(_vm->_mixer);
_vm->setDirtyColors(0, 255);
_dst = _vm->virtscr[0].screenPtr + _vm->virtscr[0].xstart;
_smixer = new SmushMixer(_vm->_mixer);
g_timer->installTimerProc(&timerCallback, _speed, this);
_alreadyInit = false;
}
void SmushPlayer::deinit() {
void SmushPlayer::release() {
Common::StackLock lock(_mutex, "SmushPlayer::release()");
_vm->_timer->removeTimerProc(&timerCallback);
_vm->_videoFinished = true;
for (int i = 0; i < 5; i++) {
if (_sf[i]) {
delete _sf[i];
@ -956,6 +959,7 @@ void SmushPlayer::setupAnim(const char *file, const char *directory) {
}
void SmushPlayer::parseNextFrame() {
Common::StackLock lock(_mutex, "SmushPlayer::parseNextFrame()");
if (_vm->_smushPaused)
return;
@ -1150,8 +1154,8 @@ void SmushPlayer::play(const char *filename, const char *directory, int32 offset
_vm->_system->delay_msecs(10);
};
deinit();
release();
// Reset mouse state
_vm->_system->showMouse(oldMouseState);
}

3
scumm/smush/smush_player.h
View File

@ -42,6 +42,7 @@ private:
int _version;
int32 _nbframes;
SmushMixer *_smixer;
OSystem::MutexRef _mutex;
int16 _deltaPal[0x300];
byte _pal[0x300];
StringResource *_strings;
@ -91,7 +92,7 @@ private:
void updatePalette(void);
void parseNextFrame();
void init();
void deinit();
void release();
void setupAnim(const char *file, const char *directory);
void updateScreen();