Fix interface name

- Issue:
In a new architecture for voice touch, the concept of intent is not
used.

- Solution:
This patch changes the term of intent to result and modality. This is
because the concept of intent is not used in a new architecture for
voice touch feature.

Change-Id: Id2229d1c19bdc940ee2501d6b669cce20601d8f7
Signed-off-by: Suyeon Hwang <stom.hwang@samsung.com>

diff --git a/src/mmimgr/iu/mmi_iu.cpp b/src/mmimgr/iu/mmi_iu.cpp
index 4d438ca..769fe07 100644 (file)
--- a/src/mmimgr/iu/mmi_iu.cpp
+++ b/src/mmimgr/iu/mmi_iu.cpp
@@ -36,11 +36,11 @@
 using namespace std;
 
 static mmi_state g_app_state = MMI_STATE_INITIATION;
-static mmi_iu_output_intent_received_cb iu_output_intent_received_callback = NULL;
-static void *iu_output_intent_user_data = NULL;
+static mmi_iu_output_result_received_cb iu_output_result_received_callback = nullptr;
+static void *iu_output_result_user_data = nullptr;
 
-static mmi_iu_output_event_received_cb iu_output_event_received_callback = NULL;
-static void *iu_output_event_user_data = NULL;
+static mmi_iu_output_modality_received_cb iu_output_modality_received_callback = nullptr;
+static void *iu_output_modality_user_data = nullptr;
 
 static bool initialized = false;
 
@@ -57,9 +57,11 @@ static void init()
 
     g_app_state = MMI_STATE_INITIATION;
 
-    iu_output_intent_received_callback = NULL;
+    iu_output_result_received_callback = nullptr;
+    iu_output_result_user_data = nullptr;
 
-    iu_output_intent_user_data = NULL;
+    iu_output_modality_received_callback = nullptr;
+    iu_output_modality_user_data = nullptr;
 
     g_system_app_id = "";
     g_focus_app_id = "";
@@ -109,26 +111,26 @@ EXPORT_API int mmi_iu_set_rule_filepath(const char *filepath)
     return MMI_IU_ERROR_NONE;
 }
 
-static void fire_output_intent_callback(const char *app_id, const char *output_intent)
+static void fire_output_result_callback(const char *app_id, const char *output_intent)
 {
-    if (iu_output_intent_received_callback)
-        iu_output_intent_received_callback(app_id, output_intent, iu_output_intent_user_data);
+    if (iu_output_result_received_callback)
+        iu_output_result_received_callback(app_id, output_intent, iu_output_result_user_data);
     else
         _D("No output intent receive callback\n");
 }
 
-static void fire_output_intent(const char *app_id, const char *json_output_intent)
+static void fire_output_result(const char *app_id, const char *json_output_intent)
 {
     if (g_system_app_id == string(app_id)) {
-        fire_output_intent_callback(app_id, json_output_intent);
+        fire_output_result_callback(app_id, json_output_intent);
     }
     else {
         if (g_focus_app_id.empty()) {
-            fire_output_intent_callback(app_id, json_output_intent);
+            fire_output_result_callback(app_id, json_output_intent);
         }
         else {
             if (g_focus_app_id == string(app_id)) {
-                fire_output_intent_callback(app_id, json_output_intent);
+                fire_output_result_callback(app_id, json_output_intent);
             }
             else {
                 _I("different focus app\n");
@@ -166,12 +168,12 @@ EXPORT_API int mmi_iu_feed_intent(const char *app_id, const char *json_data)
     if (json_output_intent.empty())
         return MMI_IU_ERROR_OPERATION_FAILED;
 
-    fire_output_intent(app_id, json_output_intent.c_str());
+    fire_output_result(app_id, json_output_intent.c_str());
 
     return MMI_IU_ERROR_NONE;
 }
 
-EXPORT_API int mmi_iu_feed_input_event(const char *app_id, int type, void *event)
+EXPORT_API int mmi_iu_feed_input_modality(const char *app_id, int type, void *event)
 {
     if (!app_id || !event) {
         _W("[ERROR] Invalid parameter");
@@ -185,8 +187,8 @@ EXPORT_API int mmi_iu_feed_input_event(const char *app_id, int type, void *event
 
     if (iu_engine) {
         if (!iu_engine->set_input_event(type, event)) {
-            if (iu_output_event_received_callback) {
-                iu_output_event_received_callback(app_id, type, event, iu_output_event_user_data);
+            if (iu_output_modality_received_callback) {
+                iu_output_modality_received_callback(app_id, type, event, iu_output_modality_user_data);
                 return MMI_IU_ERROR_NONE;
             }
         }
@@ -199,8 +201,8 @@ EXPORT_API int mmi_iu_feed_input_event(const char *app_id, int type, void *event
         iu_engine->set_app_state(g_app_state);
 
         if (iu_engine->get_output_intent_action().empty()) {
-            if (iu_output_event_received_callback) {
-                iu_output_event_received_callback(app_id, type, event, iu_output_event_user_data);
+            if (iu_output_modality_received_callback) {
+                iu_output_modality_received_callback(app_id, type, event, iu_output_modality_user_data);
                 return MMI_IU_ERROR_NONE;
             }
         }
@@ -212,7 +214,7 @@ EXPORT_API int mmi_iu_feed_input_event(const char *app_id, int type, void *event
     if (json_output_intent.empty())
         return MMI_IU_ERROR_OPERATION_FAILED;
 
-    fire_output_intent(app_id, json_output_intent.c_str());
+    fire_output_result(app_id, json_output_intent.c_str());
 
     if (iu_engine)
         iu_engine->init_input_buffer();
@@ -220,7 +222,7 @@ EXPORT_API int mmi_iu_feed_input_event(const char *app_id, int type, void *event
     return MMI_IU_ERROR_NONE;
 }
 
-EXPORT_API int mmi_iu_set_output_intent_received_callback(mmi_iu_output_intent_received_cb callback, void *user_data)
+EXPORT_API int mmi_iu_set_output_result_received_callback(mmi_iu_output_result_received_cb callback, void *user_data)
 {
     if (!callback) {
         _W("[ERROR] Invalid parameter");
@@ -232,13 +234,13 @@ EXPORT_API int mmi_iu_set_output_intent_received_callback(mmi_iu_output_intent_r
         return MMI_IU_ERROR_NOT_INITIALIZED;
     }
 
-    iu_output_intent_received_callback = callback;
-    iu_output_intent_user_data = user_data;
+    iu_output_result_received_callback = callback;
+    iu_output_result_user_data = user_data;
 
     return MMI_IU_ERROR_NONE;
 }
 
-EXPORT_API int mmi_iu_set_output_event_received_callback(mmi_iu_output_event_received_cb callback, void *user_data)
+EXPORT_API int mmi_iu_set_output_modality_received_callback(mmi_iu_output_modality_received_cb callback, void *user_data)
 {
     if (!callback) {
         _W("[ERROR] Invalid parameter");
@@ -250,34 +252,34 @@ EXPORT_API int mmi_iu_set_output_event_received_callback(mmi_iu_output_event_rec
         return MMI_IU_ERROR_NOT_INITIALIZED;
     }
 
-    iu_output_event_received_callback = callback;
-    iu_output_event_user_data = user_data;
+    iu_output_modality_received_callback = callback;
+    iu_output_modality_user_data = user_data;
 
     return MMI_IU_ERROR_NONE;
 }
 
-EXPORT_API int mmi_iu_unset_output_intent_received_callback()
+EXPORT_API int mmi_iu_unset_output_result_received_callback()
 {
     if (!initialized) {
         _W("[ERROR] Not initialized");
         return MMI_IU_ERROR_NOT_INITIALIZED;
     }
 
-    iu_output_intent_received_callback = NULL;
-    iu_output_intent_user_data = NULL;
+    iu_output_result_received_callback = NULL;
+    iu_output_result_user_data = NULL;
 
     return MMI_IU_ERROR_NONE;
 }
 
-EXPORT_API int mmi_iu_unset_output_event_received_callback()
+EXPORT_API int mmi_iu_unset_output_modality_received_callback()
 {
     if (!initialized) {
         _W("[ERROR] Not initialized");
         return MMI_IU_ERROR_NOT_INITIALIZED;
     }
 
-    iu_output_event_received_callback = NULL;
-    iu_output_event_user_data = NULL;
+    iu_output_modality_received_callback = NULL;
+    iu_output_modality_user_data = NULL;
 
     return MMI_IU_ERROR_NONE;
 }

diff --git a/src/mmimgr/iu/mmi_iu.h b/src/mmimgr/iu/mmi_iu.h
index ba0cf6b..316f8c1 100644 (file)
--- a/src/mmimgr/iu/mmi_iu.h
+++ b/src/mmimgr/iu/mmi_iu.h
@@ -47,9 +47,9 @@ extern "C" {
  * @param[in] json_data The output intent data with json format
  * @param[in] user_data The user data passed from the callback function
  */
-typedef void (*mmi_iu_output_intent_received_cb)(const char *target_app_id, const char *json_data, void *user_data);
+typedef void (*mmi_iu_output_result_received_cb)(const char *target_app_id, const char *json_data, void *user_data);
 
-typedef void (*mmi_iu_output_event_received_cb)(const char *target_app_id, int type, void *event, void *user_data);
+typedef void (*mmi_iu_output_modality_received_cb)(const char *target_app_id, int type, void *event, void *user_data);
 
 /**
  * @brief Initialize Intent Understanding library
@@ -75,35 +75,35 @@ int mmi_iu_set_rule_filepath(const char *filepath);
 
 /**
  * @brief Feed input intent
- * @remark The result can be received by the callback registered by mmi_iu_set_output_intent_received_callback().
+ * @remark The result can be received by the callback registered by mmi_iu_set_output_result_received_callback().
  * @param[in] app_id The app ID that input event occurred
  */
 int mmi_iu_feed_intent(const char *app_id, const char *json_data);
 
 /**
  * @brief Feed raw input event
- * @remark The result can be received by the callback registered by mmi_iu_set_output_intent_received_callback().
+ * @remark The result can be received by the callback registered by mmi_iu_set_output_result_received_callback().
  * @param[in] app_id The app ID that input event occurred
  * @param[in] type The input event type (key, voice, gesture, ..)
  * @param[in] event The event information
  */
-int mmi_iu_feed_input_event(const char *app_id, int type, void *event);
+int mmi_iu_feed_input_modality(const char *app_id, int type, void *event);
 
 /**
  * @brief Register the callback function to receive output intent
  * @param callback The (callback) function to be called when output intent is generated.
  * @param data The data pointer to be passed to @p callback
  */
-int mmi_iu_set_output_intent_received_callback(mmi_iu_output_intent_received_cb callback, void *user_data);
+int mmi_iu_set_output_result_received_callback(mmi_iu_output_result_received_cb callback, void *user_data);
 
-int mmi_iu_set_output_event_received_callback(mmi_iu_output_event_received_cb callback, void *user_data);
+int mmi_iu_set_output_modality_received_callback(mmi_iu_output_modality_received_cb callback, void *user_data);
 
 /**
  * @brief Unregister the callback function to receive output intent
  */
-int mmi_iu_unset_output_intent_received_callback();
+int mmi_iu_unset_output_result_received_callback();
 
-int mmi_iu_unset_output_event_received_callback();
+int mmi_iu_unset_output_modality_received_callback();
 
 /**
  * @brief Set app state

diff --git a/src/mmimgr/mmi-core.c b/src/mmimgr/mmi-core.c
index 7a72e58..69ca00c 100644 (file)
--- a/src/mmimgr/mmi-core.c
+++ b/src/mmimgr/mmi-core.c
@@ -115,7 +115,7 @@ static Eina_Bool __key_event_cb(void *data EINA_UNUSED, int type, void *event)
        _I("[key event] code : %d, name : %s, type : %d, timestamp : %d, source: %s", ev->keycode, ev->keyname, ev->type, ev->timestamp, ev->source);
 
        if (ev->key_down) {
-               mmi_iu_feed_input_event(APP_ID, MMI_PROVIDER_EVENT_KEY, ev);
+               mmi_iu_feed_input_modality(APP_ID, MMI_PROVIDER_EVENT_KEY, ev);
        }
 
        return ECORE_CALLBACK_PASS_ON;
@@ -126,7 +126,7 @@ static Eina_Bool __gesture_event_cb(void *data EINA_UNUSED, int type, void *even
        mmi_provider_event_gesture *ev = (mmi_provider_event_gesture *)event;
        _I("[gesture event] type : %d, timestamp : %d", ev->type, ev->timestamp);
 
-       mmi_iu_feed_input_event(APP_ID, MMI_PROVIDER_EVENT_GESTURE, ev);
+       mmi_iu_feed_input_modality(APP_ID, MMI_PROVIDER_EVENT_GESTURE, ev);
 
        return ECORE_CALLBACK_PASS_ON;
 }
@@ -136,7 +136,7 @@ static Eina_Bool __voice_event_cb(void *data EINA_UNUSED, int type, void *event)
        mmi_provider_event_voice *ev = (mmi_provider_event_voice *)event;
        _I("[voice event] type : %d, timestamp : %d", ev->type, ev->timestamp);
 
-       mmi_iu_feed_input_event(APP_ID, MMI_PROVIDER_EVENT_VOICE, ev);
+       mmi_iu_feed_input_modality(APP_ID, MMI_PROVIDER_EVENT_VOICE, ev);
 
        return ECORE_CALLBACK_PASS_ON;
 }
@@ -145,7 +145,7 @@ static Eina_Bool __vision_event_cb(void *data EINA_UNUSED, int type, void *event
 {
        mmi_provider_event_vision *ev = (mmi_provider_event_vision *)event;
 
-       mmi_iu_feed_input_event(APP_ID, MMI_PROVIDER_EVENT_VISION, ev);
+       mmi_iu_feed_input_modality(APP_ID, MMI_PROVIDER_EVENT_VISION, ev);
 
        return ECORE_CALLBACK_PASS_ON;
 }
@@ -155,7 +155,7 @@ static Eina_Bool __screen_analyzer_event_cb(void *data EINA_UNUSED, int type, vo
        mmi_provider_event_screen_analyzer *ev = (mmi_provider_event_screen_analyzer *)event;
        _I("[Screen analyzer] Number of items : %d, type : %d, timestamp : %d", ev->n_items, ev->type, ev->timestamp);
 
-       mmi_iu_feed_input_event(APP_ID, MMI_PROVIDER_EVENT_SCREEN_ANALYZER, ev);
+       mmi_iu_feed_input_modality(APP_ID, MMI_PROVIDER_EVENT_SCREEN_ANALYZER, ev);
 
        return ECORE_CALLBACK_PASS_ON;
 }
@@ -206,13 +206,13 @@ int mmi_core_init()
 
        __init_event_handler();
 
-       ret = mmi_iu_set_output_intent_received_callback(__output_result_received_cb, NULL);
+       ret = mmi_iu_set_output_result_received_callback(__output_result_received_cb, NULL);
        if (ret != MMI_IU_ERROR_NONE) {
                _E("Error code : %d", ret);
                return ret;
        }
 
-       ret = mmi_iu_set_output_event_received_callback(__output_modality_received_cb, NULL);
+       ret = mmi_iu_set_output_modality_received_callback(__output_modality_received_cb, NULL);
        if (ret != MMI_IU_ERROR_NONE) {
                _E("Error code : %d", ret);
                return ret;

diff --git a/tests/iu/mmi_iu_feed_input_event_unittests.cpp b/tests/iu/mmi_iu_feed_input_event_unittests.cpp
index b083120..0a33547 100644 (file)
--- a/tests/iu/mmi_iu_feed_input_event_unittests.cpp
+++ b/tests/iu/mmi_iu_feed_input_event_unittests.cpp
@@ -109,10 +109,10 @@ class IUClientFeedInputEventTest : public testing::Test {
 
             output_action = string("");
 
-            ret = mmi_iu_set_output_intent_received_callback(output_intent_received_cb, NULL);
+            ret = mmi_iu_set_output_result_received_callback(output_intent_received_cb, NULL);
             EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
 
-            ret = mmi_iu_set_output_event_received_callback(output_event_received_cb, NULL);
+            ret = mmi_iu_set_output_modality_received_callback(output_event_received_cb, NULL);
             EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
         }
 
@@ -139,7 +139,7 @@ int feed_input_event_test(mmi_state app_state, int type, void *event)
     ret = mmi_iu_set_focus_app_id(TEST_APP_ID);
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
 
-    ret = mmi_iu_feed_input_event(TEST_APP_ID, type, event);
+    ret = mmi_iu_feed_input_modality(TEST_APP_ID, type, event);
     return ret;
 }
 
@@ -445,7 +445,7 @@ TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_input_event_voice_terminate)
 
 TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_input_event_gesture_push_different_focus)
 {
-    int ret = mmi_iu_set_output_intent_received_callback(output_intent_received_cb, NULL);
+    int ret = mmi_iu_set_output_result_received_callback(output_intent_received_cb, NULL);
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
 
     ret = mmi_iu_set_app_state(MMI_STATE_TERMINATION);
@@ -457,7 +457,7 @@ TEST_F(IUClientFeedInputEventTest, utc_mmi_iu_feed_input_event_gesture_push_diff
     mmi_provider_event_gesture ge = { 0, };
     ge.type = MMI_EVENT_GESTURE_TYPE_PUSH;
 
-    ret = mmi_iu_feed_input_event(TEST_APP_ID, MMI_PROVIDER_EVENT_GESTURE, &ge);
+    ret = mmi_iu_feed_input_modality(TEST_APP_ID, MMI_PROVIDER_EVENT_GESTURE, &ge);
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
 
     EXPECT_STREQ(output_action.c_str(), "");

diff --git a/tests/iu/mmi_iu_noinit_unittests.cpp b/tests/iu/mmi_iu_noinit_unittests.cpp
index 95be8b9..e9983df 100644 (file)
--- a/tests/iu/mmi_iu_noinit_unittests.cpp
+++ b/tests/iu/mmi_iu_noinit_unittests.cpp
@@ -83,13 +83,13 @@ TEST_F(IUClientNoInitTest, utc_mmi_iu_feed_input_event_no_init)
     key_event.type = MMI_PROVIDER_EVENT_KEY;
     key_event.keycode = MMI_EVENT_KEYEVENT_MIC;
 
-    int ret = mmi_iu_feed_input_event(TEST_APP_ID, MMI_PROVIDER_EVENT_KEY, &key_event);
+    int ret = mmi_iu_feed_input_modality(TEST_APP_ID, MMI_PROVIDER_EVENT_KEY, &key_event);
     EXPECT_EQ(ret, MMI_IU_ERROR_NOT_INITIALIZED);
 }
 
 TEST_F(IUClientNoInitTest, utc_mmi_iu_set_output_intent_received_callback_no_init)
 {
-    int ret = mmi_iu_set_output_intent_received_callback(output_intent_received_cb, NULL);
+    int ret = mmi_iu_set_output_result_received_callback(output_intent_received_cb, NULL);
     EXPECT_EQ(ret, MMI_IU_ERROR_NOT_INITIALIZED);
 }
 
@@ -113,7 +113,7 @@ TEST_F(IUClientNoInitTest, utc_mmi_iu_set_system_app_id_no_init)
 
 TEST_F(IUClientNoInitTest, utc_mmi_iu_unset_output_intent_received_callback_no_init)
 {
-    int ret = mmi_iu_unset_output_intent_received_callback();
+    int ret = mmi_iu_unset_output_result_received_callback();
     EXPECT_EQ(ret, MMI_IU_ERROR_NOT_INITIALIZED);
 }
 

diff --git a/tests/iu/mmi_iu_unittests.cpp b/tests/iu/mmi_iu_unittests.cpp
index 20705e2..343d93e 100644 (file)
--- a/tests/iu/mmi_iu_unittests.cpp
+++ b/tests/iu/mmi_iu_unittests.cpp
@@ -99,13 +99,13 @@ TEST_F(IUClientTest, utc_mmi_iu_feed_intent_n)
 
 TEST_F(IUClientTest, utc_mmi_iu_set_output_intent_received_callback_n_callback_null)
 {
-    int ret = mmi_iu_set_output_intent_received_callback(NULL, NULL);
+    int ret = mmi_iu_set_output_result_received_callback(NULL, NULL);
     EXPECT_EQ(ret, MMI_IU_ERROR_INVALID_PARAMETER);
 }
 
 TEST_F(IUClientTest, utc_mmi_iu_set_output_intent_received_callback_p)
 {
-    int ret = mmi_iu_set_output_intent_received_callback(output_intent_received_cb, NULL);
+    int ret = mmi_iu_set_output_result_received_callback(output_intent_received_cb, NULL);
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
 }
 
@@ -141,7 +141,7 @@ TEST_F(IUClientTest, utc_mmi_iu_set_system_app_id_n)
 
 TEST_F(IUClientTest, utc_mmi_iu_unset_output_intent_received_callback_p)
 {
-    int ret = mmi_iu_unset_output_intent_received_callback();
+    int ret = mmi_iu_unset_output_result_received_callback();
     EXPECT_EQ(ret, MMI_IU_ERROR_NONE);
 }