From: Ji-hoon Lee <dalton.lee@samsung.com>
Date: Wed, 18 Sep 2019 05:11:39 +0000 (+0000)
Subject: Merge "Add MA_ACTIVE_STATE_PREPROCESSING active state" into tizen
X-Git-Tag: submit/tizen/20190920.111209~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bffc495e3dccaa0cea0bf1a4f0c45a86168738cc;p=platform%2Fcore%2Fuifw%2Fmulti-assistant.git

Merge "Add MA_ACTIVE_STATE_PREPROCESSING active state" into tizen
---

bffc495e3dccaa0cea0bf1a4f0c45a86168738cc
diff --cc include/multi_assistant_common.h
index c14b526,babeadd..7c496a8
--- a/include/multi_assistant_common.h
+++ b/include/multi_assistant_common.h
@@@ -137,20 -137,10 +137,21 @@@ typedef enum 
   */
  typedef enum {
  	MA_ACTIVE_STATE_INACTIVE = 0,	/**< 'Inactive' state */
- 	MA_ACTIVE_STATE_ACTIVE = 1,	/**< 'Active' state */
+ 	MA_ACTIVE_STATE_ACTIVE,	/**< 'Active' state */
+ 	MA_ACTIVE_STATE_PREPROCESSING,	/**< 'Preprocessing' state */
  } ma_active_state_e;
  
 +/**
 + * @brief Enumerations for allowing preprocessing by other voice assistants.
 + * @since_tizen 5.5
 + */
 +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;
 +
  /**
   * @brief Called when the client state is changed.
   * @since_tizen 5.0