[all/audio] Modify stream-map.json and system.pa

Add ext-media role in stream-map.json for external devices
Enable module-udev-detect and disable module-rescue-streams

Change-Id: I53816fb98b7c2e7c1c19debabe1c3881cfe1de1b

diff --git a/mmfw-sysconf-simulator/etc/pulse/stream-map.json b/mmfw-sysconf-simulator/etc/pulse/stream-map.json
index 53cc9e8bba96d07b8f6b80e647b6a37957104e16..c8cadf157dc68af6bd13401ec847e80ba997ec00 100644 (file)
--- a/mmfw-sysconf-simulator/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-simulator/etc/pulse/stream-map.json
@@ -152,7 +152,7 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["builtin-speaker","audio-jack"],
+                       "avail-out-devices":["audio-jack","builtin-speaker"],
                        "avail-frameworks":["sound-manager"],
                },
                {

diff --git a/mmfw-sysconf-simulator/etc/pulse/system.pa b/mmfw-sysconf-simulator/etc/pulse/system.pa
index abfb92d2e4ad6b05a02fdc8f876b73425dce3ce1..03d75084c7d8599c6a09f89a3e3ab5a850be61cc 100644 (file)
--- a/mmfw-sysconf-simulator/etc/pulse/system.pa
+++ b/mmfw-sysconf-simulator/etc/pulse/system.pa
@@ -21,7 +21,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
@@ -54,7 +54,7 @@ load-module module-dbus-protocol access=local
 
 ### Automatically move streams to the default sink if the sink they are
 ### connected to dies, similar for sources
-load-module module-rescue-streams
+#load-module module-rescue-streams
 
 ### Make sure we always have a sink around, even if it is a null sink.
 load-module module-always-sink
@@ -62,6 +62,5 @@ load-module module-always-sink
 ### Automatically suspend sinks/sources that become idle for too long
 load-module module-suspend-on-idle timeout=1
 
-load-module module-null-sink
 load-sample camera-shutter /usr/share/sounds/mm-camcorder/capture_shutter_02.wav
 load-sample recording-stop /usr/share/sounds/mm-camcorder/recording_stop_01.wav

diff --git a/mmfw-sysconf-target-n4/etc/pulse/stream-map.json b/mmfw-sysconf-target-n4/etc/pulse/stream-map.json
index eaff35b97e144f17e5d5181c3d32dfa8a6116733..502171f9ed8f900d996194f949c8b5f6e7e0d72e 100644 (file)
--- a/mmfw-sysconf-target-n4/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-n4/etc/pulse/stream-map.json
@@ -152,7 +152,7 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["builtin-speaker","audio-jack"],
+                       "avail-out-devices":["audio-jack","builtin-speaker"],
                        "avail-frameworks":["sound-manager"],
                },
                {
@@ -164,5 +164,14 @@
                        "avail-out-devices":["none"],
                        "avail-frameworks":["audio-io"],
                },
+               {
+                       "role":"ext-media",
+                       "priority" : 3,
+                       "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"],
+               },
        ]
 }

diff --git a/mmfw-sysconf-target-n4/etc/pulse/system.pa b/mmfw-sysconf-target-n4/etc/pulse/system.pa
index abfb92d2e4ad6b05a02fdc8f876b73425dce3ce1..03d75084c7d8599c6a09f89a3e3ab5a850be61cc 100644 (file)
--- a/mmfw-sysconf-target-n4/etc/pulse/system.pa
+++ b/mmfw-sysconf-target-n4/etc/pulse/system.pa
@@ -21,7 +21,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
@@ -54,7 +54,7 @@ load-module module-dbus-protocol access=local
 
 ### Automatically move streams to the default sink if the sink they are
 ### connected to dies, similar for sources
-load-module module-rescue-streams
+#load-module module-rescue-streams
 
 ### Make sure we always have a sink around, even if it is a null sink.
 load-module module-always-sink
@@ -62,6 +62,5 @@ load-module module-always-sink
 ### Automatically suspend sinks/sources that become idle for too long
 load-module module-suspend-on-idle timeout=1
 
-load-module module-null-sink
 load-sample camera-shutter /usr/share/sounds/mm-camcorder/capture_shutter_02.wav
 load-sample recording-stop /usr/share/sounds/mm-camcorder/recording_stop_01.wav

diff --git a/mmfw-sysconf-target-u3/etc/pulse/stream-map.json b/mmfw-sysconf-target-u3/etc/pulse/stream-map.json
index eaff35b97e144f17e5d5181c3d32dfa8a6116733..d00caae172937a475d26627daabded6db6bd8f2a 100644 (file)
--- a/mmfw-sysconf-target-u3/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-u3/etc/pulse/stream-map.json
@@ -44,7 +44,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","builtin-speaker","bt","usb-audio"],
                        "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
@@ -53,7 +53,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","builtin-speaker","bt","usb-audio"],
                        "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","bt","builtin-speaker"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt","usb-audio"],
                        "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","bt","builtin-speaker"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt","usb-audio"],
                        "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"],
+                       "avail-out-devices":["builtin-speaker","audio-jack","bt","usb-audio"],
                        "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","bt","builtin-speaker"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt","usb-audio"],
                        "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","builtin-mic"],
+                       "avail-in-devices":["audio-jack","usb-audio","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","bt","builtin-speaker"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt","usb-audio"],
                        "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","bt","builtin-speaker"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt","usb-audio"],
                        "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":["builtin-mic","audio-jack","bt"],
-                       "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
+                       "avail-in-devices":["audio-jack","bt","builtin-mic"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","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":["builtin-mic","audio-jack","bt"],
-                       "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
+                       "avail-in-devices":["audio-jack","bt","builtin-mic"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt"],
                        "avail-frameworks":["sound-manager","tone-player"],
                },
                {
@@ -142,8 +142,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":["audio-jack","bt","builtin-mic"],
+                       "avail-out-devices":["audio-jack","builtin-speaker","bt"],
                        "avail-frameworks":["sound-manager","tone-player"],
                },
                {
@@ -152,7 +152,7 @@
                        "route-type" : "auto",
                        "volume-types":{"in":"none","out":"media"},
                        "avail-in-devices":["none"],
-                       "avail-out-devices":["builtin-speaker","audio-jack"],
+                       "avail-out-devices":["audio-jack","builtin-speaker"],
                        "avail-frameworks":["sound-manager"],
                },
                {
@@ -164,5 +164,14 @@
                        "avail-out-devices":["none"],
                        "avail-frameworks":["audio-io"],
                },
+               {
+                       "role":"ext-media",
+                       "priority" : 3,
+                       "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"],
+               },
        ]
 }

diff --git a/mmfw-sysconf-target-u3/etc/pulse/system.pa b/mmfw-sysconf-target-u3/etc/pulse/system.pa
index abfb92d2e4ad6b05a02fdc8f876b73425dce3ce1..03d75084c7d8599c6a09f89a3e3ab5a850be61cc 100644 (file)
--- a/mmfw-sysconf-target-u3/etc/pulse/system.pa
+++ b/mmfw-sysconf-target-u3/etc/pulse/system.pa
@@ -21,7 +21,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
@@ -54,7 +54,7 @@ load-module module-dbus-protocol access=local
 
 ### Automatically move streams to the default sink if the sink they are
 ### connected to dies, similar for sources
-load-module module-rescue-streams
+#load-module module-rescue-streams
 
 ### Make sure we always have a sink around, even if it is a null sink.
 load-module module-always-sink
@@ -62,6 +62,5 @@ load-module module-always-sink
 ### Automatically suspend sinks/sources that become idle for too long
 load-module module-suspend-on-idle timeout=1
 
-load-module module-null-sink
 load-sample camera-shutter /usr/share/sounds/mm-camcorder/capture_shutter_02.wav
 load-sample recording-stop /usr/share/sounds/mm-camcorder/recording_stop_01.wav

diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index 2fb18de465a5d3d6dc4f73546b773e9894d0e5ff..fe25f7d0f0d3a7d422b4faee9ea89c171967356f 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.20
+Version:    0.2.21
 Release:    0
 Group:      Multimedia/Configuration
 License:    Apache-2.0