From 82082148821d5ebe05fea12fd57d68b31740e04b Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 17 Aug 2009 03:40:36 +0200
Subject: volume: add pa_cvolume_merge() call

---
 src/pulse/volume.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'src/pulse/volume.c')

diff --git a/src/pulse/volume.c b/src/pulse/volume.c
index c23f360b..e816d679 100644
--- a/src/pulse/volume.c
+++ b/src/pulse/volume.c
@@ -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;
+}
-- 
cgit