Rename inappropriate send_* functions to set_*

Change-Id: Ia5d18f98ddbe51377e5681f9be15457d6b80f8c6

diff --git a/inc/multi_assistant_service_client.h b/inc/multi_assistant_service_client.h
index 110d0d1..b6d7f42 100644 (file)
--- a/inc/multi_assistant_service_client.h
+++ b/inc/multi_assistant_service_client.h
@@ -49,7 +49,7 @@ int mas_client_stop_streaming_audio_data(int pid, int type);
 
 int mas_client_update_voice_feedback_state(int pid, int state);
 
-int mas_client_send_assistant_specific_command(int pid, const char *command);
+int mas_client_set_assistant_specific_command(int pid, const char *command);
 
 int mas_client_set_background_volume(int pid, double ratio);
 

diff --git a/inc/multi_assistant_service_plugin.h b/inc/multi_assistant_service_plugin.h
index 1f31ac0..4f431e6 100644 (file)
--- a/inc/multi_assistant_service_plugin.h
+++ b/inc/multi_assistant_service_plugin.h
@@ -57,7 +57,7 @@ int multi_assistant_service_plugin_deactivate(void);
 
 int multi_assistant_service_plugin_update_voice_feedback_state(const char* appid, int state);
 
-int multi_assistant_service_plugin_send_assistant_specific_command(const char *appid, const char* command);
+int multi_assistant_service_plugin_set_assistant_specific_command(const char *appid, const char* command);
 
 int multi_assistant_service_plugin_set_background_volume(const char *appid, double ratio);
 
@@ -127,8 +127,8 @@ typedef int (*wakeup_manager_activate)(void);
 typedef int (*wakeup_manager_deactivate)(void);
 #define MA_WAKEUP_MANAGER_FUNC_UPDATE_VOICE_FEEDBACK_STATE "wakeup_manager_update_voice_feedback_state"
 typedef int (*wakeup_manager_update_voice_feedback_state)(const char* appid, int state);
-#define MA_WAKEUP_MANAGER_FUNC_SEND_ASSISTANT_SPECIFIC_COMMAND "wakeup_manager_send_assistant_specific_command"
-typedef int (*wakeup_manager_send_assistant_specific_command)(const char* appid, const char* command);
+#define MA_WAKEUP_MANAGER_FUNC_SET_ASSISTANT_SPECIFIC_COMMAND "wakeup_manager_set_assistant_specific_command"
+typedef int (*wakeup_manager_set_assistant_specific_command)(const char* appid, const char* command);
 #define MA_WAKEUP_MANAGER_FUNC_SET_BACKGROUND_VOLUME "wakeup_manager_set_background_volume"
 typedef int (*wakeup_manager_set_background_volume)(const char* appid, double ratio);
 #define MA_WAKEUP_MANAGER_FUNC_UPDATE_RECOGNITION_RESULT "wakeup_manager_update_recognition_result"
@@ -189,7 +189,7 @@ typedef struct {
        wakeup_manager_activate                                                                         activate;
        wakeup_manager_deactivate                                                                       deactivate;
        wakeup_manager_update_voice_feedback_state                                      update_voice_feedback_state;
-       wakeup_manager_send_assistant_specific_command                          send_assistant_specific_command;
+       wakeup_manager_set_assistant_specific_command                           set_assistant_specific_command;
        wakeup_manager_set_background_volume                                            set_background_volume;
        wakeup_manager_update_recognition_result                                        update_recognition_result;
        wakeup_manager_process_plugin_event                                                     process_plugin_event;

diff --git a/plugins/wakeup-manager/inc/wakeup_manager.h b/plugins/wakeup-manager/inc/wakeup_manager.h
index 25c5498..f734256 100644 (file)
--- a/plugins/wakeup-manager/inc/wakeup_manager.h
+++ b/plugins/wakeup-manager/inc/wakeup_manager.h
@@ -95,7 +95,7 @@ public:
        string get_default_assistant();
 
        bool update_voice_feedback_state(string appid, bool state);
-       bool send_assistant_specific_command(string appid, string command);
+       bool set_assistant_specific_command(string appid, string command);
        bool set_background_volume(string appid, double ratio);
        bool update_recognition_result(string appid, int result);
        bool process_plugin_event(mas_plugin_event_e event, void* data, int len);
@@ -129,7 +129,7 @@ public:
        wakeup_manager_state_e get_manager_state();
 
        void feed_audio_data(mas_speech_streaming_event_e event, void* buffer, int len);
-       void send_dependency_module_command(string engine_name, string command);
+       void set_dependency_module_command(string engine_name, string command);
 private:
        class CEngineEventObserver : public IEngineEventObserver
        {

diff --git a/plugins/wakeup-manager/inc/wakeup_manager_wrapper.h b/plugins/wakeup-manager/inc/wakeup_manager_wrapper.h
index 1477360..7857664 100644 (file)
--- a/plugins/wakeup-manager/inc/wakeup_manager_wrapper.h
+++ b/plugins/wakeup-manager/inc/wakeup_manager_wrapper.h
@@ -87,7 +87,7 @@ EXPORT_API int wakeup_manager_deactivate(void);
 
 EXPORT_API int wakeup_manager_update_voice_feedback_state(const char *appid, int state);
 
-EXPORT_API int wakeup_manager_send_assistant_specific_command(const char* appid, const char* command);
+EXPORT_API int wakeup_manager_set_assistant_specific_command(const char* appid, const char* command);
 
 EXPORT_API int wakeup_manager_set_background_volume(const char *appid, double ratio);
 
@@ -139,7 +139,7 @@ EXPORT_API int wakeup_manager_set_wakeup_service_state_changed_callback(wakeup_s
 
 int wakeup_manager_feed_audio_data(mas_speech_streaming_event_e event, void* buffer, int len);
 
-int wakeup_manager_send_dependency_module_command(const char* engine_name, const char* command);
+int wakeup_manager_set_dependency_module_command(const char* engine_name, const char* command);
 
 int wakeup_manager_wakeup_assistant(const mas_wakeup_event_info* wakeup_info);
 

diff --git a/plugins/wakeup-manager/src/wakeup_manager.cpp b/plugins/wakeup-manager/src/wakeup_manager.cpp
index 7372efb..528578b 100644 (file)
--- a/plugins/wakeup-manager/src/wakeup_manager.cpp
+++ b/plugins/wakeup-manager/src/wakeup_manager.cpp
@@ -409,7 +409,7 @@ bool CWakeupManager::update_voice_feedback_state(string appid, bool state)
        return true;
 }
 
-bool CWakeupManager::send_assistant_specific_command(string appid, string command)
+bool CWakeupManager::set_assistant_specific_command(string appid, string command)
 {
        MWR_LOGD("[ENTER]");
 
@@ -829,7 +829,7 @@ void CWakeupManager::feed_audio_data(mas_speech_streaming_event_e event, void* b
        mAudioManager.feed_audio_data(event, buffer, len);
 }
 
-void CWakeupManager::send_dependency_module_command(string engine_name, string command)
+void CWakeupManager::set_dependency_module_command(string engine_name, string command)
 {
        mWakeupEngineManager.engine_set_dependency_module_command(engine_name, command);
 }

diff --git a/plugins/wakeup-manager/src/wakeup_manager_wrapper.cpp b/plugins/wakeup-manager/src/wakeup_manager_wrapper.cpp
index 5dc12dc..5e0b31a 100644 (file)
--- a/plugins/wakeup-manager/src/wakeup_manager_wrapper.cpp
+++ b/plugins/wakeup-manager/src/wakeup_manager_wrapper.cpp
@@ -312,7 +312,7 @@ int wakeup_manager_update_voice_feedback_state(const char* appid, int state)
        return 0;
 }
 
-int wakeup_manager_send_assistant_specific_command(const char* appid, const char* command)
+int wakeup_manager_set_assistant_specific_command(const char* appid, const char* command)
 {
        MWR_LOGD("[ENTER]");
 
@@ -325,7 +325,7 @@ int wakeup_manager_send_assistant_specific_command(const char* appid, const char
        if (command) command_string = command;
 
        if (nullptr == g_wakeup_manager) return -1;
-       g_wakeup_manager->send_assistant_specific_command(appid_string, command_string);
+       g_wakeup_manager->set_assistant_specific_command(appid_string, command_string);
 
        MWR_LOGD("[END]");
        return 0;
@@ -674,10 +674,10 @@ int wakeup_manager_feed_audio_data(mas_speech_streaming_event_e event, void* buf
        return 0;
 }
 
-int wakeup_manager_send_dependency_module_command(const char* engine_name, const char* command)
+int wakeup_manager_set_dependency_module_command(const char* engine_name, const char* command)
 {
        if (nullptr == g_wakeup_manager) return -1;
-       g_wakeup_manager->send_dependency_module_command(
+       g_wakeup_manager->set_dependency_module_command(
                engine_name ? engine_name : "",
                command ? command : "");
        return 0;

diff --git a/src/multi_assistant_dbus_server.c b/src/multi_assistant_dbus_server.c
index 7fcde20..c229817 100644 (file)
--- a/src/multi_assistant_dbus_server.c
+++ b/src/multi_assistant_dbus_server.c
@@ -522,7 +522,7 @@ int ma_service_dbus_send_assistant_specific_command(DBusConnection* conn, DBusMe
                ret = -1; //MAS_ERROR_OPERATION_FAILED;
        } else {
                MAS_LOGD("[IN] mas send assistant specific command : pid(%d), command(%s)", pid, command);
-               ret =  mas_client_send_assistant_specific_command(pid, command);
+               ret =  mas_client_set_assistant_specific_command(pid, command);
        }
 
        MAS_LOGD("<<<<<");

diff --git a/src/multi_assistant_service.c b/src/multi_assistant_service.c
index 7faabf5..2e955bb 100644 (file)
--- a/src/multi_assistant_service.c
+++ b/src/multi_assistant_service.c
@@ -440,7 +440,7 @@ int mas_client_update_voice_feedback_state(int pid, int state)
        return 0;
 }
 
-int mas_client_send_assistant_specific_command(int pid, const char *command)
+int mas_client_set_assistant_specific_command(int pid, const char *command)
 {
        const char* pid_appid = NULL;
        char buf[MAX_APPID_LEN] = {'\0',};
@@ -448,7 +448,7 @@ int mas_client_send_assistant_specific_command(int pid, const char *command)
                buf[MAX_APPID_LEN - 1] = '\0';
                pid_appid = buf;
        }
-       multi_assistant_service_plugin_send_assistant_specific_command(pid_appid, command);
+       multi_assistant_service_plugin_set_assistant_specific_command(pid_appid, command);
        return 0;
 }
 

diff --git a/src/multi_assistant_service_plugin.c b/src/multi_assistant_service_plugin.c
index d9a1e6e..6eed1f5 100644 (file)
--- a/src/multi_assistant_service_plugin.c
+++ b/src/multi_assistant_service_plugin.c
@@ -426,9 +426,9 @@ int multi_assistant_service_plugin_initialize(void)
        _wakeup_manager_interface.update_voice_feedback_state =
                (wakeup_manager_update_voice_feedback_state)dlsym(g_handle,
                MA_WAKEUP_MANAGER_FUNC_UPDATE_VOICE_FEEDBACK_STATE);
-       _wakeup_manager_interface.send_assistant_specific_command =
-               (wakeup_manager_send_assistant_specific_command)dlsym(g_handle,
-               MA_WAKEUP_MANAGER_FUNC_SEND_ASSISTANT_SPECIFIC_COMMAND);
+       _wakeup_manager_interface.set_assistant_specific_command =
+               (wakeup_manager_set_assistant_specific_command)dlsym(g_handle,
+               MA_WAKEUP_MANAGER_FUNC_SET_ASSISTANT_SPECIFIC_COMMAND);
        _wakeup_manager_interface.set_background_volume =
                (wakeup_manager_set_background_volume)dlsym(g_handle,
                MA_WAKEUP_MANAGER_FUNC_SET_BACKGROUND_VOLUME);
@@ -756,13 +756,13 @@ int multi_assistant_service_plugin_update_voice_feedback_state(const char* appid
        return ret;
 }
 
-int multi_assistant_service_plugin_send_assistant_specific_command(const char* appid, const char* command)
+int multi_assistant_service_plugin_set_assistant_specific_command(const char* appid, const char* command)
 {
        int ret = -1;
        if (NULL != g_handle) {
-               wakeup_manager_send_assistant_specific_command func = _wakeup_manager_interface.send_assistant_specific_command;
+               wakeup_manager_set_assistant_specific_command func = _wakeup_manager_interface.set_assistant_specific_command;
                if (NULL == func) {
-                       MAS_LOGE("[ERROR] symbol lookup failed : %s", MA_WAKEUP_MANAGER_FUNC_SEND_ASSISTANT_SPECIFIC_COMMAND);
+                       MAS_LOGE("[ERROR] symbol lookup failed : %s", MA_WAKEUP_MANAGER_FUNC_SET_ASSISTANT_SPECIFIC_COMMAND);
                } else {
                        ret = func(appid, command);
                        if (0 != ret) {