remove feedback-ids-mobile.h 48/56048/2 submit/tizen_common/20151229.154718
authorKyeonghun Lee <kh9090.lee@samsung.com>
Mon, 4 Jan 2016 02:06:54 +0000 (11:06 +0900)
committerKyeonghun Lee <kh9090.lee@samsung.com>
Mon, 4 Jan 2016 04:46:35 +0000 (13:46 +0900)
Change-Id: Iad0d6b2bf4581e9edf7bf8d186475c7dcbf15c31
Signed-off-by: Kyeonghun Lee <kh9090.lee@samsung.com>
externals/MsgSoundPlayer.cpp
include/externals/MsgSoundPlayer.h

index 1f06f41..fb8929d 100755 (executable)
@@ -41,7 +41,6 @@
 
 #include <feedback.h>
 #include <feedback-internal.h>
-#include <feedback-ids-mobile.h>
 
 /*==================================================================================================
                                     DEFINES
@@ -542,7 +541,7 @@ void MsgSoundPlayer::MsgSoundPlayStart(const MSG_ADDRESS_INFO_S *pAddrInfo, MSG_
 #ifndef MSG_CONTACTS_SERVICE_NOT_SUPPORTED
        /* play vibration */
        if (bPlayVibration) {
-               MsgSoundPlayVibration(contactInfo.vibrationPath, bOnCall);
+               MsgSoundPlayVibration(contactInfo.vibrationPath);
        }
 #endif /* MSG_CONTACTS_SERVICE_NOT_SUPPORTED */
 
@@ -670,7 +669,7 @@ void MsgSoundPlayer::MsgSoundPlayMelody(char *pMsgToneFilePath)
 }
 
 
-void MsgSoundPlayer::MsgSoundPlayVibration(char *vibrationPath, bool isOnCall)
+void MsgSoundPlayer::MsgSoundPlayVibration(char *vibrationPath)
 {
        MSG_BEGIN();
 
@@ -701,15 +700,11 @@ void MsgSoundPlayer::MsgSoundPlayVibration(char *vibrationPath, bool isOnCall)
                if (ret != FEEDBACK_ERROR_NONE)
                        MSG_DEBUG("Fail to feedback_play_type");
        } else {
-               if (isOnCall) {
-                       ret = feedback_play_type(FEEDBACK_TYPE_VIBRATION, (feedback_pattern_e)FEEDBACK_PATTERN_MOBILE_MESSAGE_ON_CALL);
-               } else {
-                       ret = feedback_set_resource_path(FEEDBACK_TYPE_VIBRATION, FEEDBACK_PATTERN_MESSAGE, NULL);
-                       if (ret != FEEDBACK_ERROR_NONE)
-                               MSG_DEBUG("Fail to feedback_set_resource_path");
-                       ret = feedback_play_type(FEEDBACK_TYPE_VIBRATION, FEEDBACK_PATTERN_MESSAGE);
-               }
+               ret = feedback_set_resource_path(FEEDBACK_TYPE_VIBRATION, FEEDBACK_PATTERN_MESSAGE, NULL);
+               if (ret != FEEDBACK_ERROR_NONE)
+                       MSG_DEBUG("Fail to feedback_set_resource_path");
 
+               ret = feedback_play_type(FEEDBACK_TYPE_VIBRATION, FEEDBACK_PATTERN_MESSAGE);
                if (ret != FEEDBACK_ERROR_NONE)
                        MSG_DEBUG("Fail to feedback_play_type");
        }
index 7030c9d..11d58a1 100755 (executable)
@@ -55,7 +55,7 @@ private:
        ~MsgSoundPlayer();
 
        void MsgSoundPlayMelody(char *pMsgToneFilePath);
-       void MsgSoundPlayVibration(char *vibrationPath, bool isOnCall);
+       void MsgSoundPlayVibration(char *vibrationPath);
 
        void MsgSoundSetRepeatAlarm();
        void MsgSoundCreateRepeatAlarm(int RepeatTime);