Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Audio engine, fix Wind Synth

Browse Source
This commit is contained in:
Siana Gearz
2011-02-08 00:46:17 +01:00
parent 1577f7367a
commit 1919c00f2d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llaudio/llaudioengine.cpp
View File

@@ -823,7 +823,7 @@ void LLAudioEngine::triggerSound(const LLUUID &audio_uuid, const LLUUID& owner_i
// Create a new source (since this can't be associated with an existing source. // Create a new source (since this can't be associated with an existing source.
//llinfos << "Localized: " << audio_uuid << llendl; //llinfos << "Localized: " << audio_uuid << llendl;
if (mMuted) if (mMuted || gain < FLT_EPSILON*2)
{ {
return; return;
} }

2
indra/newview/app_settings/settings.xml
View File

@@ -13755,7 +13755,7 @@
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<integer>0</integer> <integer>1</integer>
</map> </map>
<key>CloudsEnabled</key> <key>CloudsEnabled</key>
<map> <map>

8
indra/newview/llvieweraudio.cpp
View File

@@ -248,10 +248,10 @@ void audio_update_wind(bool force_update)
// outside the fade-in. // outside the fade-in.
static const LLCachedControl<bool> mute_audio("MuteAudio",false); static const LLCachedControl<bool> mute_audio("MuteAudio",false);
static const LLCachedControl<bool> mute_ambient("MuteAmbient",false); static const LLCachedControl<bool> mute_ambient("MuteAmbient",false);
static const LLCachedControl<F32> audio_level_master("AudioLevelMaster",1); static const LLCachedControl<F32> audio_level_master("AudioLevelMaster", 1.0f);
static const LLCachedControl<F32> audio_level_ambient("AudioLevelAmbient",1); static const LLCachedControl<F32> audio_level_ambient("AudioLevelAmbient",1.0f);
F32 master_volume = mute_audio ? 0.f : mute_ambient; F32 master_volume = mute_audio ? 0.f : (F32)audio_level_master;
F32 ambient_volume = mute_ambient ? 0.f : audio_level_ambient; F32 ambient_volume = mute_ambient ? 0.f : (F32)audio_level_ambient;
F32 wind_volume = master_volume * ambient_volume; F32 wind_volume = master_volume * ambient_volume;
gAudiop->mMaxWindGain = wind_volume; gAudiop->mMaxWindGain = wind_volume;