mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-11-03 09:01:52 -05:00
pcm: change code formatting for softvol_load_control()
This commit applies code format according to typical and moderate rule, for softvol_load_control(). Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
709aa36bc2
commit
8306bb2b6a
1 changed files with 15 additions and 7 deletions
|
|
@ -734,7 +734,8 @@ static int softvol_load_control(snd_pcm_t *pcm, snd_pcm_softvol_t *svol,
|
||||||
else if (svol->max_dB < 0)
|
else if (svol->max_dB < 0)
|
||||||
svol->zero_dB_val = 0; /* there is no 0 dB setting */
|
svol->zero_dB_val = 0; /* there is no 0 dB setting */
|
||||||
else
|
else
|
||||||
svol->zero_dB_val = (min_dB / (min_dB - max_dB)) * svol->max_val;
|
svol->zero_dB_val = (min_dB / (min_dB - max_dB)) *
|
||||||
|
svol->max_val;
|
||||||
|
|
||||||
snd_ctl_elem_info_alloca(&cinfo);
|
snd_ctl_elem_info_alloca(&cinfo);
|
||||||
snd_ctl_elem_info_set_id(cinfo, ctl_id);
|
snd_ctl_elem_info_set_id(cinfo, ctl_id);
|
||||||
|
|
@ -758,11 +759,13 @@ static int softvol_load_control(snd_pcm_t *pcm, snd_pcm_softvol_t *svol,
|
||||||
cinfo->count != (unsigned int)cchannels ||
|
cinfo->count != (unsigned int)cchannels ||
|
||||||
cinfo->value.integer.min != 0 ||
|
cinfo->value.integer.min != 0 ||
|
||||||
cinfo->value.integer.max != resolution - 1) {
|
cinfo->value.integer.max != resolution - 1) {
|
||||||
if ((err = snd_ctl_elem_remove(svol->ctl, &cinfo->id)) < 0) {
|
err = snd_ctl_elem_remove(svol->ctl, &cinfo->id);
|
||||||
|
if (err < 0) {
|
||||||
SNDERR("Control %s mismatch", tmp_name);
|
SNDERR("Control %s mismatch", tmp_name);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
snd_ctl_elem_info_set_id(cinfo, ctl_id); /* reset numid */
|
/* reset numid */
|
||||||
|
snd_ctl_elem_info_set_id(cinfo, ctl_id);
|
||||||
if ((err = add_user_ctl(svol, cinfo, cchannels)) < 0) {
|
if ((err = add_user_ctl(svol, cinfo, cchannels)) < 0) {
|
||||||
SNDERR("Cannot add a control");
|
SNDERR("Cannot add a control");
|
||||||
return err;
|
return err;
|
||||||
|
|
@ -770,7 +773,8 @@ static int softvol_load_control(snd_pcm_t *pcm, snd_pcm_softvol_t *svol,
|
||||||
} else if (svol->max_val > 1) {
|
} else if (svol->max_val > 1) {
|
||||||
/* check TLV availability */
|
/* check TLV availability */
|
||||||
unsigned int tlv[4];
|
unsigned int tlv[4];
|
||||||
err = snd_ctl_elem_tlv_read(svol->ctl, &cinfo->id, tlv, sizeof(tlv));
|
err = snd_ctl_elem_tlv_read(svol->ctl, &cinfo->id, tlv,
|
||||||
|
sizeof(tlv));
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
add_tlv_info(svol, cinfo);
|
add_tlv_info(svol, cinfo);
|
||||||
}
|
}
|
||||||
|
|
@ -780,7 +784,8 @@ static int softvol_load_control(snd_pcm_t *pcm, snd_pcm_softvol_t *svol,
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* set up dB table */
|
/* set up dB table */
|
||||||
if (min_dB == PRESET_MIN_DB && max_dB == ZERO_DB && resolution == PRESET_RESOLUTION)
|
if (min_dB == PRESET_MIN_DB && max_dB == ZERO_DB &&
|
||||||
|
resolution == PRESET_RESOLUTION)
|
||||||
svol->dB_value = (unsigned int*)preset_dB_value;
|
svol->dB_value = (unsigned int*)preset_dB_value;
|
||||||
else {
|
else {
|
||||||
#ifndef HAVE_SOFT_FLOAT
|
#ifndef HAVE_SOFT_FLOAT
|
||||||
|
|
@ -792,8 +797,11 @@ static int softvol_load_control(snd_pcm_t *pcm, snd_pcm_softvol_t *svol,
|
||||||
svol->min_dB = min_dB;
|
svol->min_dB = min_dB;
|
||||||
svol->max_dB = max_dB;
|
svol->max_dB = max_dB;
|
||||||
for (i = 0; i <= svol->max_val; i++) {
|
for (i = 0; i <= svol->max_val; i++) {
|
||||||
double db = svol->min_dB + (i * (svol->max_dB - svol->min_dB)) / svol->max_val;
|
double db = svol->min_dB +
|
||||||
double v = (pow(10.0, db / 20.0) * (double)(1 << VOL_SCALE_SHIFT));
|
(i * (svol->max_dB - svol->min_dB)) /
|
||||||
|
svol->max_val;
|
||||||
|
double v = (pow(10.0, db / 20.0) *
|
||||||
|
(double)(1 << VOL_SCALE_SHIFT));
|
||||||
svol->dB_value[i] = (unsigned int)v;
|
svol->dB_value[i] = (unsigned int)v;
|
||||||
}
|
}
|
||||||
if (svol->zero_dB_val)
|
if (svol->zero_dB_val)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue