|
 |
5d2521a |
--- src/jack_client.cpp~ 2015-03-29 09:23:32.000000000 -0400
|
|
|
5d2521a |
+++ src/jack_client.cpp 2016-04-24 15:13:35.048501487 -0400
|
|
|
5d2521a |
@@ -226,7 +226,7 @@
|
|
|
5d2521a |
map<string, int>::const_iterator p = port_to_plugin.find((*k) + cnlen + 1);
|
|
|
5d2521a |
if (p != port_to_plugin.end())
|
|
|
5d2521a |
{
|
|
|
5d2521a |
- run_before.insert(make_pair<int, int>(p->second, i));
|
|
|
5d2521a |
+ run_before.insert(make_pair<int, int>(static_cast<int>(p->second), i));
|
|
|
5d2521a |
}
|
|
|
5d2521a |
}
|
|
|
5d2521a |
jack_free(conns);
|
|
|
5d2521a |
--- src/analyzer.cpp~ 2015-03-29 09:23:32.000000000 -0400
|
|
|
5d2521a |
+++ src/analyzer.cpp 2016-04-24 15:19:04.783048796 -0400
|
|
|
5d2521a |
@@ -470,13 +470,12 @@
|
|
|
5d2521a |
lastoutL = fft_outL[_iter];
|
|
|
5d2521a |
//pumping up actual signal an erase surrounding
|
|
|
5d2521a |
// sounds
|
|
|
5d2521a |
- fft_outL[_iter] = 0.25f * std::max(n * 0.6f * \
|
|
|
5d2521a |
- fabs(fft_outL[_iter]) - var1L , 1e-20);
|
|
|
5d2521a |
+ fft_outL[_iter] = (0.25f * (n * 0.6f * fabs(fft_outL[_iter]) - var1L > 1e-20) ? (n * 0.6f * fabs(fft_outL[_iter]) - var1L) : 1e-20);
|
|
|
5d2521a |
+
|
|
|
5d2521a |
if(_mode == 3 or _mode == 4) {
|
|
|
5d2521a |
// do the same with R channel if needed
|
|
|
5d2521a |
lastoutR = fft_outR[_iter];
|
|
|
5d2521a |
- fft_outR[_iter] = 0.25f * std::max(n * \
|
|
|
5d2521a |
- 0.6f * fabs(fft_outR[_iter]) - var1R , 1e-20);
|
|
|
5d2521a |
+ fft_outR[_iter] = (0.25f * (n * 0.6f * fabs(fft_outR[_iter]) - var1R > 1e-20) ? (n * 0.6f * fabs(fft_outR[_iter]) - var1R) : 1e-20);
|
|
|
5d2521a |
}
|
|
|
5d2521a |
break;
|
|
|
5d2521a |
}
|
|
|
5d2521a |
--- src/modules_limit.cpp~ 2015-03-29 09:23:32.000000000 -0400
|
|
|
5d2521a |
+++ src/modules_limit.cpp 2016-04-24 15:25:01.046492068 -0400
|
|
|
5d2521a |
@@ -429,7 +429,8 @@
|
|
|
5d2521a |
}
|
|
|
5d2521a |
|
|
|
5d2521a |
// write multiband coefficient to buffer
|
|
|
5d2521a |
- buffer[pos] = std::min(*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)), 1.0);
|
|
|
5d2521a |
+ buffer[pos] = *params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)) < 1.0 ? *params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)) : 1.0;
|
|
|
5d2521a |
+
|
|
|
5d2521a |
|
|
|
5d2521a |
// step forward in multiband buffer
|
|
|
5d2521a |
pos = (pos + channels) % buffer_size;
|
|
|
5d2521a |
@@ -811,7 +812,7 @@
|
|
|
5d2521a |
}
|
|
|
5d2521a |
|
|
|
5d2521a |
// write multiband coefficient to buffer
|
|
|
5d2521a |
- buffer[pos] = std::min(*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)), 1.0);
|
|
|
5d2521a |
+ buffer[pos] = *params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)) < 1.0 ? *params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)) : 1.0;
|
|
|
5d2521a |
|
|
|
5d2521a |
// step forward in multiband buffer
|
|
|
5d2521a |
pos = (pos + channels) % buffer_size;
|
|
|
5d2521a |
--- src/modules_dist.cpp~ 2015-03-29 09:23:32.000000000 -0400
|
|
|
5d2521a |
+++ src/modules_dist.cpp 2016-04-24 15:32:00.617341574 -0400
|
|
|
5d2521a |
@@ -794,8 +794,8 @@
|
|
|
5d2521a |
lfo2.advance(1);
|
|
|
5d2521a |
|
|
|
5d2521a |
// dot
|
|
|
5d2521a |
- rms = std::max((double)rms, (fabs(Lo) + fabs(Ro)) / 2);
|
|
|
5d2521a |
- input = std::max((double)input, (fabs(Lc) + fabs(Rc)) / 2);
|
|
|
5d2521a |
+ rms = (double)rms > (fabs(Lo) + fabs(Ro)) / 2 ? (double)rms : (fabs(Lo) + fabs(Ro)) / 2;
|
|
|
5d2521a |
+ input = (double)input > (fabs(Lc) + fabs(Rc)) / 2 ? (double)input : (fabs(Lc) + fabs(Rc)) / 2;
|
|
|
5d2521a |
|
|
|
5d2521a |
float values[] = {inL, inR, outs[0][i], outs[1][i]};
|
|
|
5d2521a |
meters.process(values);
|