[TW1][Audio] modify json files for proper setting

Change-Id: I289ecdc4dca3810e277f409822aae481ba402220

diff --git a/mmfw-sysconf-target-tw1/etc/pulse/device-map.json b/mmfw-sysconf-target-tw1/etc/pulse/device-map.json
index 310386eca9562ed8e4c3960e273798d227b783dc..489297f16be7cb663ad387f8488c6e52e6b353ab 100644 (file)
--- a/mmfw-sysconf-target-tw1/etc/pulse/device-map.json
+++ b/mmfw-sysconf-target-tw1/etc/pulse/device-map.json
@@ -1,19 +1,5 @@
 {
        "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,
@@ -21,21 +7,6 @@
                        "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",
@@ -43,43 +14,12 @@
                        "direction":["out"],
                        "avail-condition":["pulse"]
                },
-               {
-                       "device-type":"bt",
-                       "profile":"sco",
-                       "builtin":false,
-                       "direction":["both"],
-                       "avail-condition":["pulse","dbus"],
-                       "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",
-                               }
-                       }
-               ],
                "capture-devices":[
                        {
                                "device-string":"alsa:0,0",
-                               "role":{"normal":"rate=44100"}
+                               "role":{"normal":"rate=48000"}
                        }
                ]
        }

diff --git a/mmfw-sysconf-target-tw1/etc/pulse/stream-map.json b/mmfw-sysconf-target-tw1/etc/pulse/stream-map.json
index a553cb3a3dcba078fd58b3d59eff0fa633ab4769..02d50b7cdeb30ca62d7d0396b641753c34031916 100644 (file)
--- a/mmfw-sysconf-target-tw1/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-tw1/etc/pulse/stream-map.json
@@ -43,8 +43,8 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"media"},
-                       "avail-in-devices":["audio-jack","builtin-mic"],
-                       "avail-out-devices":["forwarding","audio-jack","builtin-speaker","bt","usb-audio"],
+                       "avail-in-devices":["builtin-mic"],
+                       "avail-out-devices":["bt"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"],
                },
                {
@@ -53,7 +53,7 @@
                        "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-out-devices":["bt"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
@@ -62,7 +62,7 @@
                        "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-out-devices":["bt"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
@@ -71,7 +71,7 @@
                        "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-out-devices":["bt"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
@@ -80,7 +80,7 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["builtin-speaker","audio-jack","bt","usb-audio"],
+                       "avail-out-devices":["bt"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
@@ -89,7 +89,7 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"voice"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt","usb-audio"],
+                       "avail-out-devices":["bt"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
@@ -97,7 +97,7 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
-                       "avail-in-devices":["audio-jack","usb-audio","builtin-mic"],
+                       "avail-in-devices":["builtin-mic"],
                        "avail-out-devices":["none"],
                        "avail-frameworks":["audio-io"],
                },
@@ -107,7 +107,7 @@
                        "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-out-devices":["bt"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io","sound-manager"],
                },
                {
@@ -116,7 +116,7 @@
                        "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-out-devices":["bt"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
@@ -124,8 +124,8 @@
                        "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-in-devices":["builtin-mic"],
+                       "avail-out-devices":["bt"],
                        "avail-frameworks":["audio-io","tone-player","sound-manager"],
                },
                {
@@ -133,8 +133,8 @@
                        "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-in-devices":["builtin-mic"],
+                       "avail-out-devices":["bt"],
                        "avail-frameworks":["sound-manager"],
                },
                {
@@ -142,8 +142,8 @@
                        "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-in-devices":["builtin-mic"],
+                       "avail-out-devices":["bt"],
                        "avail-frameworks":["sound-manager"],
                },
                {
@@ -152,7 +152,7 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","builtin-speaker"],
+                       "avail-out-devices":["none"],
                        "avail-frameworks":["sound-manager"],
                },
                {
@@ -160,8 +160,8 @@
                        "priority" : 2,
                        "route-type" : "manual",
                        "volume-types":{"in":"none","out":"none"},
-                       "avail-in-devices":["usb-audio"],
-                       "avail-out-devices":["audio-jack","usb-audio"],
+                       "avail-in-devices":["none"],
+                       "avail-out-devices":["none"],
                        "avail-frameworks":["sound-manager"],
                },
                {
@@ -169,8 +169,8 @@
                        "priority" : 3,
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
-                       "avail-in-devices":["forwarding"],
-                       "avail-out-devices":["forwarding"],
+                       "avail-in-devices":["none"],
+                       "avail-out-devices":["none"],
                        "avail-frameworks":["none"],
                },
                {
@@ -178,8 +178,8 @@
                        "priority" : 3,
                        "route-type" : "manual-ext",
                        "volume-types":{"in":"none","out":"media"},
-                       "avail-in-devices":["usb-audio"],
-                       "avail-out-devices":["bt","usb-audio"],
+                       "avail-in-devices":["none"],
+                       "avail-out-devices":["bt"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io","recorder"],
                },
                {
@@ -188,7 +188,7 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"none"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["audio-jack","builtin-speaker","bt","usb-audio"],
+                       "avail-out-devices":["bt"],
                        "avail-frameworks":["wav-player","tone-player"],
                },
        ]

diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index 779d83a8ba8f1361da85b9ffa00f062611f9901c..abc57b3fc7164be0f40a6526b84d64324dd90f85 100644 (file)
--- a/packaging/mmfw-sysconf.spec
+++ b/packaging/mmfw-sysconf.spec
@@ -2,7 +2,7 @@
 
 Name:       mmfw-sysconf
 Summary:    Multimedia Framework system configuration package
-Version:    0.2.55
+Version:    0.2.56
 Release:    0
 Group:      Multimedia/Configuration
 License:    LGPL-2.1+ and Apache-2.0