[Audio] Update device/stream-map.json properly

[Version] 0.2.114
[Profile] Common
[Issue Type] Revise

Change-Id: I1f36216dce42b7ae0e65a85f5828118a12f00af5

diff --git a/mmfw-sysconf-target-artik10/etc/pulse/device-map.json b/mmfw-sysconf-target-artik10/etc/pulse/device-map.json
index 69e5ad09b0daaaaae00faaf604e7f63d20805781..d24101233e92e045ebf115b0ad72f55de483c658 100644 (file)
--- a/mmfw-sysconf-target-artik10/etc/pulse/device-map.json
+++ b/mmfw-sysconf-target-artik10/etc/pulse/device-map.json
@@ -4,27 +4,9 @@
                        "device-type":"builtin-speaker",
                        "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 84f37e9e8806c186dad60d13931f6b92fc27b17a..557c2e2ba01a524671712b16b4b9eebb837672bc 100644 (file)
--- 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,72 +158,27 @@
                        "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,
@@ -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 532fd0aaf69ca8ab1f94e94d226e148c2f4032db..81689196998d13cec88c71256563fa660e81f276 100644 (file)
--- 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 0226c89ae8209919daa436c86edd06ed8ea0ece2..fa3f3e4d4db9c37dd910b6b6bd251b37f3e2e5e2 100644 (file)
--- 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 f7c7f0efa47300b72b735f3a617d2adc11eef5e9..d35583eb02f89c0c97999e25e1d8947a7c73909d 100644 (file)
--- a/mmfw-sysconf-target-u3/etc/pulse/device-map.json
+++ b/mmfw-sysconf-target-u3/etc/pulse/device-map.json
@@ -4,27 +4,9 @@
                        "device-type":"builtin-speaker",
                        "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 3b74807a2cf98955b39004e87e55b946f0316092..557c2e2ba01a524671712b16b4b9eebb837672bc 100644 (file)
--- 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,72 +158,27 @@
                        "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,
@@ -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 5aac8b9ced93e4a26f79368cb412fe836c78469d..81689196998d13cec88c71256563fa660e81f276 100644 (file)
--- 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 64b92e46d5b240c31e5c2c017f1e8b2519990d63..7ab6d8b13cdb8c5479f821074eead8004e159e3c 100644 (file)
--- 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