MapleShrine
/
mkxp
1
0
Fork 0
Code Issues 32 Pull Requests 11 Projects Releases Wiki Activity

Audio: Set overall volume of OpenAL output to 0.8

This commit is contained in:
Jonas Kulla 2014-12-23 20:12:47 +01:00
parent 4b08d82ea4
commit 4560589e25
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/al-util.h
View File

@ -238,5 +238,6 @@ inline ALenum chooseALFormat(int sampleSize, int channelCount)
#define AUDIO_SLEEP 10 #define AUDIO_SLEEP 10
#define STREAM_BUF_SIZE 32768 #define STREAM_BUF_SIZE 32768
#define GLOBAL_VOLUME 0.8
#endif // ALUTIL_H #endif // ALUTIL_H

2
src/audiostream.cpp
View File

@ -252,7 +252,7 @@ float AudioStream::playingOffset()
void AudioStream::updateVolume() void AudioStream::updateVolume()
{ {
float vol = 1.0; float vol = GLOBAL_VOLUME;
for (size_t i = 0; i < VolumeTypeCount; ++i) for (size_t i = 0; i < VolumeTypeCount; ++i)
vol *= volumes[i]; vol *= volumes[i];

2
src/soundemitter.cpp
View File

@ -168,7 +168,7 @@ void SoundEmitter::play(const std::string &filename,
if (switchBuffer) if (switchBuffer)
AL::Source::attachBuffer(src, buffer->alBuffer); AL::Source::attachBuffer(src, buffer->alBuffer);
AL::Source::setVolume(src, _volume); AL::Source::setVolume(src, _volume * GLOBAL_VOLUME);
AL::Source::setPitch(src, _pitch); AL::Source::setPitch(src, _pitch);
AL::Source::play(src); AL::Source::play(src);