[SCM] calf/master: Merge branch 'line-graph' into analyzer

[js at users.alioth.debian.org]

Merge branch 'line-graph' of boomshop.net:calf into line-graph
more zoom stuff
zoom stuff
Merge branch 'analyzer' into line-graph
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d6a3c1a63a147948535a50da009275278ad5e6a3
X-Git-Newrev: 34569260c452f0fa4c543155ebba174a42a343dc

The following commit has been merged in the master branch:
commit bcbf75c66df596c1239052e6120e05f446e6d994
Merge: 5e1be3ee4c2c21a5351d2143b4af5bd727312d2e 21ff80534b0f9e5b63bb8ad51edfb006e96d2056
Author: Christian Holschuh <chrisch.holli at gmx.de>
Date:   Tue Mar 6 09:51:24 2012 +0100

    Merge branch 'line-graph' into analyzer

diff --combined src/modules.cpp
index 750daf7,71be3e6..020f75c
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@@ -943,8 -943,8 +943,8 @@@ uint32_t analyzer_audio_module::process
          ppos %= (phase_buffer_size - 2);
          
          // analyzer
-         fft_buffer[fpos] = L * *params[param_analyzer_level];
-         fft_buffer[fpos + 1] = R * *params[param_analyzer_level];
+         fft_buffer[fpos] = L;
+         fft_buffer[fpos + 1] = R;
          
          fpos += 2;
          fpos %= (max_fft_buffer_size - 2);
@@@ -1068,16 -1068,6 +1068,16 @@@ bool analyzer_audio_module::get_graph(i
                      fft_hold[i] = fft_out[i];
                  }
              }
 +            for(int k = 0; k < 1; true) {
 +            //hier auf richtigen plan prüfen
 +            if(true) {
 +                break;
 +            }
 +            // recreate fftw plan
 +                rfftw_destroy_plan (fft_plan);
 +                fft_plan = rfftw_create_plan(_accuracy, FFTW_FORWARD, 0);
 +            }            
 +            
              // run fft
              // this takes our latest buffer and returns an array with
              // non-normalized
@@@ -1174,9 -1164,13 +1174,13 @@@
                  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
@@@ -1195,10 -1189,10 +1199,10 @@@
                  // fill freeze buffer
                  fft_freeze[iter] = val;
              }
-             data[i] = dB_grid(fabs(val) / _accuracy * 2.f + 1e-20);
+             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;
              } 
@@@ -1240,9 -1234,9 +1244,9 @@@ bool analyzer_audio_module::get_gridlin
  { 
      bool out;
      if(*params[param_analyzer_mode] != 3)
-         out = get_freq_gridline(subindex, pos, vertical, legend, context);
+         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, 16, 0.0000000001f);
+         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";
@@@ -1254,7 -1248,7 +1258,7 @@@
      return out;
  }
  bool analyzer_audio_module::get_clear_all(int index) const {
-     if(*params[param_analyzer_mode] != _mode_old) {
+     if(*params[param_analyzer_mode] != _mode_old or *params[param_analyzer_level]) {
          _mode_old = *params[param_analyzer_mode];
          return true;
      }

-- 
calf audio plugins packaging