sync with tizen_2.0 branch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b450b2b..cc64eac 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,7 @@ pkg_check_modules(pkgs REQUIRED
        syspopup
        bundle
        svi
+       feedback
        glib-2.0
        ui-gadget-1
        notification

diff --git a/packaging/org.tizen.volume.spec b/packaging/org.tizen.volume.spec
index ad2a5ac..5a30e97 100755 (executable)
--- a/packaging/org.tizen.volume.spec
+++ b/packaging/org.tizen.volume.spec
@@ -16,6 +16,7 @@ BuildRequires:  pkgconfig(svi)
 BuildRequires:  pkgconfig(ui-gadget-1)
 BuildRequires: pkgconfig(notification)
 BuildRequires: pkgconfig(capi-system-info)
+BuildRequires: pkgconfig(feedback)
 
 BuildRequires:  cmake
 BuildRequires:  edje-bin

diff --git a/src/_sound.c b/src/_sound.c
index 7635b22..80222b9 100755 (executable)
--- a/src/_sound.c
+++ b/src/_sound.c
@@ -20,6 +20,7 @@
 #include <mm_sound.h>
 #include <vconf.h>
 #include <svi.h>
+#include <feedback.h>
 
 #include "volume.h"
 #include "_util_log.h"
@@ -38,17 +39,14 @@ void _play_vib(int handle)
 
 void _play_sound(int type, int handle)
 {
-       int ringtone_val = -1;
-       int system_val = -1;
+       feedback_initialize();
+
        if (type == VOLUME_TYPE_MEDIA) {
 
        } else {
-               _get_sound_level(type, &ringtone_val);
-               _get_sound_level(VOLUME_TYPE_SYSTEM, &system_val);
-               _set_sound_level(VOLUME_TYPE_SYSTEM, ringtone_val);
                svi_play_sound(handle, SVI_SND_TOUCH_TOUCH1);
-               _set_sound_level(VOLUME_TYPE_SYSTEM, system_val);
        }
+       feedback_deinitialize();
 }
 
 int _init_svi(void *data)