5 files changed, 52 insertions, 2 deletions

diff --git a/audio/calf/files/patch-src__calf__audio_fx.h b/audio/calf/files/patch-src__calf__audio_fx.h
index a77d45154949..0b1334427311 100644
--- a/audio/calf/files/patch-src__calf__audio_fx.h
+++ b/audio/calf/files/patch-src__calf__audio_fx.h
@@ -1,4 +1,4 @@
---- src/calf/audio_fx.h.orig
+--- src/calf/audio_fx.h.orig	2015-03-13 23:00:12 UTC
 +++ src/calf/audio_fx.h
 @@ -27,6 +27,7 @@
  #include "inertia.h"
diff --git a/audio/calf/files/patch-src__calf__osctl.h b/audio/calf/files/patch-src__calf__osctl.h
index 73148947f48d..4d1fe7be00ca 100644
--- a/audio/calf/files/patch-src__calf__osctl.h
+++ b/audio/calf/files/patch-src__calf__osctl.h
@@ -1,4 +1,4 @@
---- src/calf/osctl.h.orig
+--- src/calf/osctl.h.orig	2014-01-26 21:24:40 UTC
 +++ src/calf/osctl.h
 @@ -26,7 +26,10 @@
  #include <vector>
diff --git a/audio/calf/files/patch-src_analyzer.cpp b/audio/calf/files/patch-src_analyzer.cpp
new file mode 100644
index 000000000000..765c089928b5
--- /dev/null
+++ b/audio/calf/files/patch-src_analyzer.cpp
@@ -0,0 +1,17 @@
+--- src/analyzer.cpp.orig	2014-10-14 18:53:15 UTC
++++ src/analyzer.cpp
+@@ -471,12 +471,12 @@ void analyzer::draw(int subindex, float 
+                                 //pumping up actual signal an erase surrounding
+                                 // sounds
+                                 fft_outL[_iter] = 0.25f * std::max(n * 0.6f * \
+-                                    fabs(fft_outL[_iter]) - var1L , 1e-20);
++                                    fabsf(fft_outL[_iter]) - var1L , 1e-20f);
+                                 if(_mode == 3 or _mode == 4) {
+                                     // do the same with R channel if needed
+                                     lastoutR = fft_outR[_iter];
+                                     fft_outR[_iter] = 0.25f * std::max(n * \
+-                                        0.6f * fabs(fft_outR[_iter]) - var1R , 1e-20);
++                                        0.6f * fabsf(fft_outR[_iter]) - var1R , 1e-20f);
+                                 }
+                                 break;
+                         }
diff --git a/audio/calf/files/patch-src_modules__dist.cpp b/audio/calf/files/patch-src_modules__dist.cpp
new file mode 100644
index 000000000000..d2fae60eecd3
--- /dev/null
+++ b/audio/calf/files/patch-src_modules__dist.cpp
@@ -0,0 +1,13 @@
+--- src/modules_dist.cpp.orig	2015-03-13 23:00:12 UTC
++++ src/modules_dist.cpp
+@@ -794,8 +794,8 @@ uint32_t tapesimulator_audio_module::pro
+             lfo2.advance(1);
+             
+             // dot
+-            rms = std::max((double)rms, (fabs(Lo) + fabs(Ro)) / 2);
+-            input = std::max((double)input, (fabs(Lc) + fabs(Rc)) / 2);
++            rms = std::max(rms, (fabsf(Lo) + fabsf(Ro)) / 2);
++            input = std::max(input, (fabsf(Lc) + fabsf(Rc)) / 2);
+             
+             float values[] = {inL, inR, outs[0][i], outs[1][i]};
+             meters.process(values);
diff --git a/audio/calf/files/patch-src_modules__limit.cpp b/audio/calf/files/patch-src_modules__limit.cpp
new file mode 100644
index 000000000000..3af0e8e524d0
--- /dev/null
+++ b/audio/calf/files/patch-src_modules__limit.cpp
@@ -0,0 +1,20 @@
+--- src/modules_limit.cpp.orig	2014-10-14 18:56:24 UTC
++++ src/modules_limit.cpp
+@@ -429,7 +429,7 @@ uint32_t multibandlimiter_audio_module::
+                 }
+                 
+                 // write multiband coefficient to buffer
+-                buffer[pos] = std::min(*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)), 1.0);
++                buffer[pos] = std::min(*params[param_limit] / std::max(fabsf(tmpL), fabsf(tmpR)), 1.0f);
+                 
+                 // step forward in multiband buffer
+                 pos = (pos + channels) % buffer_size;
+@@ -811,7 +811,7 @@ uint32_t sidechainlimiter_audio_module::
+                 }
+                 
+                 // write multiband coefficient to buffer
+-                buffer[pos] = std::min(*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)), 1.0);
++                buffer[pos] = std::min(*params[param_limit] / std::max(fabsf(tmpL), fabsf(tmpR)), 1.0f);
+                 
+                 // step forward in multiband buffer
+                 pos = (pos + channels) % buffer_size;