summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpr.jung <pr.jung@samsung.com>2017-07-06 11:11:19 +0900
committerHyotaek Shim <hyotaek.shim@samsung.com>2017-07-07 14:28:24 +0900
commitd291565b0357810347bb33f8e7cb7dcbccc11da7 (patch)
tree952273bebdf3cee6617021426610b68e24a096b6
parentb9a5d29426b943f85b7505960437cca43314b97c (diff)
downloadlibsvi-d291565b0357810347bb33f8e7cb7dcbccc11da7.tar.gz
libsvi-d291565b0357810347bb33f8e7cb7dcbccc11da7.tar.bz2
libsvi-d291565b0357810347bb33f8e7cb7dcbccc11da7.zip
Seperate internal pattern enumerations for each profile
Change-Id: Ib49c8a0f3212434f5da6efaba29664fbf9ce2d41 Signed-off-by: pr.jung <pr.jung@samsung.com> Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>
-rwxr-xr-xinclude/feedback-ids-internal.h55
-rw-r--r--include/feedback.h1
-rw-r--r--src/check.c1
-rw-r--r--src/vibrator.c3
4 files changed, 37 insertions, 23 deletions
diff --git a/include/feedback-ids-internal.h b/include/feedback-ids-internal.h
index d988c2e..c694406 100755
--- a/include/feedback-ids-internal.h
+++ b/include/feedback-ids-internal.h
@@ -43,31 +43,46 @@ extern "C" {
typedef enum {
FEEDBACK_PATTERN_INTERNAL_NONE = -1,
+ FEEDBACK_PATTERN_MESSAGE_ON_CALL = 24, /**< feedback pattern when incoming a message on call */
+ FEEDBACK_PATTERN_EMAIL_ON_CALL = 26, /**< feedback pattern when incoming an email on call */
+ FEEDBACK_PATTERN_WAKEUP_ON_CALL = 28, /**< feedback pattern when alert wake up call on call */
+ FEEDBACK_PATTERN_SCHEDULE_ON_CALL = 30, /**< feedback pattern when alert schedule alarm on call */
+ FEEDBACK_PATTERN_TIMER_ON_CALL = 32, /**< feedback pattern when alert timer on call */
+ FEEDBACK_PATTERN_GENERAL_ON_CALL = 34, /**< feedback pattern when alert general event on call */
- FEEDBACK_PATTERN_MESSAGE_ON_CALL = 24, /**< feedback pattern when incoming a message on call */
- FEEDBACK_PATTERN_EMAIL_ON_CALL = 26, /**< feedback pattern when incoming an email on call */
- FEEDBACK_PATTERN_WAKEUP_ON_CALL = 28, /**< feedback pattern when alert wake up call on call */
- FEEDBACK_PATTERN_SCHEDULE_ON_CALL = 30, /**< feedback pattern when alert schedule alarm on call */
- FEEDBACK_PATTERN_TIMER_ON_CALL = 32, /**< feedback pattern when alert timer on call */
- FEEDBACK_PATTERN_GENERAL_ON_CALL = 34, /**< feedback pattern when alert general event on call */
+ FEEDBACK_PATTERN_CHARGERCONN_ON_CALL = 39, /**< feedback pattern when connecting charger on call */
+ FEEDBACK_PATTERN_CHARGING_ERROR_ON_CALL = 41, /**< feedback pattern when occuring charging error on call */
+ FEEDBACK_PATTERN_FULLCHARGED_ON_CALL = 43, /**< feedback pattern when full charged on call */
+ FEEDBACK_PATTERN_LOWBATT_ON_CALL = 45, /**< feedback pattern when low battery on call */
- FEEDBACK_PATTERN_CHARGERCONN_ON_CALL = 39, /**< feedback pattern when connecting charger on call */
- FEEDBACK_PATTERN_CHARGING_ERROR_ON_CALL = 41, /**< feedback pattern when occuring charging error on call */
- FEEDBACK_PATTERN_FULLCHARGED_ON_CALL = 43, /**< feedback pattern when full charged on call */
- FEEDBACK_PATTERN_LOWBATT_ON_CALL = 45, /**< feedback pattern when low battery on call */
+ FEEDBACK_PATTERN_OUTGOING_CALL = 53, /**< feedback pattern when connected outgoing call */
+ FEEDBACK_PATTERN_SCREEN_CAPTURE = 61, /**< feedback pattern when screen capture */
- FEEDBACK_PATTERN_OUTGOING_CALL = 53, /**< feedback pattern when connected outgoing call */
- FEEDBACK_PATTERN_SCREEN_CAPTURE = 61, /**< feedback pattern when screen capture */
+ FEEDBACK_PATTERN_SEND_SOS_MESSAGE = 69, /**< feedback pattern when sending SOS message */
- FEEDBACK_PATTERN_SEND_SOS_MESSAGE = 74, /**< feedback pattern when sending SOS message */
- FEEDBACK_PATTERN_RINGER, /**< Feedback pattern for incoming call */
- FEEDBACK_PATTERN_NOTIFICATION, /**< Feedback pattern for notification */
- FEEDBACK_PATTERN_INFO, /**< Feedback pattern for information */
- FEEDBACK_PATTERN_WARNING, /**< Feedback pattern for warning */
- FEEDBACK_PATTERN_ERROR, /**< Feedback pattern for error */
- FEEDBACK_PATTERN_EMERGENCY, /**< Feedback pattern for emergency */
+ FEEDBACK_PATTERN_SYSTEM_SHORT = 107,
+ FEEDBACK_PATTERN_SYSTEM_ERROR,
+ FEEDBACK_PATTERN_SYSTEM_LONG = 112,
+ FEEDBACK_PATTERN_SYSTEM_MID,
+ FEEDBACK_PATTERN_END_EFFECT = 117,
+ FEEDBACK_PATTERN_RINGER = 129, /**< Feedback pattern for incoming call */
+ FEEDBACK_PATTERN_GENERAL_STRONG_BUZZ = 135,
+ FEEDBACK_PATTERN_NOTIFICATION = 146, /**< Feedback pattern for notification */
- FEEDBACK_PATTERN_INTERNAL_END,
+ FEEDBACK_PATTERN_RESERVED_END = 10000,
+ // Add new pattern ids for mobile devices here
+ // ...
+ FEEDBACK_PATTERN_MOBILE_END = 20000,
+ // Add new pattern ids for wearable devices here
+ // ...
+ FEEDBACK_PATTERN_WEARABLE_END = 30000,
+ // Add new pattern ids for tv devices here
+ // ...
+ FEEDBACK_PATTERN_TV_END = 40000,
+ // Add new pattern ids for ivi devices here
+ // ...
+ FEEDBACK_PATTERN_IVI_END = 50000,
+ FEEDBACK_PATTERN_INTERNAL_END = 90000,
} feedback_pattern_internal_e;
/**
diff --git a/include/feedback.h b/include/feedback.h
index 3fcff64..ae15e62 100644
--- a/include/feedback.h
+++ b/include/feedback.h
@@ -23,6 +23,7 @@
#include <tizen.h>
#include <tizen_error.h>
#include "feedback-ids.h"
+#include "feedback-ids-internal.h"
#ifdef __cplusplus
diff --git a/src/check.c b/src/check.c
index 34231e7..8e18e01 100644
--- a/src/check.c
+++ b/src/check.c
@@ -22,7 +22,6 @@
#include <system_info.h>
#include "feedback.h"
-#include "feedback-ids-internal.h"
#include "profiles.h"
#include "log.h"
diff --git a/src/vibrator.c b/src/vibrator.c
index 94242ed..62eb07b 100644
--- a/src/vibrator.c
+++ b/src/vibrator.c
@@ -26,13 +26,12 @@
#include <vconf.h>
#include <sys/stat.h>
-#include "feedback-ids.h"
+#include "feedback.h"
#include "profiles.h"
#include "parser.h"
#include "devices.h"
#include "log.h"
#include "dbus.h"
-#include "feedback-ids-internal.h"
#define HAPTIC_DEVICE 0