projects
/
platform
/
core
/
uifw
/
tts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sync codes to 2.4 spin
[platform/core/uifw/tts.git]
/
common
/
tts_config_mgr.c
diff --git
a/common/tts_config_mgr.c
b/common/tts_config_mgr.c
index
371cdbf
..
842df9a
100644
(file)
--- a/
common/tts_config_mgr.c
+++ b/
common/tts_config_mgr.c
@@
-124,8
+124,8
@@
int __tts_config_mgr_check_engine_is_valid(const char* engine_id)
g_config_info->type = voice->type;
SLOG(LOG_DEBUG, tts_tag(), "Default voice is changed : lang(%s) type(%d)", voice->language, voice->type);
g_config_info->type = voice->type;
SLOG(LOG_DEBUG, tts_tag(), "Default voice is changed : lang(%s) type(%d)", voice->language, voice->type);
+ break;
}
}
- break;
}
}
}
}
}
}
@@
-637,7
+637,7
@@
void __tts_config_screen_reader_changed_cb(keynode_t *key, void *data)
{
int ret;
int screen_reader;
{
int ret;
int screen_reader;
- ret = vconf_get_
int
(TTS_ACCESSIBILITY_KEY, &screen_reader);
+ ret = vconf_get_
bool
(TTS_ACCESSIBILITY_KEY, &screen_reader);
if (0 != ret) {
SLOG(LOG_ERROR, tts_tag(), "[Config ERROR] Fail to get screen reader");
return;
if (0 != ret) {
SLOG(LOG_ERROR, tts_tag(), "[Config ERROR] Fail to get screen reader");
return;
@@
-1283,8
+1283,10
@@
int tts_config_mgr_set_engine(const char* engine)
return TTS_CONFIG_ERROR_INVALID_PARAMETER;
/* Check current engine id with new engine id */
return TTS_CONFIG_ERROR_INVALID_PARAMETER;
/* Check current engine id with new engine id */
- if (0 == strcmp(g_config_info->engine_id, engine))
- return 0;
+ if (NULL != g_config_info->engine_id) {
+ if (0 == strcmp(g_config_info->engine_id, engine))
+ return 0;
+ }
if (0 >= g_slist_length(g_engine_list)) {
SLOG(LOG_ERROR, tts_tag(), "[ERROR] There is no engine!!");
if (0 >= g_slist_length(g_engine_list)) {
SLOG(LOG_ERROR, tts_tag(), "[ERROR] There is no engine!!");
@@
-1347,13
+1349,7
@@
int tts_config_mgr_set_engine(const char* engine)
if (voice->type == g_config_info->type) {
/* language is valid */
is_valid_voice = true;
if (voice->type == g_config_info->type) {
/* language is valid */
is_valid_voice = true;
-
- if (NULL != g_config_info->language) {
- free(g_config_info->language);
-
- g_config_info->language = strdup(voice->language);
- g_config_info->type = voice->type;
- }
+ g_config_info->type = voice->type;
}
break;
}
}
break;
}