Unify bundle data in client, mgr, and widget

[platform/core/uifw/voice-control.git] / common / vc_defs.h

diff --git a/common/vc_defs.h b/common/vc_defs.h
index 2a74a03..d217052 100644 (file)
--- a/common/vc_defs.h
+++ b/common/vc_defs.h
@@ -68,10 +68,26 @@ extern "C" {
 #define VC_BUNDLE_DAEMON_PID           "daemon_pid"
 #define VC_BUNDLE_ERR_MSG                      "err_msg"
 #define VC_BUNDLE_PID                          "pid"
-#define VC_BUNDLE_UTTID                                "uttid"
-#define VC_BUNDLE_UTTSTATUS                    "uttstatus"
+#define VC_BUNDLE_UTT_ID                       "utt_id"
+#define VC_BUNDLE_UTT_STATUS           "utt_status"
+#define VC_BUNDLE_UTT_TEXT                     "utt_text"
 #define VC_BUNDLE_FEEDBACK_EVENT       "feedback_event"
 #define VC_BUNDLE_LENGTH                       "length"
+#define VC_BUNDLE_SHOW                         "show"
+#define VC_BUNDLE_EVENT                                "event"
+#define VC_BUNDLE_PRE_RESULT           "pre_result"
+#define VC_BUNDLE_RESULT                       "result"
+#define VC_BUNDLE_ENGINE_APP_ID                "engine_app_id"
+#define VC_BUNDLE_DISP_TEXT                    "disp_text"
+#define VC_BUNDLE_CONTINUOUS           "continuous"
+#define VC_BUNDLE_KEY                          "key"
+#define VC_BUNDLE_PRIVATE_DATA         "private_data"
+#define VC_BUNDLE_AUDIO_CHANNEL                "audio_channel"
+#define VC_BUNDLE_AUDIO_TYPE           "audio_type"
+#define VC_BUNDLE_AUDIO_RATE           "audio_rate"
+#define VC_BUNDLE_BUFFER                       "buffer"
+#define VC_BUNDLE_VOLUME                       "volume"
+
 
 /******************************************************************************************
 * Message Definition for all
@@ -145,14 +161,6 @@ extern "C" {
 #define VCD_WIDGET_METHOD_SHOW_TOOLTIP         "vcd_widget_method_show_tooltip"
 #define VCD_WIDGET_METHOD_SET_SERVICE_STATE    "vcd_widget_method_set_service_state"
 
-#define VC_WIDGET_BUNDLE_METHOD "vc_widget_bundle_method"
-#define VC_WIDGET_BUNDLE_MESSAGE "vc_widget_bundle_message"
-#define VC_WIDGET_BUNDLE_SERVICE_STATE "vc_widget_bundle_service_state"
-#define VC_WIDGET_BUNDLE_DAEMON_PID "vc_widget_bundle_daemon_pid"
-#define VC_WIDGET_BUNDLE_SHOW "vc_widget_bundle_show"
-#define VC_WIDGET_BUNDLE_REASON "vc_widget_bundle_reason"
-#define VC_WIDGET_BUNDLE_ERROR_MESSAGE "vc_widget_bundle_error_message"
-
 
 /******************************************************************************************
 * Message Definitions for manager
@@ -188,26 +196,6 @@ extern "C" {
 #define VC_MANAGER_METHOD_SEND_AUDIO_STREAMING "vc_manager_method_send_audio_streaming"
 #define VC_MANAGER_METHOD_CHANGE_SYSTEM_VOLUME "vc_manager_method_change_system_volume"
 
-#define VC_MANAGER_BUNDLE_METHOD               "vc_manager_bundle_method"
-#define VC_MANAGER_BUNDLE_MESSAGE              "vc_manager_bundle_message"
-#define VC_MANAGER_BUNDLE_EVENT                "vc_manager_bundle_event"
-#define VC_MANAGER_BUNDLE_PRE_RESULT   "vc_manager_bundle_pre_result"
-#define VC_MANAGER_BUNDLE_ENGINE_APP_ID "vc_manager_bundle_engine_app_id"
-#define VC_MANAGER_BUNDLE_RESULT               "vc_manager_bundle_result"
-#define VC_MANAGER_BUNDLE_DISP_TEXT    "vc_manager_bundle_disp_text"
-#define VC_MANAGER_BUNDLE_UTT_TEXT             "vc_manager_bundle_utt_text"
-#define VC_MANAGER_BUNDLE_CONTINUOUS   "vc_manager_bundle_continuous"
-#define VC_MANAGER_BUNDLE_REASON               "vc_manager_bundle_reason"
-#define VC_MANAGER_BUNDLE_DAEMON_PID   "vc_manager_bundle_daemon_pid"
-#define VC_MANAGER_BUNDLE_ERROR_MESSAGE "vc_manager_bundle_error_message"
-#define VC_MANAGER_BUNDLE_KEY                  "vc_manager_bundle_key"
-#define VC_MANAGER_BUNDLE_PRIVATE_DATA         "vc_manager_bundle_private_data"
-#define VC_MANAGER_BUNDLE_AUDIO_CHANNEL "vc_manager_bundle_audio_channel"
-#define VC_MANAGER_BUNDLE_AUDIO_TYPE   "vc_manager_bundle_audio_type"
-#define VC_MANAGER_BUNDLE_AUDIO_RATE   "vc_manager_bundle_audio_rate"
-#define VC_MANAGER_BUNDLE_UTTID                "vc_manager_bundle_uttid"
-#define VC_MANAGER_BUNDLE_BUFFER               "vc_manager_bundle_buffer"
-
 #define VCD_MANAGER_METHOD_HELLO               "vcd_manager_method_hello"
 #define VCD_MANAGER_METHOD_SPEECH_DETECTED     "vcd_manager_method_speech_detected"
 #define VCD_MANAGER_METHOD_ALL_RESULT          "vcd_manager_method_all_result"