X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=common%2Fstt_defs.h;h=465e22c2551100f487fb2301068b50530c423580;hb=151e6341cc3522f761261b1fc052947064c9944e;hp=e5f7a15cc1390eab7e6cf2ef9b03fedce9ad8e9d;hpb=dc6ca29b724236b8875f86560d69de9d831d8fd2;p=platform%2Fcore%2Fuifw%2Fstt.git

diff --git a/common/stt_defs.h b/common/stt_defs.h
index e5f7a15..465e22c 100644
--- a/common/stt_defs.h
+++ b/common/stt_defs.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2011-2014 Samsung Electronics Co., Ltd All Rights Reserved 
+*  Copyright (c) 2011-2016 Samsung Electronics Co., Ltd All Rights Reserved
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
 *  You may obtain a copy of the License at
@@ -25,14 +25,24 @@ extern "C" {
 * Definition for Dbus
 *******************************************************************************************/
 
-#define STT_CLIENT_SERVICE_NAME         "org.tizen.stt.client"
-#define STT_CLIENT_SERVICE_OBJECT_PATH  "/org/tizen/stt/client"
-#define STT_CLIENT_SERVICE_INTERFACE    "org.tizen.stt.client"
+#define STT_CLIENT_SERVICE_NAME         "org.tizen.voice.sttclient"
+#define STT_CLIENT_SERVICE_OBJECT_PATH  "/org/tizen/voice/sttclient"
+#define STT_CLIENT_SERVICE_INTERFACE    "org.tizen.voice.sttclient"
 
 #define STT_SERVER_SERVICE_NAME         "org.tizen.voice.sttserver"
 #define STT_SERVER_SERVICE_OBJECT_PATH  "/org/tizen/voice/sttserver"
 #define STT_SERVER_SERVICE_INTERFACE    "org.tizen.voice.sttserver"
 
+#define STT_SERVER_CUSTOM_SERVICE_NAME         "org.tizen.voice.sttservercustom"
+#define STT_SERVER_CUSTOM_SERVICE_OBJECT_PATH  "/org/tizen/voice/sttservercustom"
+#define STT_SERVER_CUSTOM_SERVICE_INTERFACE    "org.tizen.voice.sttservercustom"
+
+/******************************************************************************************
+* Definitions for Vconf Keys
+*******************************************************************************************/
+
+#define STT_ENGINE_DB_DEFAULT		"db/voice/stt/engine/default"
+#define STT_ENGINE_DB_CUSTOM		"db/voice/stt/engine/custom"
 
 /******************************************************************************************
 * Message Definition for Client
@@ -46,6 +56,8 @@ extern "C" {
 #define STT_METHOD_GET_CURRENT_LANG	"stt_method_get_current_lang"
 #define STT_METHOD_IS_TYPE_SUPPORTED	"stt_method_is_recognition_type_supported"
 #define STT_METHOD_CHECK_APP_AGREED	"stt_method_check_app_agreed"
+#define STT_METHOD_SET_PRIVATE_DATA	"stt_method_set_private_data"
+#define STT_METHOD_GET_PRIVATE_DATA	"stt_method_get_private_data"
 
 #define STT_METHOD_SET_START_SOUND	"stt_method_set_start_sound"
 #define STT_METHOD_UNSET_START_SOUND	"stt_method_unset_start_sound"
@@ -61,30 +73,27 @@ extern "C" {
 #define STTD_METHOD_ERROR		"sttd_method_error"
 #define STTD_METHOD_HELLO		"sttd_method_hello"
 #define STTD_METHOD_SET_STATE		"sttd_method_set_state"
-#define STTD_METHOD_GET_STATE		"sttd_method_get_state"
+#define STTD_METHOD_SET_VOLUME		"sttd_method_set_volume"
+#define STTD_METHOD_SPEECH_STATUS	"sttd_method_speech_status"
+
 
 /******************************************************************************************
 * Defines for configuration
 *******************************************************************************************/
 
-#define STT_AUDIO_VOLUME_PATH		"/tmp/stt_vol"
-
-#define STT_TIME_INFO_PATH		tzplatform_mkpath(TZ_USER_HOME, "share/.voice/stt-time.xml")
-
-#define STT_USR_BASE			"/usr/lib/voice"
-#define STT_OPT_BASE			"/opt/usr/data/voice"
-
-#define STT_DEFAULT_CONFIG		STT_USR_BASE"/stt/1.0/stt-config.xml"
+#define STT_CONFIG_BASE		tzplatform_mkpath(TZ_USER_HOME, "share/.voice")
 #define STT_CONFIG			tzplatform_mkpath(TZ_USER_HOME, "share/.voice/stt-config.xml")
+#define STT_DEFAULT_CONFIG		tzplatform_mkpath(TZ_SYS_RO_SHARE, "/voice/stt/1.0/stt-config.xml")
 
-#define STT_DEFAULT_ENGINE		STT_USR_BASE"/stt/1.0/engine"
-#define STT_DOWNLOAD_ENGINE		STT_OPT_BASE"/stt/1.0/engine"
+#define STT_TIME_INFO_PATH		tzplatform_mkpath(TZ_USER_HOME, "share/.voice/stt-time.xml")
 
-#define STT_DEFAULT_ENGINE_INFO		STT_USR_BASE"/stt/1.0/engine-info"
-#define STT_DOWNLOAD_ENGINE_INFO	STT_OPT_BASE"/stt/1.0/engine-info"
+#define STT_DEFAULT_ENGINE		tzplatform_mkpath(TZ_SYS_RO_SHARE, "/voice/stt/1.0/engine")
+#define STT_DEFAULT_ENGINE_INFO		tzplatform_mkpath(TZ_SYS_RO_SHARE, "/voice/stt/1.0/engine-info")
+#define STT_DEFAULT_ENGINE_SETTING	tzplatform_mkpath(TZ_SYS_RO_SHARE, "/voice/stt/1.0/engine-setting")
 
-#define STT_DEFAULT_ENGINE_SETTING	STT_USR_BASE"/stt/1.0/engine-setting"
-#define STT_DOWNLOAD_ENGINE_SETTING	STT_OPT_BASE"/stt/1.0/engine-setting"
+#define STT_HOME			tzplatform_mkpath(TZ_USER_HOME, "share/.voice/stt")
+#define STT_DOWNLOAD_BASE		tzplatform_mkpath(TZ_USER_HOME, "share/.voice/stt/1.0")
+#define STT_DOWNLOAD_ENGINE_INFO	tzplatform_mkpath(TZ_USER_HOME, "share/.voice/stt/1.0/engine-info")
 
 #define STT_BASE_LANGUAGE		"en_US"
 
@@ -93,6 +102,9 @@ extern "C" {
 #define STT_FEATURE_PATH		"tizen.org/feature/speech.recognition"
 #define STT_MIC_FEATURE_PATH		"tizen.org/feature/microphone"
 
+#define STT_PRIVILEGE_RECORDER			"http://tizen.org/privilege/recorder"
+#define STT_PRIVILEGE_APPLAUNCH			"http://tizen.org/privilege/appmanager.launch"
+
 #ifdef __cplusplus
 }
 #endif