[audio] divide bluetooth to bt-a2dp and bt-sco

[Version] 0.2.92
[Profile] Common
[Issue Type] policy

Change-Id: Ic5c36ceca2bac68170ee876811741167fbf0f605
Signed-off-by: Jeongho Mok <jho.mok@samsung.com>

diff --git a/mmfw-sysconf-simulator/etc/pulse/device-map.json b/mmfw-sysconf-simulator/etc/pulse/device-map.json
index 310386e..f7c7f0e 100644 (file)
--- a/mmfw-sysconf-simulator/etc/pulse/device-map.json
+++ b/mmfw-sysconf-simulator/etc/pulse/device-map.json
@@ -2,78 +2,36 @@
        "device-types":[
                {
                        "device-type":"builtin-speaker",
-                       "builtin" : true,
-                       "direction":["out"],
-                       "avail-condition":["pulse"],
                        "playback-devices":{"normal":"alsa:0,0"}
                },
                {
                        "device-type":"builtin-receiver",
-                       "builtin" : true,
-                       "direction":["out"],
-                       "avail-condition":["pulse"],
                        "playback-devices":{"normal":"alsa:0,0"}
                },
                {
                        "device-type":"builtin-mic",
-                       "builtin" : true,
-                       "direction":["in"],
-                       "avail-condition":["pulse"],
                        "capture-devices":{"normal":"alsa:0,0"}
                },
                {
                        "device-type":"audio-jack",
-                       "builtin":false,
-                       "direction":["both","out"],
-                       "avail-condition":["pulse","dbus"],
                        "playback-devices":{"normal":"alsa:0,0"},
                        "capture-devices":{"normal":"alsa:0,0"}
                },
                {
                        "device-type":"hdmi",
-                       "builtin":false,
-                       "direction":["out"],
-                       "avail-condition":["pulse, dbus"],
                        "playback-devices":{"normal":"alsa:0,0"}
                },
                {
-                       "device-type":"bt",
-                       "profile":"a2dp",
-                       "builtin":false,
-                       "direction":["out"],
-                       "avail-condition":["pulse"]
-               },
-               {
-                       "device-type":"bt",
-                       "profile":"sco",
-                       "builtin":false,
-                       "direction":["both"],
-                       "avail-condition":["pulse","dbus"],
+                       "device-type":"bt-sco",
                        "playback-devices":{"normal":"alsa:0,0"},
                        "capture-devices":{"normal":"alsa:0,0"}
-               },
-               {
-                       "device-type":"forwarding",
-                       "builtin":false,
-                       "direction":["out"],
-                       "avail-condition":["pulse", "dbus"],
-                       "playback-devices":{"normal":"alsa:0,0"},
-               },
-               {
-                       "device-type":"usb-audio",
-                       "builtin":false,
-                       "direction":["both", "in", "out"],
-                       "avail-condition":["pulse"]
                }
-
        ],
        "device-files":{
                "playback-devices":[
                        {
                                "device-string":"alsa:0,0",
-                               "role":{
-                                               "normal":"rate=44100",
-                               }
+                               "role":{"normal":"rate=44100"}
                        }
                ],
                "capture-devices":[

diff --git a/mmfw-sysconf-simulator/etc/pulse/stream-map.json b/mmfw-sysconf-simulator/etc/pulse/stream-map.json
index d67fed2..21baf5e 100644 (file)
--- a/mmfw-sysconf-simulator/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-simulator/etc/pulse/stream-map.json
@@ -6,7 +6,7 @@
                        "minreq-ms":-1,
                        "tlength-ms":100,
                        "prebuf-ms":0,
-                       "maxlength":-1,
+                       "maxlength":-1
                },
                {
                        "type":"mid",
@@ -14,7 +14,7 @@
                        "minreq-ms":-1,
                        "tlength-ms":200,
                        "prebuf-ms":0,
-                       "maxlength":-1,
+                       "maxlength":-1
                },
                {
                        "type":"high",
@@ -22,7 +22,7 @@
                        "minreq-ms":-1,
                        "tlength-ms":400,
                        "prebuf-ms":0,
-                       "maxlength":-1,
+                       "maxlength":-1
                },
                {
                        "type":"voip",
@@ -30,46 +30,46 @@
                        "minreq-ms":20,
                        "tlength-ms":100,
                        "prebuf-ms":0,
-                       "maxlength":-1,
-               },
+                       "maxlength":-1
+               }
        ],
        "volumes":[
                {
                        "type":"master",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"media",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"system",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"alarm",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"notification",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"voice",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"ringtone",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"voip",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"call",
-                       "is-hal-volume":0,
-               },
+                       "is-hal-volume":0
+               }
        ],
        "streams":[
                {
@@ -79,7 +79,7 @@
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["audio-jack","builtin-mic"],
                        "avail-out-devices":["audio-jack","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"]
                },
                {
                        "role":"system",
@@ -88,7 +88,7 @@
                        "volume-types":{"in":"none","out":"system"},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"alarm",
@@ -97,7 +97,7 @@
                        "volume-types":{"in":"none","out":"alarm"},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"notification",
@@ -106,7 +106,7 @@
                        "volume-types":{"in":"none","out":"notification"},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"emergency",
@@ -115,7 +115,7 @@
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"voice-information",
@@ -124,7 +124,7 @@
                        "volume-types":{"in":"none","out":"voice"},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"voice-recognition",
@@ -133,7 +133,7 @@
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["audio-jack","builtin-mic"],
                        "avail-out-devices":["none"],
-                       "avail-frameworks":["audio-io"],
+                       "avail-frameworks":["audio-io"]
                },
                {
                        "role":"ringtone-voip",
@@ -142,7 +142,7 @@
                        "volume-types":{"in":"none","out":"ringtone"},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"]
                },
                {
                        "role":"ringtone-call",
@@ -151,7 +151,7 @@
                        "volume-types":{"in":"none","out":"ringtone"},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"ringbacktone-call",
@@ -160,7 +160,7 @@
                        "volume-types":{"in":"none","out":"call"},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","builtin-receiver","builtin-speaker"],
-                       "avail-frameworks":["wav-player","tone-player"],
+                       "avail-frameworks":["wav-player","tone-player"]
                },
                {
                        "role":"voip",
@@ -169,7 +169,7 @@
                        "volume-types":{"in":"none","out":"voip"},
                        "avail-in-devices":["builtin-mic","audio-jack"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack"],
-                       "avail-frameworks":["audio-io","tone-player","sound-manager"],
+                       "avail-frameworks":["audio-io","tone-player","sound-manager"]
                },
                {
                        "role":"call-voice",
@@ -178,7 +178,7 @@
                        "volume-types":{"in":"none","out":"call"},
                        "avail-in-devices":["builtin-mic","audio-jack"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"call-video",
@@ -187,7 +187,7 @@
                        "volume-types":{"in":"none","out":"call"},
                        "avail-in-devices":["builtin-mic","audio-jack"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"radio",
@@ -196,7 +196,7 @@
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","builtin-speaker"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"loopback",
@@ -205,7 +205,7 @@
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["usb-audio"],
                        "avail-out-devices":["builtin-speaker","usb-audio"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"ext-media",
@@ -214,7 +214,7 @@
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["usb-audio"],
                        "avail-out-devices":["usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"solo",
@@ -223,7 +223,7 @@
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","builtin-speaker"],
-                       "avail-frameworks":["wav-player","tone-player"],
-               },
+                       "avail-frameworks":["wav-player","tone-player"]
+               }
        ]
 }

diff --git a/mmfw-sysconf-target-artik10/etc/pulse/device-map.json b/mmfw-sysconf-target-artik10/etc/pulse/device-map.json
index fb0e38a..69e5ad0 100644 (file)
--- a/mmfw-sysconf-target-artik10/etc/pulse/device-map.json
+++ b/mmfw-sysconf-target-artik10/etc/pulse/device-map.json
@@ -2,78 +2,36 @@
        "device-types":[
                {
                        "device-type":"builtin-speaker",
-                       "builtin" : true,
-                       "direction":["out"],
-                       "avail-condition":["pulse"],
                        "playback-devices":{"normal":"alsa:0,0"}
                },
                {
                        "device-type":"builtin-receiver",
-                       "builtin" : true,
-                       "direction":["out"],
-                       "avail-condition":["pulse"],
                        "playback-devices":{"normal":"alsa:0,0"}
                },
                {
                        "device-type":"builtin-mic",
-                       "builtin" : true,
-                       "direction":["in"],
-                       "avail-condition":["pulse"],
                        "capture-devices":{"normal":"alsa:0,0"}
                },
                {
                        "device-type":"audio-jack",
-                       "builtin":false,
-                       "direction":["both","out"],
-                       "avail-condition":["pulse","dbus"],
                        "playback-devices":{"normal":"alsa:0,0"},
                        "capture-devices":{"normal":"alsa:0,0"}
                },
                {
                        "device-type":"hdmi",
-                       "builtin":false,
-                       "direction":["out"],
-                       "avail-condition":["pulse, dbus"],
                        "playback-devices":{"normal":"alsa:0,0"}
                },
                {
-                       "device-type":"bt",
-                       "profile":"a2dp",
-                       "builtin":false,
-                       "direction":["out"],
-                       "avail-condition":["pulse"]
-               },
-               {
-                       "device-type":"bt",
-                       "profile":"sco",
-                       "builtin":false,
-                       "direction":["both"],
-                       "avail-condition":["pulse","dbus"],
+                       "device-type":"bt-sco",
                        "playback-devices":{"normal":"alsa:0,0"},
                        "capture-devices":{"normal":"alsa:0,0"}
-               },
-               {
-                       "device-type":"forwarding",
-                       "builtin":false,
-                       "direction":["out"],
-                       "avail-condition":["pulse", "dbus"],
-                       "playback-devices":{"normal":"alsa:0,0"},
-               },
-               {
-                       "device-type":"usb-audio",
-                       "builtin":false,
-                       "direction":["both", "in", "out"],
-                       "avail-condition":["pulse"]
                }
-
        ],
        "device-files":{
                "playback-devices":[
                        {
                                "device-string":"alsa:0,0",
-                               "role":{
-                                               "normal":"mmap=0 rate=44100",
-                               }
+                               "role":{"normal":"mmap=0 rate=44100"}
                        }
                ],
                "capture-devices":[

diff --git a/mmfw-sysconf-target-artik10/etc/pulse/stream-map.json b/mmfw-sysconf-target-artik10/etc/pulse/stream-map.json
index 30812ec..9633643 100644 (file)
--- a/mmfw-sysconf-target-artik10/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-artik10/etc/pulse/stream-map.json
@@ -6,7 +6,7 @@
                        "minreq-ms":-1,
                        "tlength-ms":100,
                        "prebuf-ms":0,
-                       "maxlength":-1,
+                       "maxlength":-1
                },
                {
                        "type":"mid",
@@ -14,7 +14,7 @@
                        "minreq-ms":-1,
                        "tlength-ms":200,
                        "prebuf-ms":0,
-                       "maxlength":-1,
+                       "maxlength":-1
                },
                {
                        "type":"high",
@@ -22,7 +22,7 @@
                        "minreq-ms":-1,
                        "tlength-ms":400,
                        "prebuf-ms":0,
-                       "maxlength":-1,
+                       "maxlength":-1
                },
                {
                        "type":"voip",
@@ -30,46 +30,46 @@
                        "minreq-ms":20,
                        "tlength-ms":100,
                        "prebuf-ms":0,
-                       "maxlength":-1,
-               },
+                       "maxlength":-1
+               }
        ],
        "volumes":[
                {
                        "type":"master",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"media",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"system",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"alarm",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"notification",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"voice",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"ringtone",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"voip",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"call",
-                       "is-hal-volume":1,
-               },
+                       "is-hal-volume":1
+               }
        ],
        "streams":[
                {
@@ -78,8 +78,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["audio-jack","builtin-mic"],
-                       "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"],
+                       "avail-out-devices":["forwarding","audio-jack","bt-a2dp","builtin-speaker","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"]
                },
                {
                        "role":"system",
@@ -87,8 +87,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"system"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["forwarding","audio-jack","bt-a2dp","builtin-speaker","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"alarm",
@@ -96,8 +96,8 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"alarm"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"notification",
@@ -105,8 +105,8 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"notification"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"emergency",
@@ -114,8 +114,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["builtin-speaker","audio-jack","bt","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["builtin-speaker","audio-jack","bt-a2dp","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"voice-information",
@@ -123,8 +123,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"voice"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"voice-recognition",
@@ -133,7 +133,7 @@
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["audio-jack","usb-audio","builtin-mic"],
                        "avail-out-devices":["none"],
-                       "avail-frameworks":["audio-io"],
+                       "avail-frameworks":["audio-io"]
                },
                {
                        "role":"ringtone-voip",
@@ -141,8 +141,8 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"],
+                       "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"]
                },
                {
                        "role":"ringtone-call",
@@ -150,35 +150,35 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "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","builtin-mic"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["audio-io","tone-player","sound-manager"],
+                       "avail-in-devices":["audio-jack","bt-sco","builtin-mic"],
+                       "avail-out-devices":["audio-jack","bt-sco","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","builtin-mic"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["sound-manager"],
+                       "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","builtin-mic"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-in-devices":["audio-jack","bt-sco","builtin-mic"],
+                       "avail-out-devices":["audio-jack","bt-sco","builtin-speaker"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"radio",
@@ -187,7 +187,7 @@
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","builtin-speaker"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"loopback",
@@ -196,7 +196,7 @@
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["usb-audio"],
                        "avail-out-devices":["audio-jack","usb-audio"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"loopback-mirroring",
@@ -205,7 +205,7 @@
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["forwarding"],
                        "avail-out-devices":["none"],
-                       "avail-frameworks":["audio-io"],
+                       "avail-frameworks":["audio-io"]
                },
                {
                        "role":"ext-media",
@@ -213,8 +213,8 @@
                        "route-type" : "manual-ext",
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["usb-audio"],
-                       "avail-out-devices":["bt","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"],
+                       "avail-out-devices":["bt-a2dp","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"]
                },
                {
                        "role":"solo",
@@ -222,8 +222,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker","usb-audio"],
-                       "avail-frameworks":["wav-player","tone-player"],
-               },
+                       "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker","usb-audio"],
+                       "avail-frameworks":["wav-player","tone-player"]
+               }
        ]
 }

diff --git a/mmfw-sysconf-target-hawkp/etc/pulse/device-map.json b/mmfw-sysconf-target-hawkp/etc/pulse/device-map.json
index 4d0820b..f583b34 100644 (file)
--- a/mmfw-sysconf-target-hawkp/etc/pulse/device-map.json
+++ b/mmfw-sysconf-target-hawkp/etc/pulse/device-map.json
@@ -2,19 +2,14 @@
        "device-types":[
                {
                        "device-type":"builtin-speaker",
-                       "builtin" : true,
-                       "direction":["out"],
-                       "avail-condition":["pulse"],
                        "playback-devices":{"normal":"alsa:0,1"}
-               },
+               }
        ],
        "device-files":{
                "playback-devices":[
                        {
                                "device-string":"alsa:0,1",
-                               "role":{
-                                               "normal":"mmap=0 tsched=0 rate=48000",
-                               }
+                               "role":{"normal":"mmap=0 tsched=0 rate=48000"}
                        }
                ]
        }

diff --git a/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json b/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json
index 64d8818..b76c134 100644 (file)
--- a/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-hawkp/etc/pulse/stream-map.json
@@ -6,7 +6,7 @@
                        "minreq-ms":-1,
                        "tlength-ms":100,
                        "prebuf-ms":0,
-                       "maxlength":-1,
+                       "maxlength":-1
                },
                {
                        "type":"mid",
@@ -14,7 +14,7 @@
                        "minreq-ms":-1,
                        "tlength-ms":200,
                        "prebuf-ms":0,
-                       "maxlength":-1,
+                       "maxlength":-1
                },
                {
                        "type":"high",
@@ -22,7 +22,7 @@
                        "minreq-ms":-1,
                        "tlength-ms":400,
                        "prebuf-ms":0,
-                       "maxlength":-1,
+                       "maxlength":-1
                },
                {
                        "type":"voip",
@@ -30,46 +30,46 @@
                        "minreq-ms":20,
                        "tlength-ms":100,
                        "prebuf-ms":0,
-                       "maxlength":-1,
-               },
+                       "maxlength":-1
+               }
        ],
        "volumes":[
                {
                        "type":"master",
-                       "is-hal-volume":1,
+                       "is-hal-volume":1
                },
                {
                        "type":"media",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"system",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"alarm",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"notification",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"voice",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"ringtone",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"voip",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"call",
-                       "is-hal-volume":1,
-               },
+                       "is-hal-volume":1
+               }
        ],
        "streams":[
                {
@@ -78,8 +78,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["audio-jack","usb-audio","builtin-mic"],
-                       "avail-out-devices":["forwarding","audio-jack","builtin-speaker","bt","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"],
+                       "avail-out-devices":["forwarding","audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"]
                },
                {
                        "role":"system",
@@ -87,8 +87,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"system"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["forwarding","audio-jack","builtin-speaker","bt","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["forwarding","audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"alarm",
@@ -96,8 +96,8 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"alarm"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"notification",
@@ -105,8 +105,8 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"notification"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"emergency",
@@ -114,8 +114,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["builtin-speaker","audio-jack","bt","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["builtin-speaker","audio-jack","bt-a2dp","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"voice-information",
@@ -123,8 +123,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"voice"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"voice-recognition",
@@ -133,7 +133,7 @@
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["audio-jack","usb-audio","builtin-mic"],
                        "avail-out-devices":["none"],
-                       "avail-frameworks":["audio-io"],
+                       "avail-frameworks":["audio-io"]
                },
                {
                        "role":"ringtone-voip",
@@ -141,8 +141,8 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"]
                },
                {
                        "role":"ringtone-call",
@@ -150,35 +150,35 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "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","builtin-mic"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt"],
-                       "avail-frameworks":["audio-io","tone-player","sound-manager"],
+                       "avail-in-devices":["audio-jack","bt-sco","builtin-mic"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt-sco"],
+                       "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","builtin-mic"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt"],
-                       "avail-frameworks":["sound-manager"],
+                       "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","builtin-mic"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-in-devices":["audio-jack","bt-sco","builtin-mic"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt-sco"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"radio",
@@ -187,7 +187,7 @@
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","builtin-speaker"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"loopback",
@@ -196,7 +196,7 @@
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["usb-audio"],
                        "avail-out-devices":["builtin-speaker","usb-audio"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"loopback-mirroring",
@@ -205,7 +205,7 @@
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["forwarding"],
                        "avail-out-devices":["none"],
-                       "avail-frameworks":["audio-io"],
+                       "avail-frameworks":["audio-io"]
                },
                {
                        "role":"ext-media",
@@ -213,8 +213,8 @@
                        "route-type" : "manual-ext",
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["usb-audio"],
-                       "avail-out-devices":["bt","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"],
+                       "avail-out-devices":["bt-a2dp","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"]
                },
                {
                        "role":"solo",
@@ -222,8 +222,8 @@
                        "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","sound-manager"],
-               },
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
+                       "avail-frameworks":["wav-player","tone-player","sound-manager"]
+               }
        ]
 }

diff --git a/mmfw-sysconf-target-n4/etc/pulse/device-map.json b/mmfw-sysconf-target-n4/etc/pulse/device-map.json
index 310386e..f7c7f0e 100644 (file)
--- a/mmfw-sysconf-target-n4/etc/pulse/device-map.json
+++ b/mmfw-sysconf-target-n4/etc/pulse/device-map.json
@@ -2,78 +2,36 @@
        "device-types":[
                {
                        "device-type":"builtin-speaker",
-                       "builtin" : true,
-                       "direction":["out"],
-                       "avail-condition":["pulse"],
                        "playback-devices":{"normal":"alsa:0,0"}
                },
                {
                        "device-type":"builtin-receiver",
-                       "builtin" : true,
-                       "direction":["out"],
-                       "avail-condition":["pulse"],
                        "playback-devices":{"normal":"alsa:0,0"}
                },
                {
                        "device-type":"builtin-mic",
-                       "builtin" : true,
-                       "direction":["in"],
-                       "avail-condition":["pulse"],
                        "capture-devices":{"normal":"alsa:0,0"}
                },
                {
                        "device-type":"audio-jack",
-                       "builtin":false,
-                       "direction":["both","out"],
-                       "avail-condition":["pulse","dbus"],
                        "playback-devices":{"normal":"alsa:0,0"},
                        "capture-devices":{"normal":"alsa:0,0"}
                },
                {
                        "device-type":"hdmi",
-                       "builtin":false,
-                       "direction":["out"],
-                       "avail-condition":["pulse, dbus"],
                        "playback-devices":{"normal":"alsa:0,0"}
                },
                {
-                       "device-type":"bt",
-                       "profile":"a2dp",
-                       "builtin":false,
-                       "direction":["out"],
-                       "avail-condition":["pulse"]
-               },
-               {
-                       "device-type":"bt",
-                       "profile":"sco",
-                       "builtin":false,
-                       "direction":["both"],
-                       "avail-condition":["pulse","dbus"],
+                       "device-type":"bt-sco",
                        "playback-devices":{"normal":"alsa:0,0"},
                        "capture-devices":{"normal":"alsa:0,0"}
-               },
-               {
-                       "device-type":"forwarding",
-                       "builtin":false,
-                       "direction":["out"],
-                       "avail-condition":["pulse", "dbus"],
-                       "playback-devices":{"normal":"alsa:0,0"},
-               },
-               {
-                       "device-type":"usb-audio",
-                       "builtin":false,
-                       "direction":["both", "in", "out"],
-                       "avail-condition":["pulse"]
                }
-
        ],
        "device-files":{
                "playback-devices":[
                        {
                                "device-string":"alsa:0,0",
-                               "role":{
-                                               "normal":"rate=44100",
-                               }
+                               "role":{"normal":"rate=44100"}
                        }
                ],
                "capture-devices":[

diff --git a/mmfw-sysconf-target-n4/etc/pulse/stream-map.json b/mmfw-sysconf-target-n4/etc/pulse/stream-map.json
index e3b9fdc..ab40e70 100644 (file)
--- a/mmfw-sysconf-target-n4/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-n4/etc/pulse/stream-map.json
@@ -6,7 +6,7 @@
                        "minreq-ms":-1,
                        "tlength-ms":100,
                        "prebuf-ms":0,
-                       "maxlength":-1,
+                       "maxlength":-1
                },
                {
                        "type":"mid",
@@ -14,7 +14,7 @@
                        "minreq-ms":-1,
                        "tlength-ms":200,
                        "prebuf-ms":0,
-                       "maxlength":-1,
+                       "maxlength":-1
                },
                {
                        "type":"high",
@@ -22,7 +22,7 @@
                        "minreq-ms":-1,
                        "tlength-ms":400,
                        "prebuf-ms":0,
-                       "maxlength":-1,
+                       "maxlength":-1
                },
                {
                        "type":"voip",
@@ -30,46 +30,46 @@
                        "minreq-ms":20,
                        "tlength-ms":100,
                        "prebuf-ms":0,
-                       "maxlength":-1,
-               },
+                       "maxlength":-1
+               }
        ],
        "volumes":[
                {
                        "type":"master",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"media",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"system",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"alarm",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"notification",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"voice",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"ringtone",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"voip",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"call",
-                       "is-hal-volume":1,
-               },
+                       "is-hal-volume":1
+               }
        ],
        "streams":[
                {
@@ -78,8 +78,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["audio-jack","builtin-mic"],
-                       "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"],
+                       "avail-out-devices":["forwarding","audio-jack","bt-a2dp","builtin-speaker"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"]
                },
                {
                        "role":"system",
@@ -87,8 +87,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"system"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["forwarding","audio-jack","bt-a2dp","builtin-speaker"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"alarm",
@@ -96,8 +96,8 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"alarm"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"notification",
@@ -105,8 +105,8 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"notification"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"emergency",
@@ -115,7 +115,7 @@
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"voice-information",
@@ -123,8 +123,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"voice"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"voice-recognition",
@@ -133,7 +133,7 @@
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["audio-jack","builtin-mic"],
                        "avail-out-devices":["none"],
-                       "avail-frameworks":["audio-io"],
+                       "avail-frameworks":["audio-io"]
                },
                {
                        "role":"ringtone-voip",
@@ -141,8 +141,8 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"],
+                       "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"]
                },
                {
                        "role":"ringtone-call",
@@ -150,8 +150,8 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"ringbacktone-call",
@@ -159,35 +159,35 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"call"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","bt","builtin-receiver","builtin-speaker"],
-                       "avail-frameworks":["wav-player","tone-player"],
+                       "avail-out-devices":["audio-jack","bt-a2dp","builtin-receiver","builtin-speaker"],
+                       "avail-frameworks":["wav-player","tone-player"]
                },
                {
                        "role":"voip",
                        "priority" : 5,
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"voip"},
-                       "avail-in-devices":["builtin-mic","audio-jack","bt"],
-                       "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
-                       "avail-frameworks":["audio-io","tone-player","sound-manager"],
+                       "avail-in-devices":["builtin-mic","audio-jack","bt-sco"],
+                       "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt-sco"],
+                       "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":["builtin-mic","audio-jack","bt"],
-                       "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-in-devices":["builtin-mic","audio-jack","bt-sco"],
+                       "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt-sco"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"call-video",
                        "priority" : 6,
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"call"},
-                       "avail-in-devices":["builtin-mic","audio-jack","bt"],
-                       "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-in-devices":["builtin-mic","audio-jack","bt-sco"],
+                       "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt-sco"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"radio",
@@ -196,7 +196,7 @@
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","builtin-speaker"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"loopback",
@@ -204,8 +204,8 @@
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["builtin-mic","usb-audio"],
-                       "avail-out-devices":["builtin-speaker","usb-audio","bt"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-out-devices":["builtin-speaker","usb-audio","bt-a2dp"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"loopback-mirroring",
@@ -214,7 +214,7 @@
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["forwarding"],
                        "avail-out-devices":["none"],
-                       "avail-frameworks":["audio-io"],
+                       "avail-frameworks":["audio-io"]
                },
                {
                        "role":"ext-media",
@@ -222,8 +222,8 @@
                        "route-type" : "manual-ext",
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["bt"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["bt-a2dp"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"solo",
@@ -231,8 +231,8 @@
                        "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"],
-               },
+                       "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker"],
+                       "avail-frameworks":["wav-player","tone-player"]
+               }
        ]
 }

diff --git a/mmfw-sysconf-target-tm1/etc/pulse/device-map.json b/mmfw-sysconf-target-tm1/etc/pulse/device-map.json
index 2aeda8b..c12086a 100644 (file)
--- a/mmfw-sysconf-target-tm1/etc/pulse/device-map.json
+++ b/mmfw-sysconf-target-tm1/etc/pulse/device-map.json
@@ -2,84 +2,41 @@
        "device-types":[
                {
                        "device-type":"builtin-speaker",
-                       "builtin" : true,
-                       "direction":["out"],
-                       "avail-condition":["pulse"],
                        "playback-devices":{"normal":"alsa:sprdphone,0", "call-voice":"alsa:VIRTUALAUDIOW,0"}
                },
                {
                        "device-type":"builtin-receiver",
-                       "builtin" : true,
-                       "direction":["out"],
-                       "avail-condition":["pulse"],
                        "playback-devices":{"normal":"alsa:sprdphone,0", "call-voice":"alsa:VIRTUALAUDIOW,0"}
                },
                {
                        "device-type":"builtin-mic",
-                       "builtin" : true,
-                       "direction":["in"],
-                       "avail-condition":["pulse"],
                        "capture-devices":{"normal":"alsa:sprdphone,0"}
                },
                {
                        "device-type":"audio-jack",
-                       "builtin":false,
-                       "direction":["both","out"],
-                       "avail-condition":["pulse","dbus"],
                        "playback-devices":{"normal":"alsa:sprdphone,0", "call-voice":"alsa:VIRTUALAUDIOW,0"},
                        "capture-devices":{"normal":"alsa:sprdphone,0"}
                },
                {
                        "device-type":"hdmi",
-                       "builtin":false,
-                       "direction":["out"],
-                       "avail-condition":["pulse, dbus"],
                        "playback-devices":{"normal":"alsa:sprdphone,0"}
                },
                {
-                       "device-type":"bt",
-                       "profile":"a2dp",
-                       "builtin":false,
-                       "direction":["out"],
-                       "avail-condition":["pulse"]
-               },
-               {
-                       "device-type":"bt",
-                       "profile":"sco",
-                       "builtin":false,
-                       "direction":["both"],
-                       "avail-condition":["pulse","dbus"],
+                       "device-type":"bt-sco",
                        "playback-devices":{"normal":"alsa:sprdphone,0", "call-voice":"alsa:VIRTUALAUDIOW,0"},
                        "capture-devices":{"normal":"alsa:sprdphone,0"}
-               },
-               {
-                       "device-type":"forwarding",
-                       "builtin":false,
-                       "direction":["out"],
-                       "avail-condition":["pulse", "dbus"],
-                       "playback-devices":{"normal":"alsa:sprdphone,0"},
-               },
-               {
-                       "device-type":"usb-audio",
-                       "builtin":false,
-                       "direction":["both", "in", "out"],
-                       "avail-condition":["pulse"]
                }
-
        ],
        "device-files":{
                "playback-devices":[
                        {
                                "device-string":"alsa:sprdphone,0",
-                               "role":{
-                                               "normal":"rate=44100",
+                               "role":{"normal":"rate=44100"
                                }
                        },
                        {
                                "device-string":"alsa:VIRTUALAUDIOW,0",
-                               "role":{
-                                               "call-voice":"rate=16000 channels=1 tsched=0 alternate_rate=16000",
-                               }
+                               "role":{"call-voice":"rate=16000 channels=1 tsched=0 alternate_rate=16000"}
                        }
                ],
                "capture-devices":[

diff --git a/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json b/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json
index e3b9fdc..0449c9e 100644 (file)
--- a/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-tm1/etc/pulse/stream-map.json
@@ -78,7 +78,7 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["audio-jack","builtin-mic"],
-                       "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker"],
+                       "avail-out-devices":["forwarding","audio-jack","bt-a2dp","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"],
                },
                {
@@ -87,7 +87,7 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"system"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker"],
+                       "avail-out-devices":["forwarding","audio-jack","bt-a2dp","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
@@ -96,7 +96,7 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"alarm"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker"],
+                       "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
@@ -105,7 +105,7 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"notification"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker"],
+                       "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
@@ -123,7 +123,7 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"voice"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker"],
+                       "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
@@ -141,7 +141,7 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker"],
+                       "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"],
                },
                {
@@ -150,7 +150,7 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker"],
+                       "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
@@ -159,7 +159,7 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"call"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","bt","builtin-receiver","builtin-speaker"],
+                       "avail-out-devices":["audio-jack","bt-a2dp","builtin-receiver","builtin-speaker"],
                        "avail-frameworks":["wav-player","tone-player"],
                },
                {
@@ -167,8 +167,8 @@
                        "priority" : 5,
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"voip"},
-                       "avail-in-devices":["builtin-mic","audio-jack","bt"],
-                       "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
+                       "avail-in-devices":["builtin-mic","audio-jack","bt-sco"],
+                       "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt-sco"],
                        "avail-frameworks":["audio-io","tone-player","sound-manager"],
                },
                {
@@ -176,8 +176,8 @@
                        "priority" : 6,
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"call"},
-                       "avail-in-devices":["builtin-mic","audio-jack","bt"],
-                       "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
+                       "avail-in-devices":["builtin-mic","audio-jack","bt-sco"],
+                       "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt-sco"],
                        "avail-frameworks":["sound-manager"],
                },
                {
@@ -185,8 +185,8 @@
                        "priority" : 6,
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"call"},
-                       "avail-in-devices":["builtin-mic","audio-jack","bt"],
-                       "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
+                       "avail-in-devices":["builtin-mic","audio-jack","bt-sco"],
+                       "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt-sco"],
                        "avail-frameworks":["sound-manager"],
                },
                {
@@ -204,7 +204,7 @@
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["builtin-mic","usb-audio"],
-                       "avail-out-devices":["builtin-speaker","usb-audio","bt"],
+                       "avail-out-devices":["builtin-speaker","usb-audio","bt-a2dp"],
                        "avail-frameworks":["sound-manager"],
                },
                {
@@ -222,7 +222,7 @@
                        "route-type" : "manual-ext",
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["bt"],
+                       "avail-out-devices":["bt-a2dp"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
@@ -231,7 +231,7 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","bt","builtin-speaker"],
+                       "avail-out-devices":["audio-jack","bt-a2dp","builtin-speaker"],
                        "avail-frameworks":["wav-player","tone-player"],
                },
        ]

diff --git a/mmfw-sysconf-target-tw1/etc/pulse/device-map.json b/mmfw-sysconf-target-tw1/etc/pulse/device-map.json
index 113f539..859cc76 100644 (file)
--- a/mmfw-sysconf-target-tw1/etc/pulse/device-map.json
+++ b/mmfw-sysconf-target-tw1/etc/pulse/device-map.json
@@ -2,18 +2,8 @@
        "device-types":[
                {
                        "device-type":"builtin-mic",
-                       "builtin" : true,
-                       "direction":["in"],
-                       "avail-condition":["pulse"],
                        "capture-devices":{"normal":"alsa:0,0"}
-               },
-               {
-                       "device-type":"bt",
-                       "profile":"a2dp",
-                       "builtin":false,
-                       "direction":["out"],
-                       "avail-condition":["pulse"]
-               },
+               }
        ],
        "device-files":{
                "capture-devices":[

diff --git a/mmfw-sysconf-target-tw1/etc/pulse/stream-map.json b/mmfw-sysconf-target-tw1/etc/pulse/stream-map.json
index c9f1ef5..752ad3e 100644 (file)
--- a/mmfw-sysconf-target-tw1/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-tw1/etc/pulse/stream-map.json
@@ -6,7 +6,7 @@
                        "minreq-ms":-1,
                        "tlength-ms":100,
                        "prebuf-ms":0,
-                       "maxlength":-1,
+                       "maxlength":-1
                },
                {
                        "type":"mid",
@@ -14,7 +14,7 @@
                        "minreq-ms":-1,
                        "tlength-ms":200,
                        "prebuf-ms":0,
-                       "maxlength":-1,
+                       "maxlength":-1
                },
                {
                        "type":"high",
@@ -22,7 +22,7 @@
                        "minreq-ms":-1,
                        "tlength-ms":400,
                        "prebuf-ms":0,
-                       "maxlength":-1,
+                       "maxlength":-1
                },
                {
                        "type":"voip",
@@ -30,46 +30,46 @@
                        "minreq-ms":20,
                        "tlength-ms":100,
                        "prebuf-ms":0,
-                       "maxlength":-1,
-               },
+                       "maxlength":-1
+               }
        ],
        "volumes":[
                {
                        "type":"master",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"media",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"system",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"alarm",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"notification",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"voice",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"ringtone",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"voip",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"call",
-                       "is-hal-volume":1,
-               },
+                       "is-hal-volume":1
+               }
        ],
        "streams":[
                {
@@ -78,8 +78,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["builtin-mic"],
-                       "avail-out-devices":["bt"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"],
+                       "avail-out-devices":["bt-a2dp"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"]
                },
                {
                        "role":"system",
@@ -87,8 +87,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"system"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["bt"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["bt-a2dp"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"alarm",
@@ -96,8 +96,8 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"alarm"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["bt"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["bt-a2dp"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"notification",
@@ -105,8 +105,8 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"notification"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["bt"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["bt-a2dp"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"emergency",
@@ -114,8 +114,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["bt"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["bt-a2dp"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"voice-information",
@@ -123,8 +123,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"voice"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["bt"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["bt-a2dp"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"voice-recognition",
@@ -133,7 +133,7 @@
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["builtin-mic"],
                        "avail-out-devices":["none"],
-                       "avail-frameworks":["audio-io"],
+                       "avail-frameworks":["audio-io"]
                },
                {
                        "role":"ringtone-voip",
@@ -141,8 +141,8 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["bt"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"],
+                       "avail-out-devices":["bt-a2dp"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"]
                },
                {
                        "role":"ringtone-call",
@@ -150,8 +150,8 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["bt"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["bt-a2dp"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"voip",
@@ -159,8 +159,8 @@
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"voip"},
                        "avail-in-devices":["builtin-mic"],
-                       "avail-out-devices":["bt"],
-                       "avail-frameworks":["audio-io","tone-player","sound-manager"],
+                       "avail-out-devices":["bt-sco"],
+                       "avail-frameworks":["audio-io","tone-player","sound-manager"]
                },
                {
                        "role":"call-voice",
@@ -168,8 +168,8 @@
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"call"},
                        "avail-in-devices":["builtin-mic"],
-                       "avail-out-devices":["bt"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-out-devices":["bt-sco"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"call-video",
@@ -177,8 +177,8 @@
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"call"},
                        "avail-in-devices":["builtin-mic"],
-                       "avail-out-devices":["bt"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-out-devices":["bt-sco"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"radio",
@@ -187,7 +187,7 @@
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["none"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"loopback",
@@ -196,7 +196,7 @@
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["none"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"ext-media",
@@ -204,8 +204,8 @@
                        "route-type" : "manual-ext",
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["bt"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"],
+                       "avail-out-devices":["bt-a2dp"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"]
                },
                {
                        "role":"solo",
@@ -213,8 +213,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["bt"],
-                       "avail-frameworks":["wav-player","tone-player"],
-               },
+                       "avail-out-devices":["bt-a2dp"],
+                       "avail-frameworks":["wav-player","tone-player"]
+               }
        ]
 }

diff --git a/mmfw-sysconf-target-u3/etc/pulse/device-map.json b/mmfw-sysconf-target-u3/etc/pulse/device-map.json
index 310386e..f7c7f0e 100644 (file)
--- a/mmfw-sysconf-target-u3/etc/pulse/device-map.json
+++ b/mmfw-sysconf-target-u3/etc/pulse/device-map.json
@@ -2,78 +2,36 @@
        "device-types":[
                {
                        "device-type":"builtin-speaker",
-                       "builtin" : true,
-                       "direction":["out"],
-                       "avail-condition":["pulse"],
                        "playback-devices":{"normal":"alsa:0,0"}
                },
                {
                        "device-type":"builtin-receiver",
-                       "builtin" : true,
-                       "direction":["out"],
-                       "avail-condition":["pulse"],
                        "playback-devices":{"normal":"alsa:0,0"}
                },
                {
                        "device-type":"builtin-mic",
-                       "builtin" : true,
-                       "direction":["in"],
-                       "avail-condition":["pulse"],
                        "capture-devices":{"normal":"alsa:0,0"}
                },
                {
                        "device-type":"audio-jack",
-                       "builtin":false,
-                       "direction":["both","out"],
-                       "avail-condition":["pulse","dbus"],
                        "playback-devices":{"normal":"alsa:0,0"},
                        "capture-devices":{"normal":"alsa:0,0"}
                },
                {
                        "device-type":"hdmi",
-                       "builtin":false,
-                       "direction":["out"],
-                       "avail-condition":["pulse, dbus"],
                        "playback-devices":{"normal":"alsa:0,0"}
                },
                {
-                       "device-type":"bt",
-                       "profile":"a2dp",
-                       "builtin":false,
-                       "direction":["out"],
-                       "avail-condition":["pulse"]
-               },
-               {
-                       "device-type":"bt",
-                       "profile":"sco",
-                       "builtin":false,
-                       "direction":["both"],
-                       "avail-condition":["pulse","dbus"],
+                       "device-type":"bt-sco",
                        "playback-devices":{"normal":"alsa:0,0"},
                        "capture-devices":{"normal":"alsa:0,0"}
-               },
-               {
-                       "device-type":"forwarding",
-                       "builtin":false,
-                       "direction":["out"],
-                       "avail-condition":["pulse", "dbus"],
-                       "playback-devices":{"normal":"alsa:0,0"},
-               },
-               {
-                       "device-type":"usb-audio",
-                       "builtin":false,
-                       "direction":["both", "in", "out"],
-                       "avail-condition":["pulse"]
                }
-
        ],
        "device-files":{
                "playback-devices":[
                        {
                                "device-string":"alsa:0,0",
-                               "role":{
-                                               "normal":"rate=44100",
-                               }
+                               "role":{"normal":"rate=44100"}
                        }
                ],
                "capture-devices":[

diff --git a/mmfw-sysconf-target-u3/etc/pulse/stream-map.json b/mmfw-sysconf-target-u3/etc/pulse/stream-map.json
index b51f6fc..726f60d 100644 (file)
--- a/mmfw-sysconf-target-u3/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-u3/etc/pulse/stream-map.json
@@ -6,7 +6,7 @@
                        "minreq-ms":-1,
                        "tlength-ms":100,
                        "prebuf-ms":0,
-                       "maxlength":-1,
+                       "maxlength":-1
                },
                {
                        "type":"mid",
@@ -14,7 +14,7 @@
                        "minreq-ms":-1,
                        "tlength-ms":200,
                        "prebuf-ms":0,
-                       "maxlength":-1,
+                       "maxlength":-1
                },
                {
                        "type":"high",
@@ -22,7 +22,7 @@
                        "minreq-ms":-1,
                        "tlength-ms":400,
                        "prebuf-ms":0,
-                       "maxlength":-1,
+                       "maxlength":-1
                },
                {
                        "type":"voip",
@@ -30,46 +30,46 @@
                        "minreq-ms":20,
                        "tlength-ms":100,
                        "prebuf-ms":0,
-                       "maxlength":-1,
-               },
+                       "maxlength":-1
+               }
        ],
        "volumes":[
                {
                        "type":"master",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"media",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"system",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"alarm",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"notification",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"voice",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"ringtone",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"voip",
-                       "is-hal-volume":0,
+                       "is-hal-volume":0
                },
                {
                        "type":"call",
-                       "is-hal-volume":1,
-               },
+                       "is-hal-volume":1
+               }
        ],
        "streams":[
                {
@@ -78,8 +78,8 @@
                        "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","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"],
+                       "avail-out-devices":["forwarding","audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"]
                },
                {
                        "role":"system",
@@ -87,8 +87,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"system"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["forwarding","audio-jack","builtin-speaker","bt","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["forwarding","audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"alarm",
@@ -96,8 +96,8 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"alarm"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"notification",
@@ -105,8 +105,8 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"notification"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"emergency",
@@ -114,8 +114,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["builtin-speaker","audio-jack","bt","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["builtin-speaker","audio-jack","bt-a2dp","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"voice-information",
@@ -123,8 +123,8 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"voice"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"]
                },
                {
                        "role":"voice-recognition",
@@ -133,7 +133,7 @@
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["audio-jack","usb-audio","builtin-mic"],
                        "avail-out-devices":["none"],
-                       "avail-frameworks":["audio-io"],
+                       "avail-frameworks":["audio-io"]
                },
                {
                        "role":"ringtone-voip",
@@ -141,8 +141,8 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"]
                },
                {
                        "role":"ringtone-call",
@@ -150,35 +150,35 @@
                        "route-type" : "auto-all",
                        "volume-types":{"in":"none","out":"ringtone"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
+                       "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","builtin-mic"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt"],
-                       "avail-frameworks":["audio-io","tone-player","sound-manager"],
+                       "avail-in-devices":["audio-jack","bt-sco","builtin-mic"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt-sco"],
+                       "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","builtin-mic"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt"],
-                       "avail-frameworks":["sound-manager"],
+                       "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","builtin-mic"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-in-devices":["audio-jack","bt-sco","builtin-mic"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt-sco"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"radio",
@@ -187,7 +187,7 @@
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","builtin-speaker"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"loopback",
@@ -196,7 +196,7 @@
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["usb-audio"],
                        "avail-out-devices":["audio-jack","usb-audio"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-frameworks":["sound-manager"]
                },
                {
                        "role":"loopback-mirroring",
@@ -205,7 +205,7 @@
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["forwarding"],
                        "avail-out-devices":["none"],
-                       "avail-frameworks":["audio-io"],
+                       "avail-frameworks":["audio-io"]
                },
                {
                        "role":"ext-media",
@@ -213,8 +213,8 @@
                        "route-type" : "manual-ext",
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["usb-audio"],
-                       "avail-out-devices":["bt","usb-audio"],
-                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"],
+                       "avail-out-devices":["bt-a2dp","usb-audio"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"]
                },
                {
                        "role":"solo",
@@ -222,8 +222,8 @@
                        "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"],
-               },
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt-a2dp","usb-audio"],
+                       "avail-frameworks":["wav-player","tone-player"]
+               }
        ]
 }

diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index 557814c..bb8027f 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.91
+Version:    0.2.92
 Release:    0
 Group:      Multimedia/Configuration
 License:    LGPL-2.1+ and Apache-2.0