From 5408f49a9a6532cc3fd4f5a80422857abd0fdd5e Mon Sep 17 00:00:00 2001 From: Sangchul Lee Date: Tue, 8 Mar 2016 11:43:06 +0900 Subject: [PATCH] [simulator/audio] Modify stream-map.json Change-Id: Id27e9f5424c1781a12a293476c079920090a302d --- .../etc/pulse/stream-map.json | 60 ++++++++++++------- packaging/mmfw-sysconf.spec | 2 +- 2 files changed, 40 insertions(+), 22 deletions(-) diff --git a/mmfw-sysconf-simulator/etc/pulse/stream-map.json b/mmfw-sysconf-simulator/etc/pulse/stream-map.json index 8e93334..d38f08a 100644 --- a/mmfw-sysconf-simulator/etc/pulse/stream-map.json +++ b/mmfw-sysconf-simulator/etc/pulse/stream-map.json @@ -44,7 +44,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"media"}, "avail-in-devices":["audio-jack","builtin-mic"], - "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker"], + "avail-out-devices":["audio-jack","builtin-speaker"], "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"], }, { @@ -53,7 +53,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"system"}, "avail-in-devices":["none"], - "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker"], + "avail-out-devices":["audio-jack","builtin-speaker"], "avail-frameworks":["player","wav-player","tone-player","audio-io"], }, { @@ -62,7 +62,7 @@ "route-type" : "auto-all", "volume-types":{"in":"none","out":"alarm"}, "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","bt","builtin-speaker"], + "avail-out-devices":["audio-jack","builtin-speaker"], "avail-frameworks":["player","wav-player","tone-player","audio-io"], }, { @@ -71,7 +71,7 @@ "route-type" : "auto-all", "volume-types":{"in":"none","out":"notification"}, "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","bt","builtin-speaker"], + "avail-out-devices":["audio-jack","builtin-speaker"], "avail-frameworks":["player","wav-player","tone-player","audio-io"], }, { @@ -89,7 +89,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"voice"}, "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","bt","builtin-speaker"], + "avail-out-devices":["audio-jack","builtin-speaker"], "avail-frameworks":["player","wav-player","tone-player","audio-io"], }, { @@ -107,7 +107,7 @@ "route-type" : "auto-all", "volume-types":{"in":"none","out":"ringtone"}, "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","bt","builtin-speaker"], + "avail-out-devices":["audio-jack","builtin-speaker"], "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"], }, { @@ -116,16 +116,25 @@ "route-type" : "auto-all", "volume-types":{"in":"none","out":"ringtone"}, "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","bt","builtin-speaker"], + "avail-out-devices":["audio-jack","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","builtin-receiver","builtin-speaker"], + "avail-frameworks":["wav-player","tone-player"], + }, { "role":"voip", "priority" : 5, "route-type" : "manual", "volume-types":{"in":"none","out":"voip"}, - "avail-in-devices":["builtin-mic","audio-jack","bt"], - "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"], + "avail-in-devices":["builtin-mic","audio-jack"], + "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack"], "avail-frameworks":["audio-io","tone-player","sound-manager"], }, { @@ -133,18 +142,18 @@ "priority" : 6, "route-type" : "manual", "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-in-devices":["builtin-mic","audio-jack"], + "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack"], + "avail-frameworks":["sound-manager"], }, { "role":"call-video", "priority" : 6, "route-type" : "manual", "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-in-devices":["builtin-mic","audio-jack"], + "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack"], + "avail-frameworks":["sound-manager"], }, { "role":"radio", @@ -157,12 +166,21 @@ }, { "role":"loopback", - "priority" : 3, - "route-type" : "auto", + "priority" : 2, + "route-type" : "manual", "volume-types":{"in":"none","out":"none"}, - "avail-in-devices":["forwarding"], - "avail-out-devices":["none"], - "avail-frameworks":["audio-io"], + "avail-in-devices":["usb-audio"], + "avail-out-devices":["builtin-speaker","usb-audio"], + "avail-frameworks":["sound-manager"], + }, + { + "role":"ext-media", + "priority" : 3, + "route-type" : "manual-ext", + "volume-types":{"in":"none","out":"media"}, + "avail-in-devices":["usb-audio"], + "avail-out-devices":["usb-audio"], + "avail-frameworks":["player","wav-player","tone-player","audio-io"], }, { "role":"solo", @@ -170,7 +188,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"none"}, "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","bt","builtin-speaker"], + "avail-out-devices":["audio-jack","builtin-speaker"], "avail-frameworks":["wav-player","tone-player"], }, ] diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec index 58fd54b..1849b20 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.53 +Version: 0.2.54 Release: 0 Group: Multimedia/Configuration License: LGPL-2.1+ and Apache-2.0 -- 2.34.1