[target/audio] Change volume table, load module-sound-player

[Version] 0.2.7
[Profile] Common
[Issue Type] Fix Bug

Change-Id: Id93018392d0753f8596ce47512ce5f134540f934

diff --git a/mmfw-sysconf-target-n4/etc/pulse/system.pa b/mmfw-sysconf-target-n4/etc/pulse/system.pa
index 78e174f45be0eac0d33423fab0ee1e987b456f31..4c8ae6ffeb38ffa69ef97cd6bae29fff2c7629b6 100644 (file)
--- a/mmfw-sysconf-target-n4/etc/pulse/system.pa
+++ b/mmfw-sysconf-target-n4/etc/pulse/system.pa
@@ -37,6 +37,11 @@ load-module module-policy
 #load-module module-detect
 #.endif
 
+### Sound Player module
+load-module module-sound-player
+
+load-module module-role-ducking global=1 volume=0
+
 ### Load several protocols
 .ifexists module-esound-protocol-unix.so
 load-module module-esound-protocol-unix

diff --git a/mmfw-sysconf-target-n4/opt/system/mmfw_audio_volume.ini b/mmfw-sysconf-target-n4/opt/system/mmfw_audio_volume.ini
deleted file mode 100644 (file)
index 1718563..0000000
--- a/mmfw-sysconf-target-n4/opt/system/mmfw_audio_volume.ini
+++ /dev/null
@@ -1,45 +0,0 @@
-
-[speaker]
-system                         = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-notification                   = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-alarm                          = 0.00000, 0.00891, 0.01413, 0.02239, 0.03162, 0.03981, 0.05012, 0.06310, 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-ringtone                       = 0.00000, 0.00891, 0.01413, 0.02239, 0.03162, 0.03981, 0.05012, 0.06310, 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-media                          = 0.00000, 0.00891, 0.01413, 0.02239, 0.03162, 0.03981, 0.05012, 0.06310, 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-call                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voip                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voice                          = 0.00000, 0.00891, 0.01413, 0.02239, 0.03162, 0.03981, 0.05012, 0.06310, 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-gain                           = 0.10000, 0.90000, 0.69104, 1.00000, 1.00000, 1.00000, 1.00000, 0.79370, 0.96549
-
-[headset]
-system                         = 0.00000, 0.01259, 0.01585, 0.01995, 0.02512, 0.03162, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623
-notification                   = 0.00000, 0.00398, 0.00501, 0.00631, 0.00794, 0.01000, 0.01259, 0.01585, 0.01995, 0.02512, 0.03162, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000
-alarm                          = 0.00000, 0.00398, 0.00501, 0.00631, 0.00794, 0.01000, 0.01259, 0.01585, 0.01995, 0.02512, 0.03162, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000
-ringtone                       = 0.00000, 0.00398, 0.00501, 0.00631, 0.00794, 0.01000, 0.01259, 0.01585, 0.01995, 0.02512, 0.03162, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000
-media                          = 0.00000, 0.00398, 0.00794, 0.01585, 0.03162, 0.05623, 0.07943, 0.11220, 0.14125, 0.17783, 0.22387, 0.28184, 0.35481, 0.50119, 0.70795, 1.00000
-call                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voip                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voice                          = 0.00000, 0.00398, 0.00794, 0.01585, 0.03162, 0.05623, 0.07943, 0.11220, 0.14125, 0.17783, 0.22387, 0.28184, 0.35481, 0.50119, 0.70795, 1.00000
-gain                           = 0.10000, 0.92832, 1.00000, 1.00000, 0.79370, 0.79370, 0.36840, 0.92832, 1.00000
-
-[btheadset]
-system                         = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-notification                   = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-alarm                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-ringtone                       = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-media                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-call                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voip                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voice                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-gain                           = 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000
-
-[hdmi]
-system                         = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-notification                   = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-alarm                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-ringtone                       = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-media                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-call                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voip                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voice                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-gain                           = 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000
-

diff --git a/mmfw-sysconf-target-n4/usr/etc/mmfw_audio_volume.ini b/mmfw-sysconf-target-n4/usr/etc/mmfw_audio_volume.ini
new file mode 100644 (file)
index 0000000..09a9a97
--- /dev/null
+++ b/mmfw-sysconf-target-n4/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-u3/etc/pulse/system.pa b/mmfw-sysconf-target-u3/etc/pulse/system.pa
index 78e174f45be0eac0d33423fab0ee1e987b456f31..4c8ae6ffeb38ffa69ef97cd6bae29fff2c7629b6 100755 (executable)
--- a/mmfw-sysconf-target-u3/etc/pulse/system.pa
+++ b/mmfw-sysconf-target-u3/etc/pulse/system.pa
@@ -37,6 +37,11 @@ load-module module-policy
 #load-module module-detect
 #.endif
 
+### Sound Player module
+load-module module-sound-player
+
+load-module module-role-ducking global=1 volume=0
+
 ### Load several protocols
 .ifexists module-esound-protocol-unix.so
 load-module module-esound-protocol-unix

diff --git a/mmfw-sysconf-target-u3/opt/system/mmfw_audio_volume.ini b/mmfw-sysconf-target-u3/opt/system/mmfw_audio_volume.ini
deleted file mode 100644 (file)
index 1718563..0000000
--- a/mmfw-sysconf-target-u3/opt/system/mmfw_audio_volume.ini
+++ /dev/null
@@ -1,45 +0,0 @@
-
-[speaker]
-system                         = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-notification                   = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-alarm                          = 0.00000, 0.00891, 0.01413, 0.02239, 0.03162, 0.03981, 0.05012, 0.06310, 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-ringtone                       = 0.00000, 0.00891, 0.01413, 0.02239, 0.03162, 0.03981, 0.05012, 0.06310, 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-media                          = 0.00000, 0.00891, 0.01413, 0.02239, 0.03162, 0.03981, 0.05012, 0.06310, 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-call                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voip                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voice                          = 0.00000, 0.00891, 0.01413, 0.02239, 0.03162, 0.03981, 0.05012, 0.06310, 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-gain                           = 0.10000, 0.90000, 0.69104, 1.00000, 1.00000, 1.00000, 1.00000, 0.79370, 0.96549
-
-[headset]
-system                         = 0.00000, 0.01259, 0.01585, 0.01995, 0.02512, 0.03162, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623
-notification                   = 0.00000, 0.00398, 0.00501, 0.00631, 0.00794, 0.01000, 0.01259, 0.01585, 0.01995, 0.02512, 0.03162, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000
-alarm                          = 0.00000, 0.00398, 0.00501, 0.00631, 0.00794, 0.01000, 0.01259, 0.01585, 0.01995, 0.02512, 0.03162, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000
-ringtone                       = 0.00000, 0.00398, 0.00501, 0.00631, 0.00794, 0.01000, 0.01259, 0.01585, 0.01995, 0.02512, 0.03162, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000
-media                          = 0.00000, 0.00398, 0.00794, 0.01585, 0.03162, 0.05623, 0.07943, 0.11220, 0.14125, 0.17783, 0.22387, 0.28184, 0.35481, 0.50119, 0.70795, 1.00000
-call                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voip                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voice                          = 0.00000, 0.00398, 0.00794, 0.01585, 0.03162, 0.05623, 0.07943, 0.11220, 0.14125, 0.17783, 0.22387, 0.28184, 0.35481, 0.50119, 0.70795, 1.00000
-gain                           = 0.10000, 0.92832, 1.00000, 1.00000, 0.79370, 0.79370, 0.36840, 0.92832, 1.00000
-
-[btheadset]
-system                         = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-notification                   = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-alarm                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-ringtone                       = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-media                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-call                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voip                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voice                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-gain                           = 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000
-
-[hdmi]
-system                         = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-notification                   = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-alarm                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-ringtone                       = 0.00000, 0.03981, 0.05012, 0.06310, 0.07943, 0.10000, 0.12589, 0.15849, 0.19953, 0.25119, 0.31623, 0.39811, 0.50119, 0.63096, 0.79433, 1.00000
-media                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-call                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voip                           = 0.08913, 0.12589, 0.17783, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-voice                          = 0.00000, 0.00794, 0.01122, 0.01585, 0.02239, 0.03162, 0.04467, 0.06310, 0.07943, 0.11220, 0.15849, 0.25119, 0.35481, 0.50119, 0.70795, 1.00000
-gain                           = 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000, 1.00000
-

diff --git a/mmfw-sysconf-target-u3/usr/etc/mmfw_audio_volume.ini b/mmfw-sysconf-target-u3/usr/etc/mmfw_audio_volume.ini
new file mode 100644 (file)
index 0000000..09a9a97
--- /dev/null
+++ b/mmfw-sysconf-target-u3/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/packaging/mmfw-sysconf.spec b/packaging/mmfw-sysconf.spec
index fb6ae8ec666f4baee079e761bc4ae5027da01e51..62ba9f233d5636f7077b00bd9b98d37df8b05e8c 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.6
+Version:    0.2.7
 Release:    0
 Group:      Multimedia/Configuration
 License:    Apache-2.0
@@ -142,7 +142,6 @@ rm -rf %{_datadir}/mmfw-sysconf-simulator
 %{_datadir}/mmfw-sysconf-target-u3/usr/share/pulseaudio/alsa-mixer/paths/*.conf
 %{_datadir}/mmfw-sysconf-target-u3/usr/share/pulseaudio/alsa-mixer/paths/*.common
 %{_datadir}/mmfw-sysconf-target-u3/usr/share/pulseaudio/alsa-mixer/profile-sets/*.conf
-%{_datadir}/mmfw-sysconf-target-u3/opt/system/*
 %{_datadir}/mmfw-sysconf-target-u3/usr/share/license/mmfw-sysconf-target-u3
 
 %files target-n4
@@ -156,7 +155,6 @@ rm -rf %{_datadir}/mmfw-sysconf-simulator
 %{_datadir}/mmfw-sysconf-target-n4/usr/share/pulseaudio/alsa-mixer/paths/*.conf
 %{_datadir}/mmfw-sysconf-target-n4/usr/share/pulseaudio/alsa-mixer/paths/*.common
 %{_datadir}/mmfw-sysconf-target-n4/usr/share/pulseaudio/alsa-mixer/profile-sets/*.conf
-%{_datadir}/mmfw-sysconf-target-n4/opt/system/*
 %{_datadir}/mmfw-sysconf-target-n4/usr/share/license/mmfw-sysconf-target-n4
 
 %else