[target-tm1/audio] modify device-map.json and disable module-udev-detect temporarily

We're investigating a fault of the module-udev-detect while loading it in tm1 target.
Before fixing that, it would be disabled.

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

diff --git a/mmfw-sysconf-target-tm1/etc/pulse/device-map.json b/mmfw-sysconf-target-tm1/etc/pulse/device-map.json
index 310386eca9562ed8e4c3960e273798d227b783dc..c77125666ae6154e36b112d51a41168b990a12de 100644 (file)
--- a/mmfw-sysconf-target-tm1/etc/pulse/device-map.json
+++ b/mmfw-sysconf-target-tm1/etc/pulse/device-map.json
@@ -5,36 +5,36 @@
                        "builtin" : true,
                        "direction":["out"],
                        "avail-condition":["pulse"],
-                       "playback-devices":{"normal":"alsa:0,0"}
+                       "playback-devices":{"normal":"alsa:sprdphone,0"}
                },
                {
                        "device-type":"builtin-receiver",
                        "builtin" : true,
                        "direction":["out"],
                        "avail-condition":["pulse"],
-                       "playback-devices":{"normal":"alsa:0,0"}
+                       "playback-devices":{"normal":"alsa:sprdphone,0"}
                },
                {
                        "device-type":"builtin-mic",
                        "builtin" : true,
                        "direction":["in"],
                        "avail-condition":["pulse"],
-                       "capture-devices":{"normal":"alsa:0,0"}
+                       "capture-devices":{"normal":"alsa:sprdphone,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"}
+                       "playback-devices":{"normal":"alsa:sprdphone,0"},
+                       "capture-devices":{"normal":"alsa:sprdphone,0"}
                },
                {
                        "device-type":"hdmi",
                        "builtin":false,
                        "direction":["out"],
                        "avail-condition":["pulse, dbus"],
-                       "playback-devices":{"normal":"alsa:0,0"}
+                       "playback-devices":{"normal":"alsa:sprdphone,0"}
                },
                {
                        "device-type":"bt",
@@ -49,15 +49,15 @@
                        "builtin":false,
                        "direction":["both"],
                        "avail-condition":["pulse","dbus"],
-                       "playback-devices":{"normal":"alsa:0,0"},
-                       "capture-devices":{"normal":"alsa:0,0"}
+                       "playback-devices":{"normal":"alsa:sprdphone,0"},
+                       "capture-devices":{"normal":"alsa:sprdphone,0"}
                },
                {
                        "device-type":"forwarding",
                        "builtin":false,
                        "direction":["out"],
                        "avail-condition":["pulse", "dbus"],
-                       "playback-devices":{"normal":"alsa:0,0"},
+                       "playback-devices":{"normal":"alsa:sprdphone,0"},
                },
                {
                        "device-type":"usb-audio",
@@ -70,7 +70,7 @@
        "device-files":{
                "playback-devices":[
                        {
-                               "device-string":"alsa:0,0",
+                               "device-string":"alsa:sprdphone,0",
                                "role":{
                                                "normal":"rate=44100",
                                }
@@ -78,7 +78,7 @@
                ],
                "capture-devices":[
                        {
-                               "device-string":"alsa:0,0",
+                               "device-string":"alsa:sprdphone,0",
                                "role":{"normal":"rate=44100"}
                        }
                ]

diff --git a/mmfw-sysconf-target-tm1/etc/pulse/system.pa b/mmfw-sysconf-target-tm1/etc/pulse/system.pa
index d81a5aceee549bc3a703ccff5fe31a1f95d23300..61fd953a06ddac272a4b6737a8d055713ee27d2f 100644 (file)
--- a/mmfw-sysconf-target-tm1/etc/pulse/system.pa
+++ b/mmfw-sysconf-target-tm1/etc/pulse/system.pa
@@ -19,7 +19,7 @@
 
 ### Automatically load driver modules depending on the hardware available
 #.ifexists module-udev-detect.so
-load-module module-udev-detect
+#load-module module-udev-detect
 #.endif
 
 ### Load several protocols

diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index 98131e0b97780ad6fcdb8f3fe40dc4a264e4d503..2752b16f1453e2f0f90960516a2451182c186816 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.26
+Version:    0.2.27
 Release:    0
 Group:      Multimedia/Configuration
 License:    Apache-2.0