From ff9fd33190b460267ad3b0cedaaf470fd94c5e58 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 30 May 2005 11:38:54 +0000 Subject: [PATCH] a bit reordered code to fix bug #838 --- src/mixer/simple.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/mixer/simple.c b/src/mixer/simple.c index 1649f802..8b45ae8a 100644 --- a/src/mixer/simple.c +++ b/src/mixer/simple.c @@ -221,20 +221,22 @@ static int get_compare_weight(const char *name, unsigned int idx) static long to_user(selem_t *s, int dir, selem_ctl_t *c, long value) { - int64_t n; - if (c->max == c->min) + if (c->max == c->min) { return s->str[dir].min; - n = (int64_t) (value - c->min) * (s->str[dir].max - s->str[dir].min); - return s->str[dir].min + (n + (c->max - c->min) / 2) / (c->max - c->min); + } else { + int64_t n = (int64_t) (value - c->min) * (s->str[dir].max - s->str[dir].min); + return s->str[dir].min + (n + (c->max - c->min) / 2) / (c->max - c->min); + } } static long from_user(selem_t *s, int dir, selem_ctl_t *c, long value) { - int64_t n; - if (s->str[dir].max == s->str[dir].min) + if (s->str[dir].max == s->str[dir].min) { return c->min; - n = (int64_t) (value - s->str[dir].min) * (c->max - c->min); - return c->min + (n + (s->str[dir].max - s->str[dir].min) / 2) / (s->str[dir].max - s->str[dir].min); + } else { + int64_t n = (int64_t) (value - s->str[dir].min) * (c->max - c->min); + return c->min + (n + (s->str[dir].max - s->str[dir].min) / 2) / (s->str[dir].max - s->str[dir].min); + } } static int elem_read_volume(selem_t *s, int dir, selem_ctl_type_t type) -- 2.47.1