Merge changes I94bee8d4,I9dc8f8fb,Id361946a,I1b8aef64 into tizen

[platform/core/uifw/multi-assistant-service.git] / inc / service_ipc_dbus.h

diff --git a/inc/service_ipc_dbus.h b/inc/service_ipc_dbus.h
index 7242f12..abe1990 100644 (file)
--- a/inc/service_ipc_dbus.h
+++ b/inc/service_ipc_dbus.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 Samsung Electronics Co., Ltd
+ * Copyright 2020 Samsung Electronics Co., Ltd
  *
  * Licensed under the Flora License, Version 1.1 (the License);
  * you may not use this file except in compliance with the License.
@@ -35,30 +35,35 @@ public:
 
        int open_connection();
        int close_connection();
-       int send_hello(int pid);
+       int send_hello(pid_t pid);
        int send_error_message(int reason, const char* err_msg);
-       int send_streaming_audio_data(int pid, int event, void* data, unsigned int data_size);
-       int active_state_change(int pid, int state);
-       int send_preprocessing_information(int pid, const char* app_id);
-       int send_streaming_section_changed(int pid, int section);
-       int send_preprocessing_result(int pid, bool result);
-       int send_wakeup_engine_command(int pid, const char* command);
-       int service_state_change(int pid, int state);
-       int voice_key_status_change(int pid, int status);
+       int send_streaming_audio_data(pid_t pid, int event, void* data, unsigned int data_size);
+       int change_active_state(pid_t pid, int state);
+       int send_preprocessing_information(pid_t pid, const char* app_id);
+       int send_streaming_section_changed(pid_t pid, int section);
+       int send_preprocessing_result(pid_t pid, bool result);
+       int send_wakeup_engine_command(pid_t pid, const char* command);
+       int change_service_state(pid_t pid, int state);
+       int change_voice_key_status(pid_t pid, int status);
        int masc_ui_dbus_send_hello(void);
-       int masc_ui_dbus_send_asr_result(int pid, int event, char* asr_result);
-       int masc_ui_dbus_send_result(int pid, const char* display_text, const char* utterance_text, const char* result_json);
+       int masc_ui_dbus_send_asr_result(pid_t pid, int event, const char* asr_result);
+       int masc_ui_dbus_send_result(pid_t pid, const char* display_text, const char* utterance_text, const char* result_json);
        int masc_ui_dbus_change_assistant(const char* app_id);
        int masc_ui_dbus_send_error_message(int reason, const char* err_msg);
-       int masc_ui_dbus_send_recognition_result(int pid, int result);
+       int masc_ui_dbus_send_recognition_result(pid_t pid, int result);
        int masc_ui_dbus_enable_common_ui(int enable);
 
-       DBusConnection* get_connection_listener() { return g_conn_listener; }
+       DBusConnection* get_connection_listener() { return mConnectionListener; }
        CServiceIpcDbusDispatcher* get_dispatcher() { return &mDispatcher; }
 
-       void set_service_main(CServiceMain* main) {
-               mServiceMain = main;
-               mDispatcher.set_service_main(main);
+       void set_client_manager(CClientManager* manager) {
+               mClientManager = manager;
+       }
+       void set_application_manager(IApplicationManager* manager) {
+               mApplicationManager = manager;
+       }
+       void set_service_ipc_observer(IServiceIpcObserver* observer) {
+               mDispatcher.set_ipc_observer(observer);
        }
 private:
        int __dbus_check();
@@ -69,14 +74,15 @@ private:
 private:
        CServiceIpcDbusDispatcher mDispatcher;
 
-       DBusConnection* g_conn_sender{NULL};
-       DBusConnection* g_conn_listener{NULL};
+       DBusConnection* mConnectionSender{NULL};
+       DBusConnection* mConnectionListener{NULL};
 
-       Ecore_Fd_Handler* g_dbus_fd_handler{NULL};
+       Ecore_Fd_Handler* mFdHandler{NULL};
 
-       int g_streaming_data_serial{0};
+       int mStreamingDataSerial{0};
 
-       CServiceMain* mServiceMain{nullptr};
+       CClientManager* mClientManager{nullptr};
+       IApplicationManager* mApplicationManager{nullptr};
 };
 
 #ifdef __cplusplus