[all/audio] Modify module load sequence of pulseaudio

load module-native-protocol and then module-policy

Change-Id: Ic9ae034b397e85864abe287f853aff918d9a2d09
Signed-off-by: Seonmi Jin <seonmi.jin@samsung.com>

diff --git a/mmfw-sysconf-simulator/etc/pulse/system.pa b/mmfw-sysconf-simulator/etc/pulse/system.pa
old mode 100755 (executable)
new mode 100644 (file)
index 6bfd3a8..a024edb
--- a/mmfw-sysconf-simulator/etc/pulse/system.pa
+++ b/mmfw-sysconf-simulator/etc/pulse/system.pa
@@ -20,7 +20,6 @@
 # mode.
 
 ### Custom policy module to route between bt<=speaker
-load-module module-policy
 #load-module module-alsa-sink sink_name=alsa_output.0.analog-stereo device=hw:0,0
 #load-module module-alsa-sink sink_name=alsa_output.0.analog-stereo device=hw:0,0 fragment_size=8192
 #load-module module-alsa-source source_name=alsa_input.0.analog-stereo device=hw:0,0 fragment_size=8192
@@ -37,19 +36,20 @@ load-module module-policy
 #load-module module-detect
 #.endif
 
-### Sound Player module
-load-module module-sound-player
-
-load-module module-role-ducking global=1 volume=0
-
 ### Load several protocols
 .ifexists module-esound-protocol-unix.so
 load-module module-esound-protocol-unix
 .endif
 load-module module-native-protocol-unix auth-anonymous=1
 
-load-module module-bluetooth-policy
+### Load module-policy
+load-module module-policy
+
+### Sound Player module
+load-module module-sound-player
+load-module module-role-ducking global=1 volume=0
 
+load-module module-bluetooth-policy
 load-module module-bluetooth-discover
 #load-module module-bluetooth-discover enable_scmst=true
 

diff --git a/mmfw-sysconf-target-n4/etc/pulse/system.pa b/mmfw-sysconf-target-n4/etc/pulse/system.pa
index 6bfd3a89664533f7cdb88dcb144fdfb97d156dab..a024edb52c2a71fa405d7521bfe21cc58215d950 100644 (file)
--- a/mmfw-sysconf-target-n4/etc/pulse/system.pa
+++ b/mmfw-sysconf-target-n4/etc/pulse/system.pa
@@ -20,7 +20,6 @@
 # mode.
 
 ### Custom policy module to route between bt<=speaker
-load-module module-policy
 #load-module module-alsa-sink sink_name=alsa_output.0.analog-stereo device=hw:0,0
 #load-module module-alsa-sink sink_name=alsa_output.0.analog-stereo device=hw:0,0 fragment_size=8192
 #load-module module-alsa-source source_name=alsa_input.0.analog-stereo device=hw:0,0 fragment_size=8192
@@ -37,19 +36,20 @@ load-module module-policy
 #load-module module-detect
 #.endif
 
-### Sound Player module
-load-module module-sound-player
-
-load-module module-role-ducking global=1 volume=0
-
 ### Load several protocols
 .ifexists module-esound-protocol-unix.so
 load-module module-esound-protocol-unix
 .endif
 load-module module-native-protocol-unix auth-anonymous=1
 
-load-module module-bluetooth-policy
+### Load module-policy
+load-module module-policy
+
+### Sound Player module
+load-module module-sound-player
+load-module module-role-ducking global=1 volume=0
 
+load-module module-bluetooth-policy
 load-module module-bluetooth-discover
 #load-module module-bluetooth-discover enable_scmst=true
 

diff --git a/mmfw-sysconf-target-u3/etc/pulse/system.pa b/mmfw-sysconf-target-u3/etc/pulse/system.pa
old mode 100755 (executable)
new mode 100644 (file)
index 6bfd3a8..a024edb
--- a/mmfw-sysconf-target-u3/etc/pulse/system.pa
+++ b/mmfw-sysconf-target-u3/etc/pulse/system.pa
@@ -20,7 +20,6 @@
 # mode.
 
 ### Custom policy module to route between bt<=speaker
-load-module module-policy
 #load-module module-alsa-sink sink_name=alsa_output.0.analog-stereo device=hw:0,0
 #load-module module-alsa-sink sink_name=alsa_output.0.analog-stereo device=hw:0,0 fragment_size=8192
 #load-module module-alsa-source source_name=alsa_input.0.analog-stereo device=hw:0,0 fragment_size=8192
@@ -37,19 +36,20 @@ load-module module-policy
 #load-module module-detect
 #.endif
 
-### Sound Player module
-load-module module-sound-player
-
-load-module module-role-ducking global=1 volume=0
-
 ### Load several protocols
 .ifexists module-esound-protocol-unix.so
 load-module module-esound-protocol-unix
 .endif
 load-module module-native-protocol-unix auth-anonymous=1
 
-load-module module-bluetooth-policy
+### Load module-policy
+load-module module-policy
+
+### Sound Player module
+load-module module-sound-player
+load-module module-role-ducking global=1 volume=0
 
+load-module module-bluetooth-policy
 load-module module-bluetooth-discover
 #load-module module-bluetooth-discover enable_scmst=true
 

diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index 68392a92679ee793124dbab2125ec4f900e9b0dd..6e33c9a954546ee150c0be12281d59b05258fc9a 100644 (file)
--- 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.17
+Version:    0.2.18
 Release:    0
 Group:      Multimedia/Configuration
 License:    Apache-2.0