Merge remote-tracking branch 'origin/master' into version/4.2
This commit is contained in:
@@ -391,10 +391,7 @@ sbpro_filter_cd_audio(int channel, double *buffer, void *priv)
|
|||||||
double cd = channel ? mixer->cd_r : mixer->cd_l;
|
double cd = channel ? mixer->cd_r : mixer->cd_l;
|
||||||
double master = channel ? mixer->master_r : mixer->master_l;
|
double master = channel ? mixer->master_r : mixer->master_l;
|
||||||
|
|
||||||
if (mixer->output_filter)
|
c = (*buffer * cd) / 3.0;
|
||||||
c = (sb_iir(2, channel, *buffer) * cd) / 3.9;
|
|
||||||
else
|
|
||||||
c = (*buffer * cd) / 3.0;
|
|
||||||
*buffer = c * master;
|
*buffer = c * master;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -602,10 +599,7 @@ sb16_awe32_filter_cd_audio(int channel, double *buffer, void *priv)
|
|||||||
double bass_treble;
|
double bass_treble;
|
||||||
double output_gain = (channel ? mixer->output_gain_R : mixer->output_gain_L);
|
double output_gain = (channel ? mixer->output_gain_R : mixer->output_gain_L);
|
||||||
|
|
||||||
if (mixer->output_filter)
|
c = ((*buffer) * cd) / 3.0;
|
||||||
c = (low_fir_sb16(2, channel, *buffer) * cd) / 3.0;
|
|
||||||
else
|
|
||||||
c = ((*buffer) * cd) / 3.0;
|
|
||||||
c *= master;
|
c *= master;
|
||||||
|
|
||||||
/* This is not exactly how one does bass/treble controls, but the end result is like it.
|
/* This is not exactly how one does bass/treble controls, but the end result is like it.
|
||||||
|
Reference in New Issue
Block a user