Merge pull request #685 from tresf/stable-1.0
SWH Clang Fixes, Apple Installer Fixes
This commit is contained in:
@@ -99,8 +99,10 @@ inline void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out
|
||||
for (i=0; i<length; i++) {
|
||||
impulse_time[i] = imp[i];
|
||||
}
|
||||
for (; i<fftl; i++) {
|
||||
impulse_time[i] = 0.0f;
|
||||
|
||||
int last = i;
|
||||
for (i = 0; i<fftl; i++) {
|
||||
if (i >=last) impulse_time[i] = 0.0f;
|
||||
}
|
||||
#ifdef FFTW3
|
||||
fftwf_execute(tmp_plan);
|
||||
|
||||
@@ -24,7 +24,11 @@
|
||||
#include "impulses/20-matchless-chieftain-sm57.h"
|
||||
#include "impulses/21-matchless-chieftain-sm57-off.h"
|
||||
|
||||
#ifdef __clang__
|
||||
void mk_imps(fftw_real **impulse_freq)
|
||||
#else
|
||||
inline void mk_imps(fftw_real **impulse_freq)
|
||||
#endif
|
||||
{
|
||||
int c = 0;
|
||||
MK_IMP(unit);
|
||||
|
||||
@@ -33,7 +33,11 @@ void _init(); // forward declaration
|
||||
|
||||
inline int partition(LADSPA_Data array[], int left, int right);
|
||||
|
||||
#ifdef __clang__
|
||||
void q_sort(LADSPA_Data array[], int left, int right) {
|
||||
#else
|
||||
inline void q_sort(LADSPA_Data array[], int left, int right) {
|
||||
#endif
|
||||
float pivot = partition(array, left, right);
|
||||
|
||||
if (left < pivot) {
|
||||
|
||||
@@ -115,7 +115,8 @@ inline void waveguide_nl_process(waveguide_nl *wg, float in0, float in1, float *
|
||||
b = (*out0 + 1.0) * 6.0f;
|
||||
if (b > 1.0f) {
|
||||
b = 1.0f;
|
||||
} else if (b < 0.0f) {
|
||||
}
|
||||
if (b < 0.0f) {
|
||||
b = 0.0f;
|
||||
}
|
||||
a1 = b * wg->a1a + (1.0f - b) * wg->a1b;
|
||||
@@ -129,7 +130,8 @@ inline void waveguide_nl_process(waveguide_nl *wg, float in0, float in1, float *
|
||||
b = (*out1 + 1.0) * 6.0f;
|
||||
if (b > 1.0f) {
|
||||
b = 1.0f;
|
||||
} else if (b < 0.0f) {
|
||||
}
|
||||
if (b < 0.0f) {
|
||||
b = 0.0f;
|
||||
}
|
||||
a1 = b * wg->a1a + (1.0f - b) * wg->a1b;
|
||||
|
||||
Reference in New Issue
Block a user