summaryrefslogtreecommitdiff
path: root/src/mixer
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2006-07-27 10:45:25 +0200
committerJaroslav Kysela <perex@perex.cz>2006-07-27 10:45:25 +0200
commitc4a5efeba31b3efbb97b3f66a4faa2dbab84aecb (patch)
treef9c33608f4574beaf33a0b8b66ce856aad51fcef /src/mixer
parenta98fd022fa3c97032d9ae2a7b873ca4618db4302 (diff)
mixer - cleanups for dB scale parsing
Diffstat (limited to 'src/mixer')
-rw-r--r--src/mixer/simple_none.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c
index c07346b5..c13accaa 100644
--- a/src/mixer/simple_none.c
+++ b/src/mixer/simple_none.c
@@ -980,23 +980,24 @@ static int get_dB_ops(snd_mixer_elem_t *elem,
selem_ctl_t *c;
int err = -EINVAL;
long volume, db_gain;
+
if (dir == SM_PLAY) {
c = &s->ctls[CTL_PLAYBACK_VOLUME];
- if (c->type != 2) {
+ if (c->type != 2)
goto _err;
- }
} else if (dir == SM_CAPT) {
c = &s->ctls[CTL_CAPTURE_VOLUME];
- if (c->type != 2) {
+ if (c->type != 2)
goto _err;
- }
- } else goto _err;
- if (err = get_volume_ops(elem, dir, channel, &volume)) {
+ } else {
goto _err;
}
- if ((err = snd_hctl_elem_get_db_gain(c->elem, volume, &db_gain)) < 0) {
+ err = get_volume_ops(elem, dir, channel, &volume);
+ if (err < 0)
+ goto _err;
+ err = snd_hctl_elem_get_db_gain(c->elem, volume, &db_gain);
+ if (err < 0)
goto _err;
- }
err = 0;
*value = db_gain;
_err: