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.h | |
| parent | 52e756752e1db9e4cf7c5bb7e92d44995ad674c4 (diff) | |
| parent | aad2bbdb6fb7c8217d7e75480b38e45f00cb3abd (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
platform/windows/detect.py
Diffstat (limited to 'platform/javascript/audio_server_javascript.h')
| -rw-r--r-- | platform/javascript/audio_server_javascript.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 ); |