diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-10-13 01:19:32 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-10-13 01:19:32 -0300 |
| commit | b3cda43a0fb49e1cb9c8414077a23fa4b61ede38 (patch) | |
| tree | 1fee133b2fbc6f2bade96cc9914a449cbb9dbe1e /platform/javascript/audio_server_javascript.cpp | |
| parent | 52e756752e1db9e4cf7c5bb7e92d44995ad674c4 (diff) | |
| parent | aad2bbdb6fb7c8217d7e75480b38e45f00cb3abd (diff) | |
| download | redot-engine-b3cda43a0fb49e1cb9c8414077a23fa4b61ede38.tar.gz | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
platform/windows/detect.py
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 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_( { |