mirror of
https://github.com/ZDoom/fluidsynth.git
synced 2025-04-17 13:19:09 +00:00
Merge branch '2.1.x' into master
This commit is contained in:
commit
4fd7899d61
2 changed files with 7 additions and 7 deletions
|
@ -980,13 +980,13 @@ void fluid_chorus_processmix(fluid_chorus_t *chorus, const fluid_real_t *in,
|
|||
d_out[1] += out ;
|
||||
}
|
||||
|
||||
/* Write the current input sample into the circular buffer */
|
||||
push_in_delay_line(chorus, in[sample_index]);
|
||||
|
||||
/* process stereo unit */
|
||||
/* Add the chorus stereo unit d_out to left and right output */
|
||||
left_out[sample_index] += d_out[0] * chorus->wet1 + d_out[1] * chorus->wet2;
|
||||
right_out[sample_index] += d_out[1] * chorus->wet1 + d_out[0] * chorus->wet2;
|
||||
|
||||
/* Write the current input sample into the circular buffer */
|
||||
push_in_delay_line(chorus, in[sample_index]);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1052,12 +1052,12 @@ void fluid_chorus_processreplace(fluid_chorus_t *chorus, const fluid_real_t *in,
|
|||
d_out[1] += out ;
|
||||
}
|
||||
|
||||
/* Write the current input sample into the circular buffer */
|
||||
push_in_delay_line(chorus, in[sample_index]);
|
||||
|
||||
/* process stereo unit */
|
||||
/* store the chorus stereo unit d_out to left and right output */
|
||||
left_out[sample_index] = d_out[0] * chorus->wet1 + d_out[1] * chorus->wet2;
|
||||
right_out[sample_index] = d_out[1] * chorus->wet1 + d_out[0] * chorus->wet2;
|
||||
|
||||
/* Write the current input sample into the circular buffer */
|
||||
push_in_delay_line(chorus, in[sample_index]);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -287,7 +287,7 @@ fluid_synth_init(void)
|
|||
{
|
||||
#ifdef TRAP_ON_FPE
|
||||
/* Turn on floating point exception traps */
|
||||
feenableexcept(FE_DIVBYZERO | FE_UNDERFLOW | FE_OVERFLOW | FE_INVALID);
|
||||
feenableexcept(FE_DIVBYZERO | FE_OVERFLOW | FE_INVALID);
|
||||
#endif
|
||||
|
||||
init_dither();
|
||||
|
|
Loading…
Reference in a new issue