diff options
Diffstat (limited to 'src/sound/oalsound/alsound.h')
-rw-r--r-- | src/sound/oalsound/alsound.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/sound/oalsound/alsound.h b/src/sound/oalsound/alsound.h index 7d24ba6..bdf06b1 100644 --- a/src/sound/oalsound/alsound.h +++ b/src/sound/oalsound/alsound.h @@ -22,9 +22,8 @@ #include <map> #include <string> -#include <AL/alut.h> +#include <AL/al.h> -#include "common/iman.h" #include "common/logger.h" #include "sound/sound.h" @@ -42,7 +41,7 @@ class ALSound : public CSoundInterface bool Create(bool b3D); bool Cache(Sound, std::string); - bool RetEnable(); + bool GetEnable(); void SetSound3D(bool bMode); bool GetSound3D(); @@ -86,9 +85,12 @@ class ALSound : public CSoundInterface bool mEnabled; bool m3D; bool mMute; - int mAudioVolume; - ALCdevice* audioDevice; - ALCcontext* audioContext; + float mAudioVolume; + float mMusicVolume; + ALCdevice* mDevice; + ALCcontext* mContext; std::map<Sound, Buffer*> mSounds; std::map<int, Channel*> mChannels; + std::deque<Buffer*> mMusicCache; + Channel *mCurrentMusic; }; |