From eebd46f3f726e4a6e4bcfadf93a00273a267541c Mon Sep 17 00:00:00 2001
From: Seungbae Shin <seungbae.shin@samsung.com>
Date: Tue, 28 Jul 2015 23:28:57 +0900
Subject: [PATCH] [sound] update primary volume key

Change-Id: I51e4a34be811edf4b0ce017f48dea11b6cd04d34
Signed-off-by: Seungbae Shin <seungbae.shin@samsung.com>
---
 data/vconf-internal-sound-keys.xml    |  8 +-------
 include/vconf-internal-sound-keys.h   |  4 +---
 report/vconf-internal-sound-keys.html | 13 +------------
 scripts/vconf-internal-sound-keys.sh  |  3 +--
 4 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/data/vconf-internal-sound-keys.xml b/data/vconf-internal-sound-keys.xml
index ddad2da..301bbae 100644
--- a/data/vconf-internal-sound-keys.xml
+++ b/data/vconf-internal-sound-keys.xml
@@ -58,18 +58,12 @@
     <email/>
     <comment><![CDATA[ ]]></comment>
   </vconfkey>
-  <vconfkey type="int" name="memory/private/sound/PrimaryVolumetype" value="-1" label="tizen::vconf::public::r" gid="6514" uid="">
+  <vconfkey type="int" name="memory/private/sound/PrimaryVolumeType" value="-1" label="tizen::vconf::public::rw" gid="6514" uid="">
     <header>VCONFKEY_SOUND_PRIMARY_VOLUME_TYPE</header>
     <creator/>
     <email/>
     <comment><![CDATA[ ]]></comment>
   </vconfkey>
-  <vconfkey type="int" name="memory/private/sound/PrimaryVolumetypeForce" value="-1" label="tizen::vconf::public::rw" gid="6514" uid="">
-    <header>VCONFKEY_SOUND_PRIMARY_VOLUME_TYPE_FORCE</header>
-    <creator/>
-    <email/>
-    <comment><![CDATA[ ]]></comment>
-  </vconfkey>
   <vconfkey type="int" name="memory/private/sound/pcm_dump" value="0" label="tizen::vconf::platform::r" gid="6514" uid="">
     <header>VCONFKEY_SOUND_PCM_DUMP</header>
     <creator/>
diff --git a/include/vconf-internal-sound-keys.h b/include/vconf-internal-sound-keys.h
index 23eecd7..1b8d5cd 100644
--- a/include/vconf-internal-sound-keys.h
+++ b/include/vconf-internal-sound-keys.h
@@ -43,9 +43,7 @@ enum {
 
 #define VCONFKEY_SOUND_VOLUME_TYPE_VOICE  "file/private/sound/volume/voice"
 
-#define VCONFKEY_SOUND_PRIMARY_VOLUME_TYPE  "memory/private/sound/PrimaryVolumetype"
-
-#define VCONFKEY_SOUND_PRIMARY_VOLUME_TYPE_FORCE  "memory/private/sound/PrimaryVolumetypeForce"
+#define VCONFKEY_SOUND_PRIMARY_VOLUME_TYPE  "memory/private/sound/PrimaryVolumeType"
 
 #define VCONFKEY_SOUND_PCM_DUMP  "memory/private/sound/pcm_dump"
 
diff --git a/report/vconf-internal-sound-keys.html b/report/vconf-internal-sound-keys.html
index 805af55..cfedfcd 100644
--- a/report/vconf-internal-sound-keys.html
+++ b/report/vconf-internal-sound-keys.html
@@ -119,18 +119,7 @@
 </tr>
   <tr>
 <td><a href="../fullsearch/VCONFKEY_SOUND_PRIMARY_VOLUME_TYPE-result.txt">VCONFKEY_SOUND_PRIMARY_VOLUME_TYPE</a></td>
-<td>memory/private/sound/PrimaryVolumetype</td>
-<td>int</td>
-<td>-1</td>
-<td>tizen::vconf::public::r</td>
-<td></td>
-<td> </td>
-<td bgcolor="green" align="center"></td>
-<td bgcolor="green" align="center"></td>
-</tr>
-  <tr>
-<td><a href="../fullsearch/VCONFKEY_SOUND_PRIMARY_VOLUME_TYPE_FORCE-result.txt">VCONFKEY_SOUND_PRIMARY_VOLUME_TYPE_FORCE</a></td>
-<td>memory/private/sound/PrimaryVolumetypeForce</td>
+<td>memory/private/sound/PrimaryVolumeType</td>
 <td>int</td>
 <td>-1</td>
 <td>tizen::vconf::public::rw</td>
diff --git a/scripts/vconf-internal-sound-keys.sh b/scripts/vconf-internal-sound-keys.sh
index f51d6e2..c8576ca 100644
--- a/scripts/vconf-internal-sound-keys.sh
+++ b/scripts/vconf-internal-sound-keys.sh
@@ -9,7 +9,6 @@
 /usr/bin/vconftool set -t int "file/private/sound/volume/call"  "4" -s "tizen::vconf::volume::set" -i  -g 6514
 /usr/bin/vconftool set -t int "file/private/sound/volume/voip"  "4" -s "tizen::vconf::volume::set" -i  -g 6514
 /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::r" -i  -g 6514
-/usr/bin/vconftool set -t int "memory/private/sound/PrimaryVolumetypeForce"  "-1" -s "tizen::vconf::public::rw" -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
-- 
2.7.4