[all/audio] Add solo role in stream-map.json and modify arguments of module-role...

Change-Id: I5c6e3face45ef59fd4fed87eee3f49653084103e
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/mmfw-sysconf-simulator/etc/pulse/stream-map.json b/mmfw-sysconf-simulator/etc/pulse/stream-map.json
index 526fc4826c388acf4c37f1409593cfae22233ad6..4ef0c7ec54b9ded8372b6033fc3a918593f1f713 100644 (file)
--- 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 5ef305a31455a92e2f3f682300d4ab759cf363ae..bc1e03e5e4d069c6c9f728c39c6d6fa61998fae9 100644 (file)
--- 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 b864a178b4c9e40d9e377bb6844f615f2a74d3b2..e51618e12e5dbf07c3122f5289f30c45633bcca3 100644 (file)
--- 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 7cea3fa1509a6c0bfa24c71d4f1923d39b253fbc..1d4beb5494749c191327d297221150c3ff626bb6 100644 (file)
--- 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 32aac1ed2b7109b43427f968914e92783d6c2157..89758dc24f724c906f95af9d958f0e19654303ce 100644 (file)
--- 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 5ef305a31455a92e2f3f682300d4ab759cf363ae..bc1e03e5e4d069c6c9f728c39c6d6fa61998fae9 100644 (file)
--- 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 32aac1ed2b7109b43427f968914e92783d6c2157..89758dc24f724c906f95af9d958f0e19654303ce 100644 (file)
--- 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 5ef305a31455a92e2f3f682300d4ab759cf363ae..bc1e03e5e4d069c6c9f728c39c6d6fa61998fae9 100644 (file)
--- 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 f6be08d41637d25430745715ae01fcd8da7b2eab..9842c99ca7e26bd731cdd6fc0617ed0e051edf64 100644 (file)
--- 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 5ef305a31455a92e2f3f682300d4ab759cf363ae..bc1e03e5e4d069c6c9f728c39c6d6fa61998fae9 100644 (file)
--- 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 c3f2b2602676c067520e30cb6bbfcdca50b3a4be..b0ee7314120d08060819aedb7842b8ddd010570d 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.49
+Version:    0.2.50
 Release:    0
 Group:      Multimedia/Configuration
 License:    LGPL-2.1+ and Apache-2.0