From: sooyeon.kim Date: Fri, 2 Mar 2018 04:53:44 +0000 (+0900) Subject: Fix refer tzplatform apis X-Git-Tag: accepted/tizen/unified/20180305.062850^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=11e817ba2f4f764366fd0f0c538fc1799b023559;p=platform%2Fcore%2Fuifw%2Fstt.git Fix refer tzplatform apis Change-Id: I88f2fb31ab887d501a3f1611dcf3c3a6fc5b7c98 Signed-off-by: sooyeon.kim --- diff --git a/common/stt_defs.h b/common/stt_defs.h index abcabe4..b94e4e5 100644 --- a/common/stt_defs.h +++ b/common/stt_defs.h @@ -84,19 +84,19 @@ extern "C" { * Defines for configuration *******************************************************************************************/ -#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_CONFIG_BASE tzplatform_mkpath(tzplatform_getid("TZ_USER_HOME"), "share/.voice") +#define STT_CONFIG tzplatform_mkpath(tzplatform_getid("TZ_USER_HOME"), "share/.voice/stt-config.xml") +#define STT_DEFAULT_CONFIG tzplatform_mkpath(tzplatform_getid("TZ_SYS_RO_SHARE"), "/voice/stt/1.0/stt-config.xml") -#define STT_TIME_INFO_PATH tzplatform_mkpath(TZ_USER_HOME, "share/.voice/stt-time.xml") +#define STT_TIME_INFO_PATH tzplatform_mkpath(tzplatform_getid("TZ_USER_HOME"), "share/.voice/stt-time.xml") -#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 tzplatform_mkpath(tzplatform_getid("TZ_SYS_RO_SHARE"), "/voice/stt/1.0/engine") +#define STT_DEFAULT_ENGINE_INFO tzplatform_mkpath(tzplatform_getid("TZ_SYS_RO_SHARE"), "/voice/stt/1.0/engine-info") +#define STT_DEFAULT_ENGINE_SETTING tzplatform_mkpath(tzplatform_getid("TZ_SYS_RO_SHARE"), "/voice/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_HOME tzplatform_mkpath(tzplatform_getid("TZ_USER_HOME"), "share/.voice/stt") +#define STT_DOWNLOAD_BASE tzplatform_mkpath(tzplatform_getid("TZ_USER_HOME"), "share/.voice/stt/1.0") +#define STT_DOWNLOAD_ENGINE_INFO tzplatform_mkpath(tzplatform_getid("TZ_USER_HOME"), "share/.voice/stt/1.0/engine-info") #define STT_RETRY_COUNT 5 diff --git a/engine-parser/src/stt-engine-parser.c b/engine-parser/src/stt-engine-parser.c index c62ddac..0362e55 100644 --- a/engine-parser/src/stt-engine-parser.c +++ b/engine-parser/src/stt-engine-parser.c @@ -52,10 +52,10 @@ #define STT_TAG_ENGINE_SILENCE_DETECTION_SUPPORT "silence-detection-support" #define STT_TAG_ENGINE_CREDENTIAL "credential" -#define STT_CONFIG_BASE tzplatform_mkpath(TZ_USER_HOME, "share/.voice") -#define STT_HOME tzplatform_mkpath(TZ_USER_HOME, "share/.voice/stt") -#define STT_ENGINE_BASE tzplatform_mkpath(TZ_USER_HOME, "share/.voice/stt/1.0") -#define STT_ENGINE_INFO tzplatform_mkpath(TZ_USER_SHARE, ".voice/stt/1.0/engine-info") +#define STT_CONFIG_BASE tzplatform_mkpath(tzplatform_getid("TZ_USER_HOME"), "share/.voice") +#define STT_HOME tzplatform_mkpath(tzplatform_getid("TZ_USER_HOME"), "share/.voice/stt") +#define STT_ENGINE_BASE tzplatform_mkpath(tzplatform_getid("TZ_USER_HOME"), "share/.voice/stt/1.0") +#define STT_ENGINE_INFO tzplatform_mkpath(tzplatform_getid("TZ_USER_SHARE"), ".voice/stt/1.0/engine-info") #define STT_GLOBAL_CONFIG_BASE "/etc/skel/share/.voice" #define STT_GLOBAL_HOME "/etc/skel/share/.voice/stt"