From: Hyejin Kim <hyejin0906.kim@samsung.com>
Date: Wed, 5 Sep 2012 07:09:30 +0000 (+0900)
Subject: remove haptic play pattern code
X-Git-Tag: accepted/2.0alpha/20121023.233853~35
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c2e2915a50c16d8b6f359f69d4e139c94128446e;p=profile%2Fivi%2Fsettings.git

remove haptic play pattern code
patchset2. remove merge conflict

Change-Id: I714f6557295b4809b1b12fcd122f08b2e051b4ce
---

diff --git a/setting-profile/src/setting-profile-sound-main.c b/setting-profile/src/setting-profile-sound-main.c
index 64f0d57..8d9c117 100755
--- a/setting-profile/src/setting-profile-sound-main.c
+++ b/setting-profile/src/setting-profile-sound-main.c
@@ -836,30 +836,6 @@ static Evas_Object *__get_ringtone_list(void *data)
 	FREE(pa_ringtone);
 	G_FREE(sub_desc);
 
-	/*  a-2. vibration type */
-	char *setting_vib_type[SETTING_SOUND_VIB_TYPE_LEN] = {
-		_("IDS_ST_BODY_VIBRATION_1"),
-		_("IDS_ST_BODY_VIBRATION_2"),
-		_("IDS_ST_BODY_VIBRATION_3"),
-		_("IDS_ST_BODY_VIBRATION_4"),
-		_("IDS_ST_BODY_VIBRATION_5")
-	};
-	int value = 0;
-	vconf_get_int(VCONFKEY_SETAPPL_CALL_VIBRATION_PATTERN_INT, &value);
-	ad->data_call_alert_vib =
-	    setting_create_Gendial_exp_parent_field(genlist,
-						    &(ad->itc_2text_3_parent),
-						    setting_profile_sound_main_mouse_up_Gendial_list_cb,
-						    ad, SWALLOW_Type_INVALID,
-						    SETTING_SOUND_TEXT_CALL_VIBRATION,
-						    setting_vib_type[value]);
-	if (ad->data_call_alert_vib) {
-		ad->data_call_alert_vib->int_slp_setting_binded =
-	    		INT_SLP_SETTING_CALL_ALERT_VIB;
-	} else {
-		SETTING_TRACE_ERROR("ad->data_call_alert_vib is NULL");
-	}
-
 	/*  b. notification */
 	(void)setting_create_Gendial_field_titleItem(genlist,
 						     &(ad->itc_group_item),
@@ -1598,10 +1574,8 @@ setting_profile_sound_main_vib_sound_slider_value_change_cb(void *data,
 	value = (int)(val + 0.5);	/*  to sync displayed value on slider */
 	if (value != priv_val_int) {
 		int vib_volume = value;
-		char pattern_file[MAX_COMMON_BUFFER_LEN] = {0,};
-		svi_get_path(SVI_TYPE_VIB, SVI_VIB_NOTIFICATION_GENERAL, pattern_file, sizeof(pattern_file));
 		device_haptic_stop_play(ad->hnd_hpt);
-		err = device_haptic_play_file(ad->hnd_hpt, pattern_file, 1, vib_volume);
+		err = device_haptic_play_monotone_with_feedback_level(ad->hnd_hpt, 1000, vib_volume);
 
 		if (err < 0)
 			SETTING_TRACE("Failed to play haptic monotone");
@@ -1636,10 +1610,8 @@ setting_profile_sound_main_touchVib_sound_slider_value_change_cb(void *data,
 	if (value != priv_val_int) {
 
 		int vib_volume = value;	/* SETTING_VIB_VOL_MAX; */
-		char pattern_file[MAX_COMMON_BUFFER_LEN] = {0,};
-		svi_get_path(SVI_TYPE_VIB, SVI_VIB_OPERATION_VIBRATION, pattern_file, sizeof(pattern_file));
 		device_haptic_stop_play(ad->hnd_hpt);
-		err = device_haptic_play_file(ad->hnd_hpt, pattern_file, 1, vib_volume);
+		err = device_haptic_play_monotone_with_feedback_level(ad->hnd_hpt, 1000, vib_volume);
 
 		if (err < 0)
 			SETTING_TRACE("Failed to play haptic monotone");