[sound] Add vconf key for master volume

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

diff --git a/data/vconf-internal-sound-keys.xml b/data/vconf-internal-sound-keys.xml
index 3572257..5eeee54 100644 (file)
--- a/data/vconf-internal-sound-keys.xml
+++ b/data/vconf-internal-sound-keys.xml
@@ -7,6 +7,12 @@
     <email/>
     <comment><![CDATA[ ]]></comment>
   </vconfkey>
+  <vconfkey type="int" name="file/private/sound/volume/master" value="100" label="tizen::vconf::volume::set" gid="6514" uid="">
+    <header>VCONFKEY_SOUND_VOLUME_TYPE_MASTER</header>
+    <creator/>
+    <email/>
+    <comment><![CDATA[ ]]></comment>
+  </vconfkey>
   <vconfkey type="int" name="file/private/sound/volume/system" value="9" label="tizen::vconf::volume::set" gid="6514" uid="">
     <header>VCONFKEY_SOUND_VOLUME_TYPE_SYSTEM</header>
     <creator/>

diff --git a/include/vconf-internal-sound-keys.h b/include/vconf-internal-sound-keys.h
index f78a37e..d508f8f 100644 (file)
--- a/include/vconf-internal-sound-keys.h
+++ b/include/vconf-internal-sound-keys.h
@@ -23,6 +23,8 @@
 #define __VCONF_INTERNAL_SOUND_KEYS_H__
 #define VCONFKEY_SOUND_STATUS  "memory/Sound/SoundStatus"
 
+#define VCONFKEY_SOUND_VOLUME_TYPE_MASTER  "file/private/sound/volume/master"
+
 #define VCONFKEY_SOUND_VOLUME_TYPE_SYSTEM  "file/private/sound/volume/system"
 
 #define VCONFKEY_SOUND_VOLUME_TYPE_NOTIFICATION  "file/private/sound/volume/notification"

diff --git a/packaging/vconf-internal-keys.spec b/packaging/vconf-internal-keys.spec
index 6d3f61e..bba490b 100755 (executable)
--- a/packaging/vconf-internal-keys.spec
+++ b/packaging/vconf-internal-keys.spec
@@ -1,6 +1,6 @@
 Name:       vconf-internal-keys
 Summary:    Internal shared keys for vconf
-Version:    0.0.153
+Version:    0.0.154
 Release:    0
 Group:      Application Framework/Configuration
 License:    Apache-2.0

diff --git a/scripts/vconf-internal-sound-keys.sh b/scripts/vconf-internal-sound-keys.sh
index c8576ca..6e7a904 100644 (file)
--- a/scripts/vconf-internal-sound-keys.sh
+++ b/scripts/vconf-internal-sound-keys.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 /usr/bin/vconftool set -t int "memory/Sound/SoundStatus"  "0" -s "tizen::vconf::public::r" -i  -g 6514
+/usr/bin/vconftool set -t int "file/private/sound/volume/master"  "100" -s "tizen::vconf::volume::set" -i  -g 6514
 /usr/bin/vconftool set -t int "file/private/sound/volume/system"  "9" -s "tizen::vconf::volume::set" -i  -g 6514
 /usr/bin/vconftool set -t int "file/private/sound/volume/notification"  "11" -s "tizen::vconf::volume::set" -i  -g 6514
 /usr/bin/vconftool set -t int "file/private/sound/volume/alarm"  "7" -s "tizen::vconf::volume::set" -i  -g 6514
@@ -11,4 +12,4 @@
 /usr/bin/vconftool set -t int "file/private/sound/volume/voice"  "7" -s "tizen::vconf::volume::set" -i  -g 6514
 /usr/bin/vconftool set -t int "memory/private/sound/PrimaryVolumeType"  "-1" -s "tizen::vconf::public::rw" -i  -g 6514
 /usr/bin/vconftool set -t int "memory/private/sound/pcm_dump"  "0" -s "tizen::vconf::platform::r" -i  -g 6514
-/usr/bin/vconftool set -t int "memory/private/sound/booting"  "/usr/share/keysound/poweron.wav" -s "tizen::vconf::platform::rw" -i  -g 6514
\ No newline at end of file
+/usr/bin/vconftool set -t int "memory/private/sound/booting"  "/usr/share/keysound/poweron.wav" -s "tizen::vconf::platform::rw" -i  -g 6514