diff options
| author | Juan Linietsky | 2015-09-26 18:31:23 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-09-26 18:31:23 -0300 |
| commit | 9e54b5c62b177ced1643f22f13a480ed7646d27e (patch) | |
| tree | c8dcaf98c4e0e32dedd9c57636793484415b75d9 /platform/javascript/audio_server_javascript.cpp | |
| parent | d5579b15062b61c71ea58f0963a99685101bb4a2 (diff) | |
| parent | 092f84642c89a4257176535da61e6050a8cc6dbb (diff) | |
| download | godot-9e54b5c62b177ced1643f22f13a480ed7646d27e.tar.gz godot-9e54b5c62b177ced1643f22f13a480ed7646d27e.tar.zst godot-9e54b5c62b177ced1643f22f13a480ed7646d27e.zip | |
Merge pull request #2538 from akien-mga/polyphony
Small renaming and bug fixing in SamplePlayer
Diffstat (limited to 'platform/javascript/audio_server_javascript.cpp')
| -rw-r--r-- | platform/javascript/audio_server_javascript.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/javascript/audio_server_javascript.cpp b/platform/javascript/audio_server_javascript.cpp index fd505b8a8..a2c6740ea 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_( { |