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 /scumm/sound.cpp | |
| 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 'scumm/sound.cpp')
| -rw-r--r-- | scumm/sound.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp index dc0b2cad65..de2a9a5080 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -29,7 +29,6 @@ #include "scumm/sound.h" #include "common/config-manager.h" -#include "common/system.h" #include "common/timer.h" #include "common/util.h" @@ -2249,7 +2248,7 @@ int ScummEngine::readSoundResourceSmallHeader(int type, int idx) { template<bool stereo, bool is16Bit, bool isUnsigned, bool isLE> class AppendableMemoryStream : public AppendableAudioStream { protected: - OSystem::MutexRef _mutex; + Common::Mutex _mutex; byte *_bufferStart; byte *_bufferEnd; @@ -2287,14 +2286,11 @@ AppendableMemoryStream<stereo, is16Bit, isUnsigned, isLE>::AppendableMemoryStrea _bufferStart = (byte *)malloc(bufferSize); _pos = _end = _bufferStart; _bufferEnd = _bufferStart + bufferSize; - - _mutex = g_system->createMutex(); } template<bool stereo, bool is16Bit, bool isUnsigned, bool isLE> AppendableMemoryStream<stereo, is16Bit, isUnsigned, isLE>::~AppendableMemoryStream() { free(_bufferStart); - g_system->deleteMutex(_mutex); } template<bool stereo, bool is16Bit, bool isUnsigned, bool isLE> |