diff options
| author | Max Horn | 2004-02-28 12:58:13 +0000 |
|---|---|---|
| committer | Max Horn | 2004-02-28 12:58:13 +0000 |
| commit | c6752cccf5186fb04c97e2bb4a64c52fc9447073 (patch) | |
| tree | 91f3f0264b1542a839cc3504b52603a8034547cb /sky/music | |
| parent | 56102a1d02925abbe9fc0504751de1a270a34ff3 (diff) | |
| download | scummvm-rg350-c6752cccf5186fb04c97e2bb4a64c52fc9447073.tar.gz scummvm-rg350-c6752cccf5186fb04c97e2bb4a64c52fc9447073.tar.bz2 scummvm-rg350-c6752cccf5186fb04c97e2bb4a64c52fc9447073.zip | |
renamed more OSystem methods to follow our naming scheme; renamed NewGuiColor to OverlayColor; fixed some calls to error() in the SDL backend
svn-id: r13087
Diffstat (limited to 'sky/music')
| -rw-r--r-- | sky/music/musicbase.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sky/music/musicbase.cpp b/sky/music/musicbase.cpp index 636a97bf64..da94653e88 100644 --- a/sky/music/musicbase.cpp +++ b/sky/music/musicbase.cpp @@ -34,7 +34,7 @@ MusicBase::MusicBase(Disk *pDisk, OSystem *system) { _musicVolume = 127; _system = system; _numberOfChannels = _currentMusic = 0; - _mutex = _system->create_mutex(); + _mutex = _system->createMutex(); } MusicBase::~MusicBase(void) { @@ -45,7 +45,7 @@ MusicBase::~MusicBase(void) { void MusicBase::loadSection(uint8 pSection) { - _system->lock_mutex(_mutex); + _system->lockMutex(_mutex); if (_currentMusic) stopMusic(); if (_musicData) @@ -62,7 +62,7 @@ void MusicBase::loadSection(uint8 pSection) { _numberOfChannels = _currentMusic = 0; setupPointers(); startDriver(); - _system->unlock_mutex(_mutex); + _system->unlockMutex(_mutex); } bool MusicBase::musicIsPlaying(void) { @@ -165,7 +165,7 @@ void MusicBase::loadNewMusic(void) { void MusicBase::pollMusic(void) { - _system->lock_mutex(_mutex); + _system->lockMutex(_mutex); uint8 newTempo; if (_onNextPoll.doReInit) startDriver(); if (_onNextPoll.doStopMusic) stopMusic(); @@ -181,7 +181,7 @@ void MusicBase::pollMusic(void) { updateTempo(); } } - _system->unlock_mutex(_mutex); + _system->unlockMutex(_mutex); _aktTime &= 0xFFFF; } |