aboutsummaryrefslogtreecommitdiff
path: root/sword1/music.cpp
diff options
context:
space:
mode:
authorMax Horn2005-01-28 22:05:51 +0000
committerMax Horn2005-01-28 22:05:51 +0000
commitabd12dd1b63d9e680bdc157fd5aa1fdb579e111e (patch)
treeda026a16edefcc56119ef2376eb0b26f7ec9d500 /sword1/music.cpp
parentc62d82450b7fc4d64bf6102cb8074457e3d0cb47 (diff)
downloadscummvm-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 'sword1/music.cpp')
-rw-r--r--sword1/music.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/sword1/music.cpp b/sword1/music.cpp
index 99166ed2e6..34ef5b48c9 100644
--- a/sword1/music.cpp
+++ b/sword1/music.cpp
@@ -251,11 +251,9 @@ void MusicHandle::stop() {
_looping = false;
}
-Music::Music(OSystem *system, SoundMixer *pMixer) {
- _system = system;
+Music::Music(SoundMixer *pMixer) {
_mixer = pMixer;
_sampleRate = pMixer->getOutputRate();
- _mutex = _system->createMutex();
_converter[0] = NULL;
_converter[1] = NULL;
_volumeL = _volumeR = 192;
@@ -266,8 +264,6 @@ Music::~Music() {
_mixer->setupPremix(0);
delete _converter[0];
delete _converter[1];
- if (_mutex)
- _system->deleteMutex(_mutex);
}
void Music::mixer(int16 *buf, uint32 len) {