From 36f775482f2e54e7de0b00ead980c6617e88bad3 Mon Sep 17 00:00:00 2001 From: Peter Meerwald Date: Sat, 29 Mar 2014 18:03:05 +0100 Subject: [PATCH] pactl: Clean up checking for VOL_RELATIVE flag VOL_RELATIVE if a bit flag (1 << 4), hence we can simply do if (vol_flags & VOL_RELATIVE) ... instead of if ((vol_flags & VOL_RELATIVE) == VOL_RELATIVE) ... Signed-off-by: Peter Meerwald --- src/utils/pactl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utils/pactl.c b/src/utils/pactl.c index e6498d08..13ea6498 100644 --- a/src/utils/pactl.c +++ b/src/utils/pactl.c @@ -837,7 +837,7 @@ static void index_callback(pa_context *c, uint32_t idx, void *userdata) { } static void volume_relative_adjust(pa_cvolume *cv) { - pa_assert((volume_flags & VOL_RELATIVE) == VOL_RELATIVE); + pa_assert(volume_flags & VOL_RELATIVE); /* Relative volume change is additive in case of UINT or PERCENT * and multiplicative for LINEAR or DECIBEL */ @@ -1492,7 +1492,7 @@ static int parse_volume(const char *vol_spec, pa_volume_t *vol, enum volume_flag pa_xfree(vs); - if ((*vol_flags & VOL_RELATIVE) == VOL_RELATIVE) { + if (*vol_flags & VOL_RELATIVE) { if ((*vol_flags & 0x0F) == VOL_UINT) v += (double) PA_VOLUME_NORM; if ((*vol_flags & 0x0F) == VOL_PERCENT) -- 2.39.2