From 4dd307b6acf81efe0abaefdc7041066e6fca391e Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Wed, 4 Dec 2019 16:19:31 +0900 Subject: [PATCH] Add send_command and wakeup_assistant proxy functions Change-Id: If5019e90c3db6595b5f655f8bd9297c871192035 --- include/multi_assistant_service.h | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/include/multi_assistant_service.h b/include/multi_assistant_service.h index 6e22ce8..7e39314 100644 --- a/include/multi_assistant_service.h +++ b/include/multi_assistant_service.h @@ -59,18 +59,6 @@ typedef enum { MAS_WAKEUP_ENGINE_COMMAND_TARGET_DEPENDENCY_MODULE, /**< Dependency module - name not required */ } mas_wakeup_engine_command_target_e; -typedef void (*mas_error_cb)(int error, const char* err_msg, void* user_data); - -typedef int (*mas_dependency_plugin_proxy_process_event)(mas_plugin_event_e event, void* data, int len); -typedef int (*mas_dependency_plugin_proxy_feed_audio_data)(mas_speech_streaming_event_e event, void* buffer, int len); -typedef int (*mas_dependency_plugin_proxy_send_command)(const char* engine_name, const char* command); - -typedef struct { - mas_dependency_plugin_proxy_process_event process_event; - mas_dependency_plugin_proxy_feed_audio_data feed_audio_data; - /* mas_dependency_plugin_proxy_send_command send_command; */ /* Will be added */ -} mas_dependency_plugin_proxy_interface; - typedef struct { const char *wakeup_appid; const char *wakeup_word; @@ -94,6 +82,20 @@ typedef struct { int len; } mas_speech_data; +typedef void (*mas_error_cb)(int error, const char* err_msg, void* user_data); + +typedef int (*mas_dependency_plugin_proxy_process_event)(mas_plugin_event_e event, void* data, int len); +typedef int (*mas_dependency_plugin_proxy_feed_audio_data)(mas_speech_streaming_event_e event, void* buffer, int len); +typedef int (*mas_dependency_plugin_proxy_send_command)(const char* engine_name, const char* command); +typedef int (*mas_dependency_plugin_proxy_wakeup_assistant)(const mas_wakeup_event_info* info); + +typedef struct { + mas_dependency_plugin_proxy_process_event process_event; + mas_dependency_plugin_proxy_feed_audio_data feed_audio_data; + mas_dependency_plugin_proxy_send_command send_command; + mas_dependency_plugin_proxy_wakeup_assistant wakeup_assistant; +} mas_dependency_plugin_proxy_interface; + #ifdef __cplusplus } #endif -- 2.34.1