fix system volume slider's operation

Change-Id: I20184d59117937c08a7b20c88b47e45548583b0a

diff --git a/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec
index 3c54328..115a8c2 100755 (executable)
--- a/packaging/org.tizen.setting.spec
+++ b/packaging/org.tizen.setting.spec
@@ -46,6 +46,7 @@ BuildRequires:  pkgconfig(capi-network-connection)
 #BuildRequires:  pkgconfig(network)
 #BuildRequires:  pkgconfig(security-server)
 BuildRequires:  pkgconfig(svi)
+BuildRequires:  pkgconfig(feedback)
 BuildRequires:  pkgconfig(appsvc)
 BuildRequires:  pkgconfig(notification)
 BuildRequires:  pkgconfig(pango)

diff --git a/setting-profile/CMakeLists.txt b/setting-profile/CMakeLists.txt
index a92a4e6..8925a0b 100755 (executable)
--- a/setting-profile/CMakeLists.txt
+++ b/setting-profile/CMakeLists.txt
@@ -3,7 +3,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/${SETTING_COMMON}/include)
 
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(pkgs_profile REQUIRED ecore ecore-file evas elementary utilX appcore-common appcore-efl haptic ui-gadget-1 capi-appfw-application vconf capi-media-player capi-media-sound-manager dlog svi devman capi-system-device)
+pkg_check_modules(pkgs_profile REQUIRED ecore ecore-file evas elementary utilX appcore-common appcore-efl haptic ui-gadget-1 capi-appfw-application vconf capi-media-player capi-media-sound-manager dlog svi devman capi-system-device feedback)
 
 FOREACH(flag ${pkgs_profile_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")

diff --git a/setting-profile/include/setting-profile.h b/setting-profile/include/setting-profile.h
index 4a303db..0499615 100755 (executable)
--- a/setting-profile/include/setting-profile.h
+++ b/setting-profile/include/setting-profile.h
@@ -28,6 +28,7 @@
 
 #include <haptic.h>
 #include <svi.h>
+#include <feedback.h>
 
 #include <setting-common-draw-widget.h>
 #include <setting-common-view.h>

diff --git a/setting-profile/src/setting-profile-sound-main.c b/setting-profile/src/setting-profile-sound-main.c
index 4d99297..fbd487c 100755 (executable)
--- a/setting-profile/src/setting-profile-sound-main.c
+++ b/setting-profile/src/setting-profile-sound-main.c
@@ -414,10 +414,16 @@ void __volume_stop_change_cb(void *data, Evas_Object *obj, void *event_info)
                        SETTING_TRACE_DEBUG("media player will be created");
                        pa_tone_path = (char*)strdup(SETTING_DEFAULT_MEDIA_TONE);
 
-                       setting_profile_play_sound_origin(player, ad, __mm_player_msg_cb,
-                                                       pa_tone_path,
-                                                       (float)value,
-                                                       SOUND_TYPE_MEDIA);
+                       sound_type_e type;
+                       int ret = sound_manager_get_current_sound_type(&type);
+                       SETTING_TRACE("sound_manager_get_current_sound_type() : type %d, ret = %d", type, ret);
+                       if(type != SOUND_TYPE_MEDIA)
+                       {
+                               setting_profile_play_sound_origin(player, ad, __mm_player_msg_cb,
+                                                               pa_tone_path,
+                                                               (float)value,
+                                                               SOUND_TYPE_MEDIA);
+                       }
                        break;
                case SETTING_VOL_TYPE_SYSTEM:
                        sound_manager_set_volume(SOUND_TYPE_SYSTEM, list_item->chk_status);
@@ -425,13 +431,10 @@ void __volume_stop_change_cb(void *data, Evas_Object *obj, void *event_info)
                        if(*player != NULL)
                                return;
                        SETTING_TRACE_DEBUG("ringtone player will be created");
-                       char pattern_file[MAX_COMMON_BUFFER_LEN] = {0,};
-                       svi_get_path(SVI_TYPE_SND, SVI_SND_TOUCH_TOUCH1, pattern_file, sizeof(pattern_file));
 
-                       setting_profile_play_sound_origin(player, ad, __mm_player_msg_cb,
-                                                       pattern_file,
-                                                       (float)value,
-                                                       SOUND_TYPE_SYSTEM);
+                       feedback_initialize();
+                       feedback_play_type(FEEDBACK_TYPE_SOUND, FEEDBACK_PATTERN_SIP);
+                       feedback_deinitialize();
                        break;
                default:
                return;
@@ -1577,6 +1580,9 @@ settings_profile_sound_main_sys_sound_slider_value_change_cb(void *data,
                sound_manager_set_volume(SOUND_TYPE_SYSTEM, list_item->chk_status);
                SETTING_TRACE_DEBUG("system volume is %d, %f", list_item->chk_status, val);
        }
+       feedback_initialize();
+       feedback_play_type(FEEDBACK_TYPE_SOUND, FEEDBACK_PATTERN_SIP);
+       feedback_deinitialize();
 }
 
 static void

diff --git a/setting-profile/src/setting-profile.c b/setting-profile/src/setting-profile.c
index c84368e..f035983 100755 (executable)
--- a/setting-profile/src/setting-profile.c
+++ b/setting-profile/src/setting-profile.c
@@ -826,11 +826,13 @@ player_h *setting_profile_play_sound(void *data, void *cb,
                        case SOUND_TYPE_NOTIFICATION:
                                ad->song_playing = (char *)g_strdup(SETTING_DEFAULT_MSG_TONE);
                                break;
+#if DISABLED_CODE
                        case SOUND_TYPE_SYSTEM:
                                svi_get_path(SVI_TYPE_SND, SVI_SND_TOUCH_TOUCH1, pattern_file, sizeof(pattern_file));
                                retv_if(pattern_file == NULL, NULL);
                                ad->song_playing = (char *)g_strdup(pattern_file);
                                break;
+#endif
                        default:
                                ad->song_playing = (char *)g_strdup(SETTING_DEFAULT_CALL_TONE);
                                break;