From caa7add861bbaa3ef3157fb36629906c5da8640b Mon Sep 17 00:00:00 2001 From: Seungbae Shin Date: Tue, 22 Aug 2017 19:16:37 +0900 Subject: [PATCH] [Audio] Update device/stream-map.json properly [Version] 0.2.114 [Profile] Common [Issue Type] Revise Change-Id: I1f36216dce42b7ae0e65a85f5828118a12f00af5 --- .../etc/pulse/device-map.json | 18 ------ .../etc/pulse/stream-map.json | 73 +++++----------------- mmfw-sysconf-target-artik10/etc/pulse/system.pa | 10 +-- mmfw-sysconf-target-rpi3/etc/pulse/stream-map.json | 8 +-- mmfw-sysconf-target-u3/etc/pulse/device-map.json | 18 ------ mmfw-sysconf-target-u3/etc/pulse/stream-map.json | 73 +++++----------------- mmfw-sysconf-target-u3/etc/pulse/system.pa | 1 - packaging/mmfw-sysconf.spec | 2 +- 8 files changed, 38 insertions(+), 165 deletions(-) diff --git a/mmfw-sysconf-target-artik10/etc/pulse/device-map.json b/mmfw-sysconf-target-artik10/etc/pulse/device-map.json index 69e5ad0..d241012 100644 --- a/mmfw-sysconf-target-artik10/etc/pulse/device-map.json +++ b/mmfw-sysconf-target-artik10/etc/pulse/device-map.json @@ -5,26 +5,8 @@ "playback-devices":{"normal":"alsa:0,0"} }, { - "device-type":"builtin-receiver", - "playback-devices":{"normal":"alsa:0,0"} - }, - { "device-type":"builtin-mic", "capture-devices":{"normal":"alsa:0,0"} - }, - { - "device-type":"audio-jack", - "playback-devices":{"normal":"alsa:0,0"}, - "capture-devices":{"normal":"alsa:0,0"} - }, - { - "device-type":"hdmi", - "playback-devices":{"normal":"alsa:0,0"} - }, - { - "device-type":"bt-sco", - "playback-devices":{"normal":"alsa:0,0"}, - "capture-devices":{"normal":"alsa:0,0"} } ], "device-files":{ diff --git a/mmfw-sysconf-target-artik10/etc/pulse/stream-map.json b/mmfw-sysconf-target-artik10/etc/pulse/stream-map.json index 84f37e9..557c2e2 100644 --- a/mmfw-sysconf-target-artik10/etc/pulse/stream-map.json +++ b/mmfw-sysconf-target-artik10/etc/pulse/stream-map.json @@ -85,8 +85,8 @@ "priority" : 3, "route-type" : "auto", "volume-types":{"in":"none","out":"media"}, - "avail-in-devices":["audio-jack","builtin-mic"], - "avail-out-devices":["forwarding","audio-jack","bt-a2dp","builtin-speaker","usb-audio"], + "avail-in-devices":["builtin-mic"], + "avail-out-devices":["bt-a2dp","usb-audio","builtin-speaker"], "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"] }, { @@ -95,7 +95,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"system"}, "avail-in-devices":["none"], - "avail-out-devices":["forwarding","audio-jack","bt-a2dp","builtin-speaker","usb-audio"], + "avail-out-devices":["bt-a2dp","usb-audio","builtin-speaker"], "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { @@ -104,7 +104,7 @@ "route-type" : "auto-all", "volume-types":{"in":"none","out":"alarm"}, "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker","usb-audio"], + "avail-out-devices":["bt-a2dp","builtin-speaker","usb-audio"], "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { @@ -113,7 +113,7 @@ "route-type" : "auto-all", "volume-types":{"in":"none","out":"notification"}, "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker","usb-audio"], + "avail-out-devices":["bt-a2dp","builtin-speaker","usb-audio"], "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { @@ -122,7 +122,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"none"}, "avail-in-devices":["none"], - "avail-out-devices":["builtin-speaker","audio-jack","bt-a2dp","usb-audio"], + "avail-out-devices":["builtin-speaker"], "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { @@ -131,7 +131,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"voice"}, "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker","usb-audio"], + "avail-out-devices":["bt-a2dp","usb-audio","builtin-speaker"], "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { @@ -139,7 +139,7 @@ "priority" : 3, "route-type" : "auto", "volume-types":{"in":"none","out":"none"}, - "avail-in-devices":["audio-jack","usb-audio","builtin-mic"], + "avail-in-devices":["usb-audio","builtin-mic"], "avail-out-devices":["none"], "avail-frameworks":["audio-io"] }, @@ -148,7 +148,7 @@ "priority" : 3, "route-type" : "auto", "volume-types":{"in":"none","out":"none"}, - "avail-in-devices":["audio-jack","usb-audio","builtin-mic"], + "avail-in-devices":["usb-audio","builtin-mic"], "avail-out-devices":["none"], "avail-frameworks":["audio-io"] }, @@ -158,73 +158,28 @@ "route-type" : "auto-all", "volume-types":{"in":"none","out":"ringtone"}, "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker","usb-audio"], + "avail-out-devices":["bt-a2dp","builtin-speaker","usb-audio"], "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"] }, { - "role":"ringtone-call", - "priority" : 6, - "route-type" : "auto-all", - "volume-types":{"in":"none","out":"ringtone"}, - "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker","usb-audio"], - "avail-frameworks":["player","wav-player","tone-player","audio-io"] - }, - { "role":"voip", "priority" : 5, "route-type" : "manual", "volume-types":{"in":"none","out":"voip"}, - "avail-in-devices":["audio-jack","bt-sco","builtin-mic"], - "avail-out-devices":["audio-jack","bt-sco","builtin-speaker"], + "avail-in-devices":["builtin-mic"], + "avail-out-devices":["builtin-speaker"], "avail-frameworks":["audio-io","tone-player","sound-manager"] }, { - "role":"call-voice", - "priority" : 6, - "route-type" : "manual", - "volume-types":{"in":"none","out":"call"}, - "avail-in-devices":["audio-jack","bt-sco","builtin-mic"], - "avail-out-devices":["audio-jack","bt-sco","builtin-speaker"], - "avail-frameworks":["sound-manager"] - }, - { - "role":"call-video", - "priority" : 6, - "route-type" : "manual", - "volume-types":{"in":"none","out":"call"}, - "avail-in-devices":["audio-jack","bt-sco","builtin-mic"], - "avail-out-devices":["audio-jack","bt-sco","builtin-speaker"], - "avail-frameworks":["sound-manager"] - }, - { - "role":"radio", - "priority" : 3, - "route-type" : "auto", - "volume-types":{"in":"none","out":"media"}, - "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","builtin-speaker"], - "avail-frameworks":["sound-manager"] - }, - { "role":"loopback", "priority" : 2, "route-type" : "manual", "volume-types":{"in":"none","out":"none"}, "avail-in-devices":["usb-audio"], - "avail-out-devices":["audio-jack","usb-audio"], + "avail-out-devices":["usb-audio"], "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"] - }, - { "role":"ext-media", "priority" : 3, "route-type" : "manual-ext", @@ -239,7 +194,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"none"}, "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker","usb-audio"], + "avail-out-devices":["bt-a2dp","usb-audio","builtin-speaker"], "avail-frameworks":["wav-player","tone-player"] } ] diff --git a/mmfw-sysconf-target-artik10/etc/pulse/system.pa b/mmfw-sysconf-target-artik10/etc/pulse/system.pa index 532fd0a..8168919 100644 --- a/mmfw-sysconf-target-artik10/etc/pulse/system.pa +++ b/mmfw-sysconf-target-artik10/etc/pulse/system.pa @@ -18,19 +18,19 @@ # mode. ### Automatically load driver modules depending on the hardware available -#.ifexists module-udev-detect.so -load-module module-udev-detect -#.endif - ### Load several protocols load-module module-native-protocol-unix auth-anonymous=1 ### Load module-tizenaudio-policy load-module module-tizenaudio-policy +#.ifexists module-udev-detect.so +load-module module-udev-detect +#.endif + ### Sound Player module load-module module-sound-player -load-module module-role-ducking global=1 trigger_roles=solo/notification ducking_roles=media,system,alarm,notification,voice-information,ext-media/media,ext-media volume=0%/25% fade_in=0/1000 fade_out=0/1000 +load-module module-role-ducking global=1 trigger_roles=solo/notification,voice-information ducking_roles=media,system,alarm,notification,voice-information,ext-media/media,ext-media volume=0%/25% fade_in=0/1000 fade_out=0/1000 ### Automatically load driver modules for Bluetooth hardware .ifexists module-bluetooth-policy.so diff --git a/mmfw-sysconf-target-rpi3/etc/pulse/stream-map.json b/mmfw-sysconf-target-rpi3/etc/pulse/stream-map.json index 0226c89..fa3f3e4 100644 --- a/mmfw-sysconf-target-rpi3/etc/pulse/stream-map.json +++ b/mmfw-sysconf-target-rpi3/etc/pulse/stream-map.json @@ -86,7 +86,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"media"}, "avail-in-devices":["usb-audio"], - "avail-out-devices":["builtin-speaker","bt-a2dp","usb-audio"], + "avail-out-devices":["bt-a2dp","usb-audio","builtin-speaker"], "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"] }, { @@ -95,7 +95,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"system"}, "avail-in-devices":["none"], - "avail-out-devices":["builtin-speaker","bt-a2dp","usb-audio"], + "avail-out-devices":["bt-a2dp","usb-audio","builtin-speaker"], "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { @@ -122,7 +122,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"none"}, "avail-in-devices":["none"], - "avail-out-devices":["builtin-speaker","bt-a2dp","usb-audio"], + "avail-out-devices":["builtin-speaker"], "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { @@ -131,7 +131,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"voice"}, "avail-in-devices":["none"], - "avail-out-devices":["builtin-speaker","bt-a2dp","usb-audio"], + "avail-out-devices":["bt-a2dp","usb-audio","builtin-speaker"], "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { diff --git a/mmfw-sysconf-target-u3/etc/pulse/device-map.json b/mmfw-sysconf-target-u3/etc/pulse/device-map.json index f7c7f0e..d35583e 100644 --- a/mmfw-sysconf-target-u3/etc/pulse/device-map.json +++ b/mmfw-sysconf-target-u3/etc/pulse/device-map.json @@ -5,26 +5,8 @@ "playback-devices":{"normal":"alsa:0,0"} }, { - "device-type":"builtin-receiver", - "playback-devices":{"normal":"alsa:0,0"} - }, - { "device-type":"builtin-mic", "capture-devices":{"normal":"alsa:0,0"} - }, - { - "device-type":"audio-jack", - "playback-devices":{"normal":"alsa:0,0"}, - "capture-devices":{"normal":"alsa:0,0"} - }, - { - "device-type":"hdmi", - "playback-devices":{"normal":"alsa:0,0"} - }, - { - "device-type":"bt-sco", - "playback-devices":{"normal":"alsa:0,0"}, - "capture-devices":{"normal":"alsa:0,0"} } ], "device-files":{ diff --git a/mmfw-sysconf-target-u3/etc/pulse/stream-map.json b/mmfw-sysconf-target-u3/etc/pulse/stream-map.json index 3b74807..557c2e2 100644 --- a/mmfw-sysconf-target-u3/etc/pulse/stream-map.json +++ b/mmfw-sysconf-target-u3/etc/pulse/stream-map.json @@ -85,8 +85,8 @@ "priority" : 3, "route-type" : "auto", "volume-types":{"in":"none","out":"media"}, - "avail-in-devices":["audio-jack","builtin-mic"], - "avail-out-devices":["forwarding","audio-jack","builtin-speaker","bt-a2dp","usb-audio"], + "avail-in-devices":["builtin-mic"], + "avail-out-devices":["bt-a2dp","usb-audio","builtin-speaker"], "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"] }, { @@ -95,7 +95,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"system"}, "avail-in-devices":["none"], - "avail-out-devices":["forwarding","audio-jack","builtin-speaker","bt-a2dp","usb-audio"], + "avail-out-devices":["bt-a2dp","usb-audio","builtin-speaker"], "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { @@ -104,7 +104,7 @@ "route-type" : "auto-all", "volume-types":{"in":"none","out":"alarm"}, "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"], + "avail-out-devices":["bt-a2dp","builtin-speaker","usb-audio"], "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { @@ -113,7 +113,7 @@ "route-type" : "auto-all", "volume-types":{"in":"none","out":"notification"}, "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"], + "avail-out-devices":["bt-a2dp","builtin-speaker","usb-audio"], "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { @@ -122,7 +122,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"none"}, "avail-in-devices":["none"], - "avail-out-devices":["builtin-speaker","audio-jack","bt-a2dp","usb-audio"], + "avail-out-devices":["builtin-speaker"], "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { @@ -131,7 +131,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"voice"}, "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"], + "avail-out-devices":["bt-a2dp","usb-audio","builtin-speaker"], "avail-frameworks":["player","wav-player","tone-player","audio-io"] }, { @@ -139,7 +139,7 @@ "priority" : 3, "route-type" : "auto", "volume-types":{"in":"none","out":"none"}, - "avail-in-devices":["audio-jack","usb-audio","builtin-mic"], + "avail-in-devices":["usb-audio","builtin-mic"], "avail-out-devices":["none"], "avail-frameworks":["audio-io"] }, @@ -148,7 +148,7 @@ "priority" : 3, "route-type" : "auto", "volume-types":{"in":"none","out":"none"}, - "avail-in-devices":["audio-jack","usb-audio","builtin-mic"], + "avail-in-devices":["usb-audio","builtin-mic"], "avail-out-devices":["none"], "avail-frameworks":["audio-io"] }, @@ -158,73 +158,28 @@ "route-type" : "auto-all", "volume-types":{"in":"none","out":"ringtone"}, "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"], + "avail-out-devices":["bt-a2dp","builtin-speaker","usb-audio"], "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"] }, { - "role":"ringtone-call", - "priority" : 6, - "route-type" : "auto-all", - "volume-types":{"in":"none","out":"ringtone"}, - "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"], - "avail-frameworks":["player","wav-player","tone-player","audio-io"] - }, - { "role":"voip", "priority" : 5, "route-type" : "manual", "volume-types":{"in":"none","out":"voip"}, - "avail-in-devices":["audio-jack","bt-sco","builtin-mic"], - "avail-out-devices":["audio-jack","builtin-speaker","bt-sco"], + "avail-in-devices":["builtin-mic"], + "avail-out-devices":["builtin-speaker"], "avail-frameworks":["audio-io","tone-player","sound-manager"] }, { - "role":"call-voice", - "priority" : 6, - "route-type" : "manual", - "volume-types":{"in":"none","out":"call"}, - "avail-in-devices":["audio-jack","bt-sco","builtin-mic"], - "avail-out-devices":["audio-jack","builtin-speaker","bt-sco"], - "avail-frameworks":["sound-manager"] - }, - { - "role":"call-video", - "priority" : 6, - "route-type" : "manual", - "volume-types":{"in":"none","out":"call"}, - "avail-in-devices":["audio-jack","bt-sco","builtin-mic"], - "avail-out-devices":["audio-jack","builtin-speaker","bt-sco"], - "avail-frameworks":["sound-manager"] - }, - { - "role":"radio", - "priority" : 3, - "route-type" : "auto", - "volume-types":{"in":"none","out":"media"}, - "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","builtin-speaker"], - "avail-frameworks":["sound-manager"] - }, - { "role":"loopback", "priority" : 2, "route-type" : "manual", "volume-types":{"in":"none","out":"none"}, "avail-in-devices":["usb-audio"], - "avail-out-devices":["audio-jack","usb-audio"], + "avail-out-devices":["usb-audio"], "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"] - }, - { "role":"ext-media", "priority" : 3, "route-type" : "manual-ext", @@ -239,7 +194,7 @@ "route-type" : "auto", "volume-types":{"in":"none","out":"none"}, "avail-in-devices":["none"], - "avail-out-devices":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"], + "avail-out-devices":["bt-a2dp","usb-audio","builtin-speaker"], "avail-frameworks":["wav-player","tone-player"] } ] diff --git a/mmfw-sysconf-target-u3/etc/pulse/system.pa b/mmfw-sysconf-target-u3/etc/pulse/system.pa index 5aac8b9..8168919 100644 --- a/mmfw-sysconf-target-u3/etc/pulse/system.pa +++ b/mmfw-sysconf-target-u3/etc/pulse/system.pa @@ -41,7 +41,6 @@ load-module module-bluetooth-policy load-module module-bluetooth-discover .endif - ### Automatically restore the volume of streams and devices #load-module module-stream-restore #load-module module-device-restore diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec index 64b92e4..7ab6d8b 100644 --- a/packaging/mmfw-sysconf.spec +++ b/packaging/mmfw-sysconf.spec @@ -1,6 +1,6 @@ Name: mmfw-sysconf Summary: Multimedia Framework system configuration package -Version: 0.2.113 +Version: 0.2.114 Release: 0 Group: Multimedia/Configuration License: LGPL-2.1 and Apache-2.0 -- 2.7.4