mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-06 13:29:56 -05:00
volume: add pa_cvolume_merge() call
This commit is contained in:
parent
01e4b61a91
commit
8208214882
3 changed files with 24 additions and 0 deletions
|
|
@ -815,3 +815,21 @@ pa_volume_t pa_cvolume_get_position(
|
|||
|
||||
return v;
|
||||
}
|
||||
|
||||
pa_cvolume* pa_cvolume_merge(pa_cvolume *dest, const pa_cvolume *a, const pa_cvolume *b) {
|
||||
unsigned i;
|
||||
|
||||
pa_assert(dest);
|
||||
pa_assert(a);
|
||||
pa_assert(b);
|
||||
|
||||
pa_return_val_if_fail(pa_cvolume_valid(a), NULL);
|
||||
pa_return_val_if_fail(pa_cvolume_valid(b), NULL);
|
||||
|
||||
for (i = 0; i < a->channels && i < b->channels; i++)
|
||||
dest->values[i] = PA_MAX(a->values[i], b->values[i]);
|
||||
|
||||
dest->channels = (uint8_t) i;
|
||||
|
||||
return dest;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue