3D Audio GSoC:

Final GSoC commit.

* Bugfix: Negative frames crashed
* Bugfix: JOS sample buffer size prediction error (wasted memory)
* Optimisation: for JOS upsampling (around 12 % difference measured here)
* Optimisation: Better filter for JOS resampling
* Bugfix: Error in relative 3D audio code.
* Removed Attenuation
* Bugfix: Multiple scenes in BGE lead to errors, BGE audio now all relative, to support multiple scenes.

1 files changed, 0 insertions, 30 deletions

diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c
index 38575242fd6..d433d494068 100644
--- a/source/blender/makesrna/intern/rna_sequencer.c
+++ b/source/blender/makesrna/intern/rna_sequencer.c
@@ -52,16 +52,6 @@
 
 #ifdef RNA_RUNTIME
 
-static float to_dB(float x)
-{
-	return logf(x * x + 1e-30f) * 4.34294480f;
-}
-
-static float from_dB(float x)
-{
-	return expf(x * 0.11512925f);
-}
-
 /* build a temp referene to the parent */
 static void meta_tmp_ref(Sequence *seq_par, Sequence *seq)
 {
@@ -514,20 +504,6 @@ static int rna_Sequence_proxy_filepath_length(PointerRNA *ptr)
 	return strlen(path)+1;
 }
 
-static float rna_Sequence_attenuation_get(PointerRNA *ptr)
-{
-	Sequence *seq= (Sequence*)(ptr->data);
-
-	return to_dB(seq->volume);
-}
-
-static void rna_Sequence_attenuation_set(PointerRNA *ptr, float value)
-{
-	Sequence *seq= (Sequence*)(ptr->data);
-
-	seq->volume = from_dB(value);
-}
-
 static void rna_Sequence_volume_set(PointerRNA *ptr, float value)
 {
 	Sequence *seq= (Sequence*)(ptr->data);
@@ -1401,12 +1377,6 @@ static void rna_def_sound(BlenderRNA *brna)
 	RNA_def_property_float_funcs(prop, NULL, "rna_Sequence_volume_set", NULL);
 	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update");
 
-	prop= RNA_def_property(srna, "attenuation", PROP_FLOAT, PROP_NONE);
-	RNA_def_property_range(prop, -100.0f, +40.0f);
-	RNA_def_property_ui_text(prop, "Attenuation/dB", "Attenuation in decibel");
-	RNA_def_property_float_funcs(prop, "rna_Sequence_attenuation_get", "rna_Sequence_attenuation_set", NULL); 
-	RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update");
-
 	prop= RNA_def_property(srna, "pitch", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "pitch");
 	RNA_def_property_range(prop, 0.1f, 10.0f);