diff options
Diffstat (limited to 'sword2/driver')
| -rw-r--r-- | sword2/driver/d_sound.cpp | 4 | ||||
| -rw-r--r-- | sword2/driver/d_sound.h | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp index 6f2dca6851..057c3b2bb9 100644 --- a/sword2/driver/d_sound.cpp +++ b/sword2/driver/d_sound.cpp @@ -63,7 +63,7 @@ static int32 musicVolTable[17] = { 143, 159, 175, 191, 207, 223, 239, 255 }; -int16 MusicHandle::read() { +int16 Sword2MusicHandle::read() { uint8 in; uint16 delta; int16 out; @@ -115,7 +115,7 @@ int16 MusicHandle::read() { return out; } -bool MusicHandle::eos() const { +bool Sword2MusicHandle::eos() const { if (!_streaming || _filePos >= _fileEnd) return true; return false; diff --git a/sword2/driver/d_sound.h b/sword2/driver/d_sound.h index abc76f3d05..4890a5a026 100644 --- a/sword2/driver/d_sound.h +++ b/sword2/driver/d_sound.h @@ -36,9 +36,9 @@ typedef struct { uint16 *_buf; int32 _bufSize; PlayingSoundHandle _handle; -} FxHandle; +} Sword2FxHandle; -class MusicHandle : public MusicStream { +class Sword2MusicHandle : public MusicStream { public: uint32 _id; bool _firstTime; @@ -57,9 +57,9 @@ public: int16 read(); bool eos() const; - MusicHandle() : MusicStream(), _firstTime(false), _streaming(false), - _paused(false), _looping(false), _fading(0), - _fileStart(0), _filePos(0), _fileEnd(0), + Sword2MusicHandle() : MusicStream(), _firstTime(false), + _streaming(false), _paused(false), _looping(false), + _fading(0), _fileStart(0), _filePos(0), _fileEnd(0), _lastSample(0) {} }; @@ -70,8 +70,8 @@ private: OSystem::MutexRef _mutex; RateConverter *_converter; - FxHandle _fx[MAXFX]; - MusicHandle _music[MAXMUS + 1]; + Sword2FxHandle _fx[MAXFX]; + Sword2MusicHandle _music[MAXMUS + 1]; uint8 _musicVol; |