projects / platform / core / multimedia / mmfw-sysconf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e65abe7)
[all/audio] Modify stream-map.json 19/44019/1
authorSangchul Lee <sc11.lee@samsung.com>
Thu, 16 Jul 2015 05:19:58 +0000 (14:19 +0900)
committerSangchul Lee <sc11.lee@samsung.com>
Thu, 16 Jul 2015 05:20:38 +0000 (14:20 +0900)
[Version] 0.2.9
[Profile] Common
[Issue Type] Policy

Change-Id: I5db89679ef06ea2a1261a3a9fe4f771a782cd4bf

mmfw-sysconf-simulator/etc/pulse/stream-map.json patch | blob | history
mmfw-sysconf-simulator/usr/etc/mmfw_audio_volume.ini [new file with mode: 0644] patch | blob
mmfw-sysconf-target-n4/etc/pulse/stream-map.json patch | blob | history
mmfw-sysconf-target-u3/etc/pulse/stream-map.json patch | blob | history
packaging/mmfw-sysconf.spec patch | blob | history

diff --git a/mmfw-sysconf-simulator/etc/pulse/stream-map.json b/mmfw-sysconf-simulator/etc/pulse/stream-map.json
index f21a5ab..27df234 100644 (file)
--- a/mmfw-sysconf-simulator/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-simulator/etc/pulse/stream-map.json
@@ -8,7 +8,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["audio-jack","builtin-mic"],
                        "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"system",
@@ -18,7 +18,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"alarm",
@@ -28,7 +28,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"notification",
@@ -38,7 +38,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"emergency",
@@ -48,7 +48,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["builtin-speaker"],
-                       "avail-frameworks":["player","wav-player"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"voice-information",
@@ -58,7 +58,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"voice-recognition",
@@ -78,7 +78,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"ringtone-call",
@@ -88,7 +88,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"voip",
@@ -98,7 +98,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
-                       "avail-frameworks":["audio-io"],
+                       "avail-frameworks":["audio-io","tone-player"],
                },
                {
                        "role":"call-voice",
@@ -108,7 +108,7 @@
                        "is-hal-volume":{"in":0,"out":1},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-frameworks":["sound-manager","tone-player"],
                },
                {
                        "role":"call-video",
@@ -118,7 +118,7 @@
                        "is-hal-volume":{"in":0,"out":1},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-frameworks":["sound-manager","tone-player"],
                },
                {
                        "role":"radio",
diff --git a/mmfw-sysconf-simulator/usr/etc/mmfw_audio_volume.ini b/mmfw-sysconf-simulator/usr/etc/mmfw_audio_volume.ini
new file mode 100644 (file)
index 0000000..09a9a97
--- /dev/null
+++ b/mmfw-sysconf-simulator/usr/etc/mmfw_audio_volume.ini
@@ -0,0 +1,19 @@
+[volumes]
+system                         = 0, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 82, 84, 86, 88, 90
+notification                   = 0, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 95
+alarm                          = 0, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 90
+ringtone                       = 0, 61, 63, 65, 67, 69, 71, 73, 75, 77, 79, 81, 83, 85, 87, 90
+media                          = 0, 44, 48, 52, 56, 61, 66, 70, 74, 78, 82, 85, 88, 91, 94, 97
+call                           = 60, 65, 70, 76, 82, 88, 94, 100
+voip                           = 60, 65, 70, 76, 82, 88, 94, 100
+voice                          = 0, 55, 58, 61, 64, 67, 70, 73, 76, 79, 82, 85, 88, 91, 94, 97
+gain_dialer                    = 1.00
+gain_touch                     = 1.00
+gain_af                        = 0.70
+gain_shutter1                  = 0.14
+gain_shutter2                  = 1.00
+gain_camcording                = 0.30
+gain_midi                      = 1.00
+gain_booting                   = 0.40
+gain_video                     = 0.90
+gain_tts                       = 1.00
diff --git a/mmfw-sysconf-target-n4/etc/pulse/stream-map.json b/mmfw-sysconf-target-n4/etc/pulse/stream-map.json
index f21a5ab..27df234 100644 (file)
--- a/mmfw-sysconf-target-n4/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-n4/etc/pulse/stream-map.json
@@ -8,7 +8,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["audio-jack","builtin-mic"],
                        "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"system",
@@ -18,7 +18,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"alarm",
@@ -28,7 +28,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"notification",
@@ -38,7 +38,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"emergency",
@@ -48,7 +48,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["builtin-speaker"],
-                       "avail-frameworks":["player","wav-player"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"voice-information",
@@ -58,7 +58,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"voice-recognition",
@@ -78,7 +78,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"ringtone-call",
@@ -88,7 +88,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"voip",
@@ -98,7 +98,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
-                       "avail-frameworks":["audio-io"],
+                       "avail-frameworks":["audio-io","tone-player"],
                },
                {
                        "role":"call-voice",
@@ -108,7 +108,7 @@
                        "is-hal-volume":{"in":0,"out":1},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-frameworks":["sound-manager","tone-player"],
                },
                {
                        "role":"call-video",
@@ -118,7 +118,7 @@
                        "is-hal-volume":{"in":0,"out":1},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-frameworks":["sound-manager","tone-player"],
                },
                {
                        "role":"radio",
diff --git a/mmfw-sysconf-target-u3/etc/pulse/stream-map.json b/mmfw-sysconf-target-u3/etc/pulse/stream-map.json
index f21a5ab..27df234 100644 (file)
--- a/mmfw-sysconf-target-u3/etc/pulse/stream-map.json
+++ b/mmfw-sysconf-target-u3/etc/pulse/stream-map.json
@@ -8,7 +8,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["audio-jack","builtin-mic"],
                        "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"system",
@@ -18,7 +18,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["forwarding","audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"alarm",
@@ -28,7 +28,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"notification",
@@ -38,7 +38,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"emergency",
@@ -48,7 +48,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["builtin-speaker"],
-                       "avail-frameworks":["player","wav-player"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"voice-information",
@@ -58,7 +58,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player","audio-io"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"voice-recognition",
@@ -78,7 +78,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"ringtone-call",
@@ -88,7 +88,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["none"],
                        "avail-out-devices":["audio-jack","bt","builtin-speaker"],
-                       "avail-frameworks":["player","wav-player"],
+                       "avail-frameworks":["player","wav-player","tone-player","audio-io"],
                },
                {
                        "role":"voip",
@@ -98,7 +98,7 @@
                        "is-hal-volume":{"in":0,"out":0},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
-                       "avail-frameworks":["audio-io"],
+                       "avail-frameworks":["audio-io","tone-player"],
                },
                {
                        "role":"call-voice",
@@ -108,7 +108,7 @@
                        "is-hal-volume":{"in":0,"out":1},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-frameworks":["sound-manager","tone-player"],
                },
                {
                        "role":"call-video",
@@ -118,7 +118,7 @@
                        "is-hal-volume":{"in":0,"out":1},
                        "avail-in-devices":["builtin-mic","audio-jack","bt"],
                        "avail-out-devices":["builtin-receiver","builtin-speaker","audio-jack","bt"],
-                       "avail-frameworks":["sound-manager"],
+                       "avail-frameworks":["sound-manager","tone-player"],
                },
                {
                        "role":"radio",
diff --git a/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index 2d2af1a..17f88a1 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.8
+Version:    0.2.9
 Release:    0
 Group:      Multimedia/Configuration
 License:    Apache-2.0
Domain: Multimedia / Media Common;