diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2015-09-26 22:42:43 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2015-09-26 22:43:34 +0200 |
| commit | 092f84642c89a4257176535da61e6050a8cc6dbb (patch) | |
| tree | c8dcaf98c4e0e32dedd9c57636793484415b75d9 /platform | |
| parent | 3d7740ba1769debcd4e231a73657d002e9eb5f5e (diff) | |
Rename voice_set_volume argument to p_volume to avoid confusion
This argument is indeed expected to be a volume on a linear scale (not dB),
typically from 0.0 to 1.0, though it can go higher than 1.0.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/javascript/audio_server_javascript.cpp | 4 | ||||
| -rw-r--r-- | platform/javascript/audio_server_javascript.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/platform/javascript/audio_server_javascript.cpp b/platform/javascript/audio_server_javascript.cpp index fd505b8a8f..a2c6740eaf 100644 --- a/platform/javascript/audio_server_javascript.cpp +++ b/platform/javascript/audio_server_javascript.cpp @@ -259,12 +259,12 @@ void AudioServerJavascript::voice_play(RID p_voice, RID p_sample){ voice->active=true; } -void AudioServerJavascript::voice_set_volume(RID p_voice, float p_gain){ +void AudioServerJavascript::voice_set_volume(RID p_voice, float p_volume){ Voice* voice=voice_owner.get(p_voice); ERR_FAIL_COND(!voice); - voice->volume=p_gain; + voice->volume=p_volume; if (voice->active) { EM_ASM_( { diff --git a/platform/javascript/audio_server_javascript.h b/platform/javascript/audio_server_javascript.h index bdab171b45..450237d324 100644 --- a/platform/javascript/audio_server_javascript.h +++ b/platform/javascript/audio_server_javascript.h @@ -125,7 +125,7 @@ public: virtual void voice_play(RID p_voice, RID p_sample); - virtual void voice_set_volume(RID p_voice, float p_gain); + virtual void voice_set_volume(RID p_voice, float p_volume); virtual void voice_set_pan(RID p_voice, float p_pan, float p_depth=0,float height=0); //pan and depth go from -1 to 1 virtual void voice_set_filter(RID p_voice, FilterType p_type, float p_cutoff, float p_resonance, float p_gain=0); virtual void voice_set_chorus(RID p_voice, float p_chorus ); |