mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-10 13:29:58 -05:00
volume: Fix incorrect usage of PA_VOLUME_IS_VALID
The commit that introduced this macro was incorrect in some places. This patch fixes these. Thanks to Pierre-Louis Bossart for pointing this out.
This commit is contained in:
parent
340729d66f
commit
9b8f20f617
4 changed files with 6 additions and 6 deletions
|
|
@ -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 && !PA_VOLUME_IS_VALID(volume)) {
|
||||
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 (!PA_VOLUME_IS_VALID(volume))
|
||||
else if (PA_VOLUME_IS_VALID(volume))
|
||||
pa_cvolume_set(&r, e->sample_spec.channels, volume);
|
||||
else
|
||||
pass_volume = FALSE;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue