From: Ji-hoon Lee <dalton.lee@samsung.com>
Date: Thu, 24 Oct 2019 12:33:18 +0000 (+0900)
Subject: Remove multi-assistant header inclusion
X-Git-Tag: submit/tizen/20191024.124241~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=54f7b4364bcdfc7d925fb4f261ce1b3345af847b;p=platform%2Fcore%2Fuifw%2Fmulti-assistant-service.git

Remove multi-assistant header inclusion

Change-Id: I13635bc2bbd080e6dc2706a057f807a2f29f51d7
---

diff --git a/inc/multi_wakeup_recognizer.h b/inc/multi_wakeup_recognizer.h
index c818e1a..6c3eb6f 100644
--- a/inc/multi_wakeup_recognizer.h
+++ b/inc/multi_wakeup_recognizer.h
@@ -19,7 +19,6 @@
 #define _MULTI_WAKEUP_RECOGNIZER_H_
 
 #include <dlog/dlog.h>
-#include <multi_assistant.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -61,6 +60,38 @@ typedef enum {
 	WAKEUP_ASR_RESULT_EVENT_ERROR 		/**< Event when the recognition has failed */
 } wakeup_asr_result_event_e;
 
+typedef enum {
+	MA_AUDIO_STREAMING_DATA_TYPE_CURRENT_UTTERANCE = 0,		/**< Current utterance */
+	MA_AUDIO_STREAMING_DATA_TYPE_PREVIOUS_UTTERANCE,			/**< Previous utterance */
+	MA_AUDIO_STREAMING_DATA_TYPE_FOLLOW_UP_SPEECH				/**< Follow-up speech */
+} ma_audio_streaming_data_type_e;
+
+typedef enum {
+	MA_ACTIVE_STATE_INACTIVE = 0,	/**< 'Inactive' state */
+	MA_ACTIVE_STATE_ACTIVE,	/**< 'Active' state */
+	MA_ACTIVE_STATE_PREPROCESSING,	/**< 'Preprocessing' state */
+} ma_active_state_e;
+
+typedef enum {
+	MA_RECOGNITION_RESULT_EVENT_SUCCESS = 0,		/**< Recognition succeeded */
+	MA_RECOGNITION_RESULT_EVENT_EMPTY_TEXT,			/**< No text result recognized */
+	MA_RECOGNITION_RESULT_EVENT_ERROR,				/**< Unknown error occurred */
+	MA_RECOGNITION_RESULT_EVENT_FALSE_TRIGGER		/**< Turned out to be a false trigger */
+} ma_recognition_result_event_e;
+
+typedef enum {
+	MA_PREPROCESSING_ALLOW_NONE = 0,	/**< No preprocessing allowed */
+	MA_PREPROCESSING_ALLOW_UTTERANCE,	/**< Preprocessing allowed for utterance audio only */
+	MA_PREPROCESSING_ALLOW_FOLLOW_UP,	/**< Preprocessing allowed for follow-up audio only */
+	MA_PREPROCESSING_ALLOW_ALL,			/**< Preprocessing allowed for all audio */
+} ma_preprocessing_allow_mode_e;
+
+typedef enum {
+	MA_AUDIO_STREAMING_DATA_SECTION_UTTERANCE = 0,	/**< Utterance section started */
+	MA_AUDIO_STREAMING_DATA_SECTION_WAKE_WORD,		/**< Wake word section started */
+} ma_audio_streaming_data_section_e;
+
+typedef void (*ma_audio_streaming_data_section_changed_cb)(ma_audio_streaming_data_section_e section, void* user_data);
 
 typedef void (*wakeup_service_wakeup_event_cb)(wakeup_event_info wakeup_info, const char* wakeup_word, void* user_data);
 
diff --git a/plugins/wakeup-manager/inc/wakeup_engine_manager.h b/plugins/wakeup-manager/inc/wakeup_engine_manager.h
index 49d8e22..c768f9b 100644
--- a/plugins/wakeup-manager/inc/wakeup_engine_manager.h
+++ b/plugins/wakeup-manager/inc/wakeup_engine_manager.h
@@ -19,8 +19,6 @@
 
 #include "wakeup_manager_wrapper.h"
 
-#include <multi_assistant.h>
-
 #include <atomic>
 #include <string>
 #include <thread>
diff --git a/plugins/wakeup-manager/inc/wakeup_manager.h b/plugins/wakeup-manager/inc/wakeup_manager.h
index d682387..e6f5251 100644
--- a/plugins/wakeup-manager/inc/wakeup_manager.h
+++ b/plugins/wakeup-manager/inc/wakeup_manager.h
@@ -24,8 +24,6 @@
 #include "wakeup_audio_manager.h"
 #include "wakeup_policy_default.h"
 
-#include "multi_assistant_common.h"
-
 #include <memory>
 #include <map>
 
diff --git a/plugins/wakeup-manager/inc/wakeup_manager_wrapper.h b/plugins/wakeup-manager/inc/wakeup_manager_wrapper.h
index c566d83..7f408dc 100644
--- a/plugins/wakeup-manager/inc/wakeup_manager_wrapper.h
+++ b/plugins/wakeup-manager/inc/wakeup_manager_wrapper.h
@@ -22,7 +22,6 @@
 #include <stdbool.h>
 #include <tizen.h>
 #include <tzplatform_config.h>
-#include <multi_assistant.h>
 
 #include "wakeup_interfaces.h"
 
@@ -44,6 +43,20 @@ typedef enum {
 	WAKEUP_MANAGER_STATE_VOICE_FEEDBACK = 4
 } wakeup_manager_state_e;
 
+typedef enum {
+	MA_PREPROCESSING_ALLOW_NONE = 0,	/**< No preprocessing allowed */
+	MA_PREPROCESSING_ALLOW_UTTERANCE,	/**< Preprocessing allowed for utterance audio only */
+	MA_PREPROCESSING_ALLOW_FOLLOW_UP,	/**< Preprocessing allowed for follow-up audio only */
+	MA_PREPROCESSING_ALLOW_ALL,			/**< Preprocessing allowed for all audio */
+} ma_preprocessing_allow_mode_e;
+
+typedef enum {
+	MA_AUDIO_STREAMING_DATA_SECTION_UTTERANCE = 0,	/**< Utterance section started */
+	MA_AUDIO_STREAMING_DATA_SECTION_WAKE_WORD,		/**< Wake word section started */
+} ma_audio_streaming_data_section_e;
+
+typedef void (*ma_audio_streaming_data_section_changed_cb)(ma_audio_streaming_data_section_e section, void* user_data);
+
 typedef void (*wakeup_service_wakeup_event_cb)(wakeup_event_info wakeup_info, void* user_data);
 
 typedef void (*wakeup_service_speech_streaming_cb)(wakeup_speech_streaming_event_e event, void* buffer, int len, void *user_data);
diff --git a/src/multi_assistant_service.c b/src/multi_assistant_service.c
index 5b2b220..0baf44e 100644
--- a/src/multi_assistant_service.c
+++ b/src/multi_assistant_service.c
@@ -33,7 +33,6 @@
 #include "multi_assistant_service_plugin.h"
 #include "multi_assistant_dbus.h"
 #include "multi_assistant_config.h"
-#include "multi_assistant_common.h"
 
 static const char *g_current_lang = "en_US";
 
diff --git a/src/multi_assistant_service_plugin.c b/src/multi_assistant_service_plugin.c
index 518e5e5..a04366f 100644
--- a/src/multi_assistant_service_plugin.c
+++ b/src/multi_assistant_service_plugin.c
@@ -32,7 +32,6 @@
 #include "multi_assistant_service.h"
 #include "multi_assistant_service_plugin.h"
 #include "multi_assistant_dbus.h"
-#include "multi_assistant_common.h"
 
 /* Sound buf save for test */
 #if 0