From ea7f59daa9765b6acb28a4f2405e2a20da4e7cd8 Mon Sep 17 00:00:00 2001 From: "sooyeon.kim" Date: Thu, 26 Oct 2017 15:01:00 +0900 Subject: [PATCH] Set a default value for max text size Change-Id: I4e5e3fb4423233166a9e40d800305a2ad2f0e9b7 Signed-off-by: sooyeon.kim (cherry picked from commit de4552ffc6f466b88b38a131962d2cb97f7d1bdc) --- client/tts.c | 1 - common/tts_defs.h | 2 -- engine-parser/src/tts-engine-parser.c | 18 ++++++++++++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/client/tts.c b/client/tts.c index 5580e97..a76420b 100644 --- a/client/tts.c +++ b/client/tts.c @@ -892,7 +892,6 @@ int tts_get_max_text_size(tts_h tts, unsigned int* size) return TTS_ERROR_INVALID_STATE; } -// *size = TTS_MAX_TEXT_SIZE; if (0 != tts_config_mgr_get_max_text_size(size)) { SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to get max text size"); return TTS_ERROR_INVALID_PARAMETER; diff --git a/common/tts_defs.h b/common/tts_defs.h index 9401d9a..c0f57fa 100644 --- a/common/tts_defs.h +++ b/common/tts_defs.h @@ -100,8 +100,6 @@ extern "C" { #define TTS_PITCH_NORMAL 8 #define TTS_PITCH_MAX 15 -//#define TTS_MAX_TEXT_SIZE 2000 - #define TTS_FEATURE_PATH "tizen.org/feature/speech.synthesis" /****************************************************************************************** diff --git a/engine-parser/src/tts-engine-parser.c b/engine-parser/src/tts-engine-parser.c index fe35849..237aa79 100644 --- a/engine-parser/src/tts-engine-parser.c +++ b/engine-parser/src/tts-engine-parser.c @@ -71,6 +71,8 @@ #define TTS_METADATA_TEXT_SIZE "http://tizen.org/metadata/tts-engine/text-size" #define TTS_METADATA_PITCH_SUPPORT "http://tizen.org/metadata/tts-engine/pitch-support" +#define TTS_MAX_TEXT_SIZE "2000" + /* Define Macro */ #define FREE(x) { if (NULL != x) { free(x); x = NULL; } } #define G_FREE(x) { if (NULL != x) { g_free(x); x = NULL; } } @@ -92,6 +94,7 @@ char *g_dir_home = NULL; char *g_dir_engine_base = NULL; char *g_dir_engine_info = NULL; + static int __create_engine_info_xml(const char *pkgid) { LOGD("@@@ Create engine info doc"); @@ -367,6 +370,8 @@ static int __write_metadata_inxml(const char *pkgid, const char *appid, GList *l GList *iter = NULL; metadata *md = NULL; + bool isTextsize = false; + __create_engine_info_xml(pkgid); xmlNodePtr root = NULL; @@ -409,6 +414,7 @@ static int __write_metadata_inxml(const char *pkgid, const char *appid, GList *l cur = xmlNewNode(NULL, (const xmlChar*)TTS_TAG_ENGINE_TEXT_SIZE); xmlNodeSetContent(cur, (const xmlChar*)md->value); xmlAddChild(root, cur); + isTextsize = true; } else if (!strcmp(md->key, TTS_METADATA_PITCH_SUPPORT)) { cur = xmlNewNode(NULL, (const xmlChar*)TTS_TAG_ENGINE_PITCH_SUPPORT); xmlNodeSetContent(cur, (const xmlChar*)md->value); @@ -420,6 +426,13 @@ static int __write_metadata_inxml(const char *pkgid, const char *appid, GList *l iter = g_list_next(iter); } + if (false == isTextsize) { + cur = xmlNewNode(NULL, (const xmlChar*)TTS_TAG_ENGINE_TEXT_SIZE); + xmlNodeSetContent(cur, (const xmlChar*)TTS_MAX_TEXT_SIZE); + xmlAddChild(root, cur); + LOGD("[DEBUG] Max text size is set as %s.", TTS_MAX_TEXT_SIZE); + } + cur = xmlNewNode(NULL, (const xmlChar*)TTS_TAG_ENGINE_ID); xmlNodeSetContent(cur, (const xmlChar*)pkgid); xmlAddChild(root, cur); @@ -719,7 +732,10 @@ int PKGMGR_MDPARSER_PLUGIN_UNINSTALL(const char *pkgid, const char *appid, GList uid_t globalapp_uid = tzplatform_getuid(TZ_SYS_GLOBALAPP_USER); if (globalapp_uid == g_uid) { g_user_type = g_strdup("admin"); + LOGD("[DEBUG] g_user_type: %s (%d)", g_user_type, globalapp_uid); } else { + LOGD("[DEBUG] globalapp_uid(%d)", globalapp_uid); + g_guser = gum_user_get_sync(g_uid, FALSE); if (NULL == g_guser) { LOGE("[ERROR] g_guser is NULL"); @@ -728,6 +744,8 @@ int PKGMGR_MDPARSER_PLUGIN_UNINSTALL(const char *pkgid, const char *appid, GList g_object_get(G_OBJECT(g_guser), "usertype", &g_ut, NULL); g_user_type = g_strdup(gum_user_type_to_string(g_ut)); + + LOGD("[DEBUG] g_guser(%s), g_ut(%s), g_user_type(%s)", g_guser, g_ut, g_user_type); } if (NULL == g_user_type) { -- 2.7.4