Browse Source

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.
Rémi Verschelde 10 years ago
parent
commit
092f84642c

+ 2 - 2
platform/javascript/audio_server_javascript.cpp

@@ -259,12 +259,12 @@ void AudioServerJavascript::voice_play(RID p_voice, RID p_sample){
 	voice->active=true;
 	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);
 	Voice* voice=voice_owner.get(p_voice);
 	ERR_FAIL_COND(!voice);
 	ERR_FAIL_COND(!voice);
 
 
-	voice->volume=p_gain;
+	voice->volume=p_volume;
 
 
 	if (voice->active) {
 	if (voice->active) {
 		EM_ASM_( {
 		EM_ASM_( {

+ 1 - 1
platform/javascript/audio_server_javascript.h

@@ -125,7 +125,7 @@ public:
 
 
 	virtual void voice_play(RID p_voice, RID p_sample);
 	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_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_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 );
 	virtual void voice_set_chorus(RID p_voice, float p_chorus );

+ 2 - 2
servers/audio/audio_server_sw.cpp

@@ -455,12 +455,12 @@ void AudioServerSW::voice_play(RID p_voice, RID p_sample) {
 
 
 }
 }
 
 
-void AudioServerSW::voice_set_volume(RID p_voice, float p_db) {
+void AudioServerSW::voice_set_volume(RID p_voice, float p_volume) {
 
 
 	VoiceRBSW::Command cmd;
 	VoiceRBSW::Command cmd;
 	cmd.type=VoiceRBSW::Command::CMD_SET_VOLUME;
 	cmd.type=VoiceRBSW::Command::CMD_SET_VOLUME;
 	cmd.voice=p_voice;
 	cmd.voice=p_voice;
-	cmd.volume.volume=p_db;
+	cmd.volume.volume=p_volume;
 	voice_rb.push_command(cmd);
 	voice_rb.push_command(cmd);
 
 
 }
 }

+ 1 - 1
servers/audio/audio_server_sw.h

@@ -146,7 +146,7 @@ public:
 
 
 	virtual void voice_play(RID p_voice, RID p_sample);
 	virtual void voice_play(RID p_voice, RID p_sample);
 
 
-	virtual void voice_set_volume(RID p_voice, float p_db);
+	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_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_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 );
 	virtual void voice_set_chorus(RID p_voice, float p_chorus );

+ 1 - 1
servers/audio_server.h

@@ -210,7 +210,7 @@ public:
 
 
 	virtual void voice_play(RID p_voice, RID p_sample)=0;
 	virtual void voice_play(RID p_voice, RID p_sample)=0;
 
 
-	virtual void voice_set_volume(RID p_voice, float p_gain)=0;
+	virtual void voice_set_volume(RID p_voice, float p_volume)=0;
 	virtual void voice_set_pan(RID p_voice, float p_pan, float p_depth=0,float height=0)=0; //pan and depth go from -1 to 1
 	virtual void voice_set_pan(RID p_voice, float p_pan, float p_depth=0,float height=0)=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)=0;
 	virtual void voice_set_filter(RID p_voice, FilterType p_type, float p_cutoff, float p_resonance, float p_gain=0)=0;
 	virtual void voice_set_chorus(RID p_voice, float p_chorus )=0;
 	virtual void voice_set_chorus(RID p_voice, float p_chorus )=0;