From 3a4693143f972dea4848511c7fd47b6a46ef9a04 Mon Sep 17 00:00:00 2001 From: Seungbae Shin Date: Fri, 4 Aug 2017 14:07:20 +0900 Subject: [PATCH] [Audio] load bluetooth modules only if exists [Version] 0.2.112 [Profile] Common [Issue Type] Enhancement Change-Id: Ib68c1fd35d55122637022d766c7c3ed0135cbfc4 --- mmfw-sysconf-simulator/etc/pulse/system.pa | 6 ++++++ mmfw-sysconf-target-artik10/etc/pulse/system.pa | 6 ++++++ mmfw-sysconf-target-n4/etc/pulse/system.pa | 6 ++++++ mmfw-sysconf-target-rpi3/etc/pulse/system.pa | 7 +++++++ mmfw-sysconf-target-tm1/etc/pulse/system.pa | 6 ++++++ mmfw-sysconf-target-tw1/etc/pulse/system.pa | 6 ++++++ mmfw-sysconf-target-tw2/etc/pulse/system.pa | 6 ++++++ mmfw-sysconf-target-u3/etc/pulse/system.pa | 7 +++++++ packaging/mmfw-sysconf.spec | 2 +- 9 files changed, 51 insertions(+), 1 deletion(-) diff --git a/mmfw-sysconf-simulator/etc/pulse/system.pa b/mmfw-sysconf-simulator/etc/pulse/system.pa index 7db1e0d..b6a0ef2 100644 --- a/mmfw-sysconf-simulator/etc/pulse/system.pa +++ b/mmfw-sysconf-simulator/etc/pulse/system.pa @@ -34,8 +34,14 @@ load-module module-role-ducking global=1 trigger_roles=solo/notification ducking load-module module-hw-keysound load-module module-poweroff +### Automatically load driver modules for Bluetooth hardware +.ifexists module-bluetooth-policy.so load-module module-bluetooth-policy +.endif + +.ifexists module-bluetooth-discover.so load-module module-bluetooth-discover +.endif ### Automatically restore the volume of streams and devices #load-module module-stream-restore diff --git a/mmfw-sysconf-target-artik10/etc/pulse/system.pa b/mmfw-sysconf-target-artik10/etc/pulse/system.pa index 21ee9ba..532fd0a 100644 --- a/mmfw-sysconf-target-artik10/etc/pulse/system.pa +++ b/mmfw-sysconf-target-artik10/etc/pulse/system.pa @@ -32,8 +32,14 @@ load-module module-tizenaudio-policy 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 +### Automatically load driver modules for Bluetooth hardware +.ifexists module-bluetooth-policy.so load-module module-bluetooth-policy +.endif + +.ifexists module-bluetooth-discover.so load-module module-bluetooth-discover +.endif ### Automatically restore the volume of streams and devices #load-module module-stream-restore diff --git a/mmfw-sysconf-target-n4/etc/pulse/system.pa b/mmfw-sysconf-target-n4/etc/pulse/system.pa index 7db1e0d..b6a0ef2 100644 --- a/mmfw-sysconf-target-n4/etc/pulse/system.pa +++ b/mmfw-sysconf-target-n4/etc/pulse/system.pa @@ -34,8 +34,14 @@ load-module module-role-ducking global=1 trigger_roles=solo/notification ducking load-module module-hw-keysound load-module module-poweroff +### Automatically load driver modules for Bluetooth hardware +.ifexists module-bluetooth-policy.so load-module module-bluetooth-policy +.endif + +.ifexists module-bluetooth-discover.so load-module module-bluetooth-discover +.endif ### Automatically restore the volume of streams and devices #load-module module-stream-restore diff --git a/mmfw-sysconf-target-rpi3/etc/pulse/system.pa b/mmfw-sysconf-target-rpi3/etc/pulse/system.pa index c851bf7..5aac8b9 100644 --- a/mmfw-sysconf-target-rpi3/etc/pulse/system.pa +++ b/mmfw-sysconf-target-rpi3/etc/pulse/system.pa @@ -32,8 +32,15 @@ load-module module-udev-detect load-module module-sound-player 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 load-module module-bluetooth-policy +.endif + +.ifexists module-bluetooth-discover.so load-module module-bluetooth-discover +.endif + ### Automatically restore the volume of streams and devices #load-module module-stream-restore diff --git a/mmfw-sysconf-target-tm1/etc/pulse/system.pa b/mmfw-sysconf-target-tm1/etc/pulse/system.pa index 7db1e0d..b6a0ef2 100644 --- a/mmfw-sysconf-target-tm1/etc/pulse/system.pa +++ b/mmfw-sysconf-target-tm1/etc/pulse/system.pa @@ -34,8 +34,14 @@ load-module module-role-ducking global=1 trigger_roles=solo/notification ducking load-module module-hw-keysound load-module module-poweroff +### Automatically load driver modules for Bluetooth hardware +.ifexists module-bluetooth-policy.so load-module module-bluetooth-policy +.endif + +.ifexists module-bluetooth-discover.so load-module module-bluetooth-discover +.endif ### Automatically restore the volume of streams and devices #load-module module-stream-restore diff --git a/mmfw-sysconf-target-tw1/etc/pulse/system.pa b/mmfw-sysconf-target-tw1/etc/pulse/system.pa index d83c69c..7412d18 100644 --- a/mmfw-sysconf-target-tw1/etc/pulse/system.pa +++ b/mmfw-sysconf-target-tw1/etc/pulse/system.pa @@ -33,8 +33,14 @@ 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-poweroff +### Automatically load driver modules for Bluetooth hardware +.ifexists module-bluetooth-policy.so load-module module-bluetooth-policy +.endif + +.ifexists module-bluetooth-discover.so load-module module-bluetooth-discover +.endif ### Automatically restore the volume of streams and devices #load-module module-stream-restore diff --git a/mmfw-sysconf-target-tw2/etc/pulse/system.pa b/mmfw-sysconf-target-tw2/etc/pulse/system.pa index d83c69c..7412d18 100644 --- a/mmfw-sysconf-target-tw2/etc/pulse/system.pa +++ b/mmfw-sysconf-target-tw2/etc/pulse/system.pa @@ -33,8 +33,14 @@ 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-poweroff +### Automatically load driver modules for Bluetooth hardware +.ifexists module-bluetooth-policy.so load-module module-bluetooth-policy +.endif + +.ifexists module-bluetooth-discover.so load-module module-bluetooth-discover +.endif ### Automatically restore the volume of streams and devices #load-module module-stream-restore diff --git a/mmfw-sysconf-target-u3/etc/pulse/system.pa b/mmfw-sysconf-target-u3/etc/pulse/system.pa index c851bf7..5aac8b9 100644 --- a/mmfw-sysconf-target-u3/etc/pulse/system.pa +++ b/mmfw-sysconf-target-u3/etc/pulse/system.pa @@ -32,8 +32,15 @@ load-module module-udev-detect load-module module-sound-player 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 load-module module-bluetooth-policy +.endif + +.ifexists module-bluetooth-discover.so load-module module-bluetooth-discover +.endif + ### Automatically restore the volume of streams and devices #load-module module-stream-restore diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec index 30f2f25..14e164f 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.111 +Version: 0.2.112 Release: 0 Group: Multimedia/Configuration License: LGPL-2.1 and Apache-2.0 -- 2.34.1