diff options
| author | Max Horn | 2005-01-28 22:05:51 +0000 |
|---|---|---|
| committer | Max Horn | 2005-01-28 22:05:51 +0000 |
| commit | abd12dd1b63d9e680bdc157fd5aa1fdb579e111e (patch) | |
| tree | da026a16edefcc56119ef2376eb0b26f7ec9d500 /sword2 | |
| parent | c62d82450b7fc4d64bf6102cb8074457e3d0cb47 (diff) | |
| download | scummvm-rg350-abd12dd1b63d9e680bdc157fd5aa1fdb579e111e.tar.gz scummvm-rg350-abd12dd1b63d9e680bdc157fd5aa1fdb579e111e.tar.bz2 scummvm-rg350-abd12dd1b63d9e680bdc157fd5aa1fdb579e111e.zip | |
Use class Mutex instead of MutexRef
svn-id: r16679
Diffstat (limited to 'sword2')
| -rw-r--r-- | sword2/sound.cpp | 4 | ||||
| -rw-r--r-- | sword2/sound.h | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/sword2/sound.cpp b/sword2/sound.cpp index b50735ccc2..a9e21373c5 100644 --- a/sword2/sound.cpp +++ b/sword2/sound.cpp @@ -46,7 +46,6 @@ Sound::Sound(Sword2Engine *vm) { int i; _vm = vm; - _mutex = _vm->_system->createMutex(); for (i = 0; i < FXQ_LENGTH; i++) _fxQueue[i].resource = 0; @@ -79,9 +78,6 @@ Sound::~Sound() { delete _music[i]; free(_mixBuffer); - - if (_mutex) - _vm->_system->deleteMutex(_mutex); } /** diff --git a/sword2/sound.h b/sword2/sound.h index d37ebeb450..9eeda246b5 100644 --- a/sword2/sound.h +++ b/sword2/sound.h @@ -62,8 +62,6 @@ enum { FX_LOOPING = 4 }; -extern void sword2_sound_handler(void *refCon); - class CLUInputStream : public AudioStream { private: File *_file; @@ -142,7 +140,7 @@ class Sound : public AudioStream { private: Sword2Engine *_vm; - Common::MutexRef _mutex; + Common::Mutex _mutex; struct FxQueueEntry { PlayingSoundHandle handle; // sound handle |