diff options
| author | erihel <erihel@gmail.com> | 2013-01-14 22:55:16 +0100 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2013-01-14 22:55:16 +0100 |
| commit | 58f35e44ae17a8d4c55b1b19696245666d3697d3 (patch) | |
| tree | 26d593e1af405939f8c8c44c605a657c15aceb6c /src/sound/oalsound/alsound.h | |
| parent | 35faf628cf8085a9262c2b89999cacdd3f5bee79 (diff) | |
| download | colobot-58f35e44ae17a8d4c55b1b19696245666d3697d3.tar.gz colobot-58f35e44ae17a8d4c55b1b19696245666d3697d3.tar.bz2 colobot-58f35e44ae17a8d4c55b1b19696245666d3697d3.zip | |
* Removed alut
* Using libsndfile to load sounds and music
* Added support for playing music files
Diffstat (limited to 'src/sound/oalsound/alsound.h')
| -rw-r--r-- | src/sound/oalsound/alsound.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/sound/oalsound/alsound.h b/src/sound/oalsound/alsound.h index 7aeec90..4651e04 100644 --- a/src/sound/oalsound/alsound.h +++ b/src/sound/oalsound/alsound.h @@ -22,7 +22,7 @@ #include <map> #include <string> -#include <AL/alut.h> +#include <AL/al.h> #include "common/iman.h" #include "common/logger.h" @@ -87,8 +87,10 @@ class ALSound : public CSoundInterface bool m3D; bool mMute; float mAudioVolume; - ALCdevice* audioDevice; - ALCcontext* audioContext; + float mMusicVolume; + ALCdevice* mDevice; + ALCcontext* mContext; std::map<Sound, Buffer*> mSounds; std::map<int, Channel*> mChannels; + Channel *mCurrentMusic; }; |