From: Jeongmo Yang <jm80.yang@samsung.com>
Date: Tue, 9 Feb 2021 11:52:10 +0000 (+0900)
Subject: stream-manager-dbus: Skip virtual stream for ducking streams
X-Git-Tag: submit/tizen/20210210.091601^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d2c9f1b0308e96ae3d37a8ed65f4ddce8e2e9740;p=platform%2Fcore%2Fmultimedia%2Fpulseaudio-modules-tizen.git

stream-manager-dbus: Skip virtual stream for ducking streams

- The ducking state is never changed because of virtual stream.

[Version] 13.0.47
[Issue Type] Bug fix

Change-Id: I545f381f8868c40eaa8562bcdf4f6ae3afecfb63
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
---

diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec
index 0b5626f..9270deb 100644
--- a/packaging/pulseaudio-modules-tizen.spec
+++ b/packaging/pulseaudio-modules-tizen.spec
@@ -1,6 +1,6 @@
 Name:             pulseaudio-modules-tizen
 Summary:          Pulseaudio modules for Tizen
-Version:          13.0.46
+Version:          13.0.47
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+
diff --git a/src/stream-manager-dbus.c b/src/stream-manager-dbus.c
index 3545cd1..d9320f5 100644
--- a/src/stream-manager-dbus.c
+++ b/src/stream-manager-dbus.c
@@ -2101,6 +2101,8 @@ static void handle_activate_ducking(DBusConnection *conn, DBusMessage *msg, void
 
     /* set volume ramp factor to target stream */
     PA_IDXSET_FOREACH(i, m->core->sink_inputs, idx) {
+        if (pa_safe_streq(VIRTUAL_STREAM_NAME, pa_proplist_gets(i->proplist, PA_PROP_MEDIA_NAME)))
+            continue;
         if (!pa_safe_streq(target_stream, pa_proplist_gets(i->proplist, PA_PROP_MEDIA_ROLE)))
             continue;
 
diff --git a/src/stream-manager-priv.h b/src/stream-manager-priv.h
index aeb0ac9..390b156 100644
--- a/src/stream-manager-priv.h
+++ b/src/stream-manager-priv.h
@@ -123,6 +123,8 @@ typedef enum _stream_ducking_state {
 #define STREAM_FOCUS_STATE_RELEASED    "0"
 #define STREAM_FOCUS_STATE_ACQUIRED    "1"
 
+#define VIRTUAL_STREAM_NAME "VIRTUAL_STREAM" /* The virtual stream created by sound-manager */
+
 #define VOLUME_KEY_LENGTH              24
 #define STREAM_ROLE_STR_MAX            32
 
diff --git a/src/stream-manager.c b/src/stream-manager.c
index d611844..034bf0a 100644
--- a/src/stream-manager.c
+++ b/src/stream-manager.c
@@ -67,7 +67,7 @@
 
 #define STREAM_MANAGER_CLIENT_INFO    "SOUND_MANAGER_STREAM_INFO"    /* The stream info client via sound-manager */
 #define STREAM_MANAGER_CLIENT_DUCKING "SOUND_MANAGER_STREAM_DUCKING" /* The ducking client via sound-manager */
-#define VIRTUAL_STREAM_NAME "VIRTUAL_STREAM" /* The virtual stream created by sound-manager */
+
 #define DEFAULT_ROLE "media"
 #define SKIP_ROLE "skip"
 #define ACTIVE_DEV_REMOVED "removed"