From: Sangchul Lee Date: Wed, 24 Feb 2016 06:11:14 +0000 (+0900) Subject: [all/audio] Add solo role in stream-map.json and modify arguments of module-role... X-Git-Tag: submit/tizen/20160224.090353^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=11c621fb14e8f9cc40b3dfe91731bbd12d6270f2;p=platform%2Fcore%2Fmultimedia%2Fmmfw-sysconf.git [all/audio] Add solo role in stream-map.json and modify arguments of module-role-ducking for solo role in system.pa Change-Id: I5c6e3face45ef59fd4fed87eee3f49653084103e Signed-off-by: Sangchul Lee --- diff --git a/mmfw-sysconf-simulator/etc/pulse/stream-map.json b/mmfw-sysconf-simulator/etc/pulse/stream-map.json index 526fc48..4ef0c7e 100644 --- a/mmfw-sysconf-simulator/etc/pulse/stream-map.json +++ b/mmfw-sysconf-simulator/etc/pulse/stream-map.json @@ -164,5 +164,14 @@ "avail-out-devices":["none"], "avail-frameworks":["audio-io"], }, + { + "role":"solo", + "priority" : 2, + "route-type" : "auto", + "volume-types":{"in":"none","out":"none"}, + "avail-in-devices":["none"], + "avail-out-devices":["audio-jack","bt","builtin-speaker"], + "avail-frameworks":["wav-player","tone-player"], + }, ] } diff --git a/mmfw-sysconf-simulator/etc/pulse/system.pa b/mmfw-sysconf-simulator/etc/pulse/system.pa index 5ef305a..bc1e03e 100644 --- a/mmfw-sysconf-simulator/etc/pulse/system.pa +++ b/mmfw-sysconf-simulator/etc/pulse/system.pa @@ -30,7 +30,7 @@ load-module module-policy ### Sound Player module load-module module-sound-player -load-module module-role-ducking global=1 volume=0 +load-module module-role-ducking global=1 trigger_roles=solo ducking_roles=media,system,alarm,notification,voice-information,ext-media volume=0% load-module module-bluetooth-policy load-module module-bluetooth-discover diff --git a/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json b/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json index b864a17..e51618e 100644 --- a/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json +++ b/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json @@ -182,5 +182,14 @@ "avail-out-devices":["bt","usb-audio"], "avail-frameworks":["player","wav-player","tone-player","audio-io"], }, + { + "role":"solo", + "priority" : 2, + "route-type" : "auto", + "volume-types":{"in":"none","out":"none"}, + "avail-in-devices":["none"], + "avail-out-devices":["audio-jack","builtin-speaker","bt","usb-audio"], + "avail-frameworks":["wav-player","tone-player"], + }, ] } diff --git a/mmfw-sysconf-target-hawkp/etc/pulse/system.pa b/mmfw-sysconf-target-hawkp/etc/pulse/system.pa index 7cea3fa..1d4beb5 100644 --- a/mmfw-sysconf-target-hawkp/etc/pulse/system.pa +++ b/mmfw-sysconf-target-hawkp/etc/pulse/system.pa @@ -30,7 +30,7 @@ load-module module-policy ### Sound Player module load-module module-sound-player -load-module module-role-ducking global=1 volume=0 +load-module module-role-ducking global=1 trigger_roles=solo ducking_roles=media,system,alarm,notification,voice-information,ext-media volume=0% ### Automatically restore the volume of streams and devices #load-module module-stream-restore diff --git a/mmfw-sysconf-target-n4/etc/pulse/stream-map.json b/mmfw-sysconf-target-n4/etc/pulse/stream-map.json index 32aac1e..89758dc 100644 --- a/mmfw-sysconf-target-n4/etc/pulse/stream-map.json +++ b/mmfw-sysconf-target-n4/etc/pulse/stream-map.json @@ -191,5 +191,14 @@ "avail-out-devices":["bt"], "avail-frameworks":["player","wav-player","tone-player","audio-io"], }, + { + "role":"solo", + "priority" : 2, + "route-type" : "auto", + "volume-types":{"in":"none","out":"none"}, + "avail-in-devices":["none"], + "avail-out-devices":["audio-jack","bt","builtin-speaker"], + "avail-frameworks":["wav-player","tone-player"], + }, ] } diff --git a/mmfw-sysconf-target-n4/etc/pulse/system.pa b/mmfw-sysconf-target-n4/etc/pulse/system.pa index 5ef305a..bc1e03e 100644 --- a/mmfw-sysconf-target-n4/etc/pulse/system.pa +++ b/mmfw-sysconf-target-n4/etc/pulse/system.pa @@ -30,7 +30,7 @@ load-module module-policy ### Sound Player module load-module module-sound-player -load-module module-role-ducking global=1 volume=0 +load-module module-role-ducking global=1 trigger_roles=solo ducking_roles=media,system,alarm,notification,voice-information,ext-media volume=0% load-module module-bluetooth-policy load-module module-bluetooth-discover diff --git a/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json b/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json index 32aac1e..89758dc 100644 --- a/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json +++ b/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json @@ -191,5 +191,14 @@ "avail-out-devices":["bt"], "avail-frameworks":["player","wav-player","tone-player","audio-io"], }, + { + "role":"solo", + "priority" : 2, + "route-type" : "auto", + "volume-types":{"in":"none","out":"none"}, + "avail-in-devices":["none"], + "avail-out-devices":["audio-jack","bt","builtin-speaker"], + "avail-frameworks":["wav-player","tone-player"], + }, ] } diff --git a/mmfw-sysconf-target-tm1/etc/pulse/system.pa b/mmfw-sysconf-target-tm1/etc/pulse/system.pa index 5ef305a..bc1e03e 100644 --- a/mmfw-sysconf-target-tm1/etc/pulse/system.pa +++ b/mmfw-sysconf-target-tm1/etc/pulse/system.pa @@ -30,7 +30,7 @@ load-module module-policy ### Sound Player module load-module module-sound-player -load-module module-role-ducking global=1 volume=0 +load-module module-role-ducking global=1 trigger_roles=solo ducking_roles=media,system,alarm,notification,voice-information,ext-media volume=0% load-module module-bluetooth-policy load-module module-bluetooth-discover diff --git a/mmfw-sysconf-target-u3/etc/pulse/stream-map.json b/mmfw-sysconf-target-u3/etc/pulse/stream-map.json index f6be08d..9842c99 100644 --- a/mmfw-sysconf-target-u3/etc/pulse/stream-map.json +++ b/mmfw-sysconf-target-u3/etc/pulse/stream-map.json @@ -182,5 +182,14 @@ "avail-out-devices":["bt","usb-audio"], "avail-frameworks":["player","wav-player","tone-player","audio-io"], }, + { + "role":"solo", + "priority" : 2, + "route-type" : "auto", + "volume-types":{"in":"none","out":"none"}, + "avail-in-devices":["none"], + "avail-out-devices":["audio-jack","builtin-speaker","bt","usb-audio"], + "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 5ef305a..bc1e03e 100644 --- a/mmfw-sysconf-target-u3/etc/pulse/system.pa +++ b/mmfw-sysconf-target-u3/etc/pulse/system.pa @@ -30,7 +30,7 @@ load-module module-policy ### Sound Player module load-module module-sound-player -load-module module-role-ducking global=1 volume=0 +load-module module-role-ducking global=1 trigger_roles=solo ducking_roles=media,system,alarm,notification,voice-information,ext-media volume=0% load-module module-bluetooth-policy load-module module-bluetooth-discover diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec index c3f2b26..b0ee731 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.49 +Version: 0.2.50 Release: 0 Group: Multimedia/Configuration License: LGPL-2.1+ and Apache-2.0