[all/audio] Modify stream-map.json regarding loopback/loopback-mirroring/ringbacktone...

Change-Id: I053071693e1b54f081a38eb4843b27507f3c39fc
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json b/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json
index 547a95027d86541aae890c4e3edf41cd4ae271a4..d1b431fd93e61f6d2322891b4e76290308ca194f 100644 (file)
--- a/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json
@@ -135,7 +135,7 @@
                        "volume-types":{"in":"none","out":"call"},
                        "avail-in-devices":["audio-jack","bt","builtin-mic"],
                        "avail-out-devices":["audio-jack","builtin-speaker","bt"],
-                       "avail-frameworks":["sound-manager","tone-player"],
+                       "avail-frameworks":["sound-manager"],
                },
                {
                        "role":"call-video",
@@ -144,7 +144,7 @@
                        "volume-types":{"in":"none","out":"call"},
                        "avail-in-devices":["audio-jack","bt","builtin-mic"],
                        "avail-out-devices":["audio-jack","builtin-speaker","bt"],
-                       "avail-frameworks":["sound-manager","tone-player"],
+                       "avail-frameworks":["sound-manager"],
                },
                {
                        "role":"radio",
@@ -158,11 +158,20 @@
                {
                        "role":"loopback",
                        "priority" : 3,
+                       "route-type" : "manual",
+                       "volume-types":{"in":"none","out":"none"},
+                       "avail-in-devices":["usb"],
+                       "avail-out-devices":["builtin-speaker","usb"],
+                       "avail-frameworks":["sound-manager"],
+               },
+               {
+                       "role":"loopback-mirroring",
+                       "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["forwarding"],
-                       "avail-out-devices":["none"],
-                       "avail-frameworks":["audio-io"],
+                       "avail-out-devices":["forwarding"],
+                       "avail-frameworks":["none"],
                },
                {
                        "role":"ext-media",

diff --git a/mmfw-sysconf-target-n4/etc/pulse/stream-map.json b/mmfw-sysconf-target-n4/etc/pulse/stream-map.json
index 08732f05aa19643cb64f45a55aa0db88c211dfa8..229c049a409e18bcce5e44a9964d0a7a96c31112 100644 (file)
--- a/mmfw-sysconf-target-n4/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-n4/etc/pulse/stream-map.json
@@ -119,6 +119,15 @@
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
+               {
+                       "role":"ringbacktone-call",
+                       "priority" : 2,
+                       "route-type" : "auto",
+                       "volume-types":{"in":"none","out":"call"},
+                       "avail-in-devices":["none"],
+                       "avail-out-devices":["audio-jack","bt","builtin-receiver","builtin-speaker"],
+                       "avail-frameworks":["wav-player","tone-player"],
+               },
                {
                        "role":"voip",
                        "priority" : 5,
@@ -135,7 +144,7 @@
                        "volume-types":{"in":"none","out":"call"},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
-                       "avail-frameworks":["sound-manager","tone-player"],
+                       "avail-frameworks":["sound-manager"],
                },
                {
                        "role":"call-video",
@@ -144,7 +153,7 @@
                        "volume-types":{"in":"none","out":"call"},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
-                       "avail-frameworks":["sound-manager","tone-player"],
+                       "avail-frameworks":["sound-manager"],
                },
                {
                        "role":"radio",
@@ -158,11 +167,20 @@
                {
                        "role":"loopback",
                        "priority" : 3,
+                       "route-type" : "manual",
+                       "volume-types":{"in":"none","out":"none"},
+                       "avail-in-devices":["builtin-mic","usb"],
+                       "avail-out-devices":["builtin-speaker","usb"],
+                       "avail-frameworks":["sound-manager"],
+               },
+               {
+                       "role":"loopback-mirroring",
+                       "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["forwarding"],
-                       "avail-out-devices":["none"],
-                       "avail-frameworks":["audio-io"],
+                       "avail-out-devices":["forwarding"],
+                       "avail-frameworks":["none"],
                },
                {
                        "role":"ext-media",

diff --git a/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json b/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json
index 432e8612efe7f53ad740f16323e8fb65cef5c2f8..229c049a409e18bcce5e44a9964d0a7a96c31112 100644 (file)
--- a/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json
@@ -167,11 +167,20 @@
                {
                        "role":"loopback",
                        "priority" : 3,
+                       "route-type" : "manual",
+                       "volume-types":{"in":"none","out":"none"},
+                       "avail-in-devices":["builtin-mic","usb"],
+                       "avail-out-devices":["builtin-speaker","usb"],
+                       "avail-frameworks":["sound-manager"],
+               },
+               {
+                       "role":"loopback-mirroring",
+                       "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["forwarding"],
-                       "avail-out-devices":["none"],
-                       "avail-frameworks":["audio-io"],
+                       "avail-out-devices":["forwarding"],
+                       "avail-frameworks":["none"],
                },
                {
                        "role":"ext-media",

diff --git a/mmfw-sysconf-target-u3/etc/pulse/stream-map.json b/mmfw-sysconf-target-u3/etc/pulse/stream-map.json
index a3c06c62dcf1a18b146d1c21256b95286f6e8767..f10d51ce253ee244804133cc87cabcffd5a9e08f 100644 (file)
--- a/mmfw-sysconf-target-u3/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-u3/etc/pulse/stream-map.json
@@ -135,7 +135,7 @@
                        "volume-types":{"in":"none","out":"call"},
                        "avail-in-devices":["audio-jack","bt","builtin-mic"],
                        "avail-out-devices":["audio-jack","builtin-speaker","bt"],
-                       "avail-frameworks":["sound-manager","tone-player"],
+                       "avail-frameworks":["sound-manager"],
                },
                {
                        "role":"call-video",
@@ -144,7 +144,7 @@
                        "volume-types":{"in":"none","out":"call"},
                        "avail-in-devices":["audio-jack","bt","builtin-mic"],
                        "avail-out-devices":["audio-jack","builtin-speaker","bt"],
-                       "avail-frameworks":["sound-manager","tone-player"],
+                       "avail-frameworks":["sound-manager"],
                },
                {
                        "role":"radio",
@@ -158,11 +158,20 @@
                {
                        "role":"loopback",
                        "priority" : 3,
+                       "route-type" : "manual",
+                       "volume-types":{"in":"none","out":"none"},
+                       "avail-in-devices":["usb"],
+                       "avail-out-devices":["audio-jack","usb"],
+                       "avail-frameworks":["sound-manager"],
+               },
+               {
+                       "role":"loopback-mirroring",
+                       "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["forwarding"],
-                       "avail-out-devices":["none"],
-                       "avail-frameworks":["audio-io"],
+                       "avail-out-devices":["forwarding"],
+                       "avail-frameworks":["none"],
                },
                {
                        "role":"ext-media",

diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index 4a4694e57032750868a4f3b62cc1242aeb544107..a443492ae67e096d843acd9d2b17fdaba1ea2875 100644 (file)
--- a/packaging/mmfw-sysconf.spec
+++ b/packaging/mmfw-sysconf.spec
@@ -2,7 +2,7 @@
 
 Name:       mmfw-sysconf
 Summary:    Multimedia Framework system configuration package
-Version:    0.2.42
+Version:    0.2.43
 Release:    0
 Group:      Multimedia/Configuration
 License:    LGPL-2.1+ and Apache-2.0