Merge changes I94bee8d4,I9dc8f8fb,Id361946a,I1b8aef64 into tizen

* changes:
  Remove unnecessary mas_ prefix in CServiceMain
  Replace int with pid_t for representing a process ID
  Send audio data to the dedicated audio processing app if exists
  Add override keyword for inherited virtual functions

diff --cc inc/service_main.h
index 94ee073,64803ad..741ee7e
--- 1/inc/service_main.h
--- 2/inc/service_main.h
+++ b/inc/service_main.h
@@@ -171,12 -172,14 +172,14 @@@ private
                char wakeup_language[MAX_WAKEUP_WORDS_NUM][MAX_SUPPORTED_LANGUAGE_LEN];
                char wakeup_engine[MAX_APPID_LEN];
                char supported_language[MAX_SUPPORTED_LANGUAGES_NUM][MAX_SUPPORTED_LANGUAGE_LEN];
 -              bool custom_ui_option;
 -              VOICE_KEY_SUPPORT_MODE voice_key_support_mode;
 -              float voice_key_tap_duration;
 +              bool custom_ui_option{false};
 +              VOICE_KEY_SUPPORT_MODE voice_key_support_mode{VOICE_KEY_SUPPORT_MODE_PUSH_TO_TALK};
 +              float voice_key_tap_duration{0.0f};
  
 -              ma_preprocessing_allow_mode_e preprocessing_allow_mode;
 +              ma_preprocessing_allow_mode_e preprocessing_allow_mode{MA_PREPROCESSING_ALLOW_NONE};
                char preprocessing_allow_appid[MAX_APPID_LEN];
+ 
+               boost::optional<std::string> audio_processing_appid;
        } ma_client_info;
  
        ma_client_info mClientInfo[MAX_MACLIENT_INFO_NUM];

diff --cc src/service_ipc_dbus_dispatcher.cpp
index 183140b,2e9a044..674c9e1
--- 1/src/service_ipc_dbus_dispatcher.cpp
--- 2/src/service_ipc_dbus_dispatcher.cpp
+++ b/src/service_ipc_dbus_dispatcher.cpp
@@@ -54,14 -54,12 +54,14 @@@ int CServiceIpcDbusDispatcher::on_initi
        DBusError err;
        dbus_error_init(&err);
  
-       int pid = -1;
+       pid_t pid = -1;
        int ret = 0;
  
 -      dbus_message_get_args(msg, &err,
 +      if (FALSE == dbus_message_get_args(msg, &err,
                DBUS_TYPE_INT32, &pid,
 -              DBUS_TYPE_INVALID);
 +              DBUS_TYPE_INVALID)) {
 +              MAS_LOGE("[ERROR] Failed retrieving arguments");
 +      }
  
        MAS_LOGD("[DEBUG] MAS INITIALIZE");
  
@@@ -112,14 -110,12 +112,14 @@@ int CServiceIpcDbusDispatcher::on_deini
        DBusError err;
        dbus_error_init(&err);
  
-       int pid = -1;
+       pid_t pid = -1;
        int ret = 0;
  
 -      dbus_message_get_args(msg, &err,
 +      if (FALSE == dbus_message_get_args(msg, &err,
                DBUS_TYPE_INT32, &pid,
 -              DBUS_TYPE_INVALID);
 +              DBUS_TYPE_INVALID)) {
 +              MAS_LOGE("[ERROR] Failed retrieving arguments");
 +      }
  
        MAS_LOGD("[DEBUG] MAS DEINITIALIZE");
  
@@@ -903,14 -866,12 +903,14 @@@ int CServiceIpcDbusDispatcher::on_ui_in
        DBusError err;
        dbus_error_init(&err);
  
-       int pid = -1;
+       pid_t pid = -1;
        int ret = 0;
  
 -      dbus_message_get_args(msg, &err,
 +      if (FALSE == dbus_message_get_args(msg, &err,
                DBUS_TYPE_INT32, &pid,
 -              DBUS_TYPE_INVALID);
 +              DBUS_TYPE_INVALID)) {
 +              MAS_LOGE("[ERROR] Failed retrieving arguments");
 +      }
  
        MAS_LOGD("[DEBUG] MAS UI INITIALIZE");
  
@@@ -961,14 -922,12 +961,14 @@@ int CServiceIpcDbusDispatcher::on_ui_de
        DBusError err;
        dbus_error_init(&err);
  
-       int pid = -1;
+       pid_t pid = -1;
        int ret = 0;
  
 -      dbus_message_get_args(msg, &err,
 +      if (FALSE == dbus_message_get_args(msg, &err,
                DBUS_TYPE_INT32, &pid,
 -              DBUS_TYPE_INVALID);
 +              DBUS_TYPE_INVALID)) {
 +              MAS_LOGE("[ERROR] Failed retrieving arguments");
 +      }
  
        MAS_LOGD("[DEBUG] MAS UI DEINITIALIZE");
  

diff --cc src/service_plugin.cpp
Simple merge