volume: Use a macro to check if a volume is valid

This adds a PA_VOLUME_IS_VALID() macro for checking if a given
pa_volume_t is valid. This makes changes to the volume ranges simpler
(just change PA_VOLUME_MAX, for example, without needing to modify any
other code).
This commit is contained in:
Arun Raghavan 2010-10-09 22:30:20 +05:30
parent 4d84a00b49
commit 1d2ef7923d
9 changed files with 30 additions and 27 deletions

View file

@ -336,12 +336,12 @@ int pa_scache_play_item(pa_core *c, const char *name, pa_sink *sink, pa_volume_t
pass_volume = TRUE;
if (e->volume_is_set && volume != PA_VOLUME_INVALID) {
if (e->volume_is_set && !PA_VOLUME_IS_VALID(volume)) {
pa_cvolume_set(&r, e->sample_spec.channels, volume);
pa_sw_cvolume_multiply(&r, &r, &e->volume);
} else if (e->volume_is_set)
r = e->volume;
else if (volume != PA_VOLUME_INVALID)
else if (!PA_VOLUME_IS_VALID(volume))
pa_cvolume_set(&r, e->sample_spec.channels, volume);
else
pass_volume = FALSE;