From 45a0406a8a443d02a99f3d07b9a28ccd52fda563 Mon Sep 17 00:00:00 2001 From: Sangchul Lee Date: Mon, 11 Jan 2016 19:17:44 +0900 Subject: [PATCH] [all/audio] Modify stream-map.json regarding loopback/loopback-mirroring/ringbacktone-call stream type Change-Id: I053071693e1b54f081a38eb4843b27507f3c39fc Signed-off-by: Sangchul Lee --- .../etc/pulse/stream-map.json | 17 +++++++++--- .../etc/pulse/stream-map.json | 26 ++++++++++++++++--- .../etc/pulse/stream-map.json | 13 ++++++++-- .../etc/pulse/stream-map.json | 17 +++++++++--- packaging/mmfw-sysconf.spec | 2 +- 5 files changed, 60 insertions(+), 15 deletions(-) diff --git a/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json b/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json index 547a950..d1b431f 100644 --- 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 08732f0..229c049 100644 --- 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 432e861..229c049 100644 --- 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 a3c06c6..f10d51c 100644 --- 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 4a4694e..a443492 100644 --- 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 -- 2.34.1