[SCM] calf/master: more zoom stuff

js at users.alioth.debian.org js at users.alioth.debian.org
Tue May 7 15:41:00 UTC 2013


The following commit has been merged in the master branch:
commit b633455d3f0dafb0b6514f8d446e37dbe843d643
Author: Markus Schmidt <schmidt at boomshop.net>
Date:   Tue Mar 6 09:43:39 2012 +0100

    more zoom stuff

diff --git a/src/modules.cpp b/src/modules.cpp
index b7512cf..71be3e6 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -1164,9 +1164,13 @@ bool analyzer_audio_module::get_graph(int index, int subindex, float *data, int
                 switch((int)*params[param_analyzer_smoothing]) {
                     case 0:
                         // falling
-                        fft_smooth[iter] -= fabs(fft_delta[iter]);
-                        fft_delta[iter] /= 1.01f;
-                        val = fft_smooth[iter];
+                        if(*params[param_analyzer_mode] != 3) {
+                            fft_smooth[iter] -= fabs(fft_delta[iter]);
+                            fft_delta[iter] /= 1.01f;
+                            val = fft_smooth[iter];
+                        } else {
+                            val = fft_out[iter];
+                        }
                         break;
                     case 1:
                         // smoothing
@@ -1188,7 +1192,7 @@ bool analyzer_audio_module::get_graph(int index, int subindex, float *data, int
             data[i] = dB_grid(fabs(val) / _accuracy * 2.f + 1e-20, pow(64, *params[param_analyzer_level]), 0.5f);
             if(*params[param_analyzer_mode] == 3) {
                 if(i) {
-                    data[i] = val;
+                    data[i] = val * pow(*params[param_analyzer_level], 3);
                 }
                 else data[i] = 0.f;
             } 
@@ -1232,7 +1236,7 @@ bool analyzer_audio_module::get_gridline(int index, int subindex, float &pos, bo
     if(*params[param_analyzer_mode] != 3)
         out = get_freq_gridline(subindex, pos, vertical, legend, context, true, pow(64, *params[param_analyzer_level]), 0.5f);
     else
-        out = get_freq_gridline(subindex, pos, vertical, legend, context, true, pow(16, *params[param_analyzer_level]), 0.f);
+        out = get_freq_gridline(subindex, pos, vertical, legend, context, true, 16, 0.f);
     if(*params[param_analyzer_mode] == 3 and not vertical) {
         if(subindex == 30)
             legend="L";

-- 
calf audio plugins packaging



More information about the pkg-multimedia-commits mailing list