gfxdev
/
caudio
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Activity

* Cache volume of the AudioSource so we have a proper master volume handling

This commit is contained in:
Murat Suri 2011-06-25 08:32:37 +00:00
parent 3e6ad2abe0
commit 374913e9d0
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cAudio/Headers/cAudioSource.h
View File

@ -142,6 +142,9 @@ namespace cAudio
//! The context that owns this source
IAudioDeviceContext* Context;
//! Holds the current volume
float Volume;
//! Internal audio buffers
ALuint Buffers[CAUDIO_SOURCE_NUM_BUFFERS];
//! OpenAL source

2
cAudio/src/cAudioManager.cpp
View File

@ -202,7 +202,7 @@ namespace cAudio
size_t count = audioSources.size();
for(size_t i=0; i<count; i++)
{
audioSources[i]->setVolume(MasterVolume * audioSources[i]->getVolume());
audioSources[i]->setVolume(audioSources[i]->getVolume());
}
}

12
cAudio/src/cAudioSource.cpp
View File

@ -18,11 +18,11 @@ namespace cAudio
{
#if CAUDIO_EFX_ENABLED == 1
cAudioSource::cAudioSource(IAudioDecoder* decoder, IAudioDeviceContext* context, cEFXFunctions* oALFunctions)
: Context(context), Source(0), Decoder(decoder), Loop(false), Valid(false),
: Context(context), Source(0), Volume(1.0), Decoder(decoder), Loop(false), Valid(false),
EFX(oALFunctions), Filter(NULL), EffectSlotsAvailable(0), LastFilterTimeStamp(0)
#else
cAudioSource::cAudioSource(IAudioDecoder* decoder, IAudioDeviceContext* context)
: Context(context), Source(0), Decoder(decoder), Loop(false), Valid(false)
: Context(context), Source(0), Volume(1.0), Decoder(decoder), Loop(false), Valid(false)
#endif
{
cAudioMutexBasicLock lock(Mutex);
@ -49,6 +49,7 @@ namespace cAudio
//Creates one source to be stored.
alGenSources(1, &Source);
state = !checkError();
setVolume(Volume);
}
#if CAUDIO_EFX_ENABLED == 1
@ -405,7 +406,8 @@ namespace cAudio
void cAudioSource::setVolume(const float& volume)
{
cAudioMutexBasicLock lock(Mutex);
alSourcef(Source, AL_GAIN, volume);
Volume = volume;
alSourcef(Source, AL_GAIN, Volume * Context->getAudioManager()->getMasterVolume());
checkError();
}
@ -532,9 +534,7 @@ namespace cAudio
const float cAudioSource::getVolume() const
{
float value = 0.0f;
alGetSourcef(Source, AL_GAIN, &value);
return value;
return Volume;
}
const float cAudioSource::getMinVolume() const