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
Merge "Remove unnecessary timer" into tizen
[platform/core/uifw/tts.git]
/
client
/
tts.c
diff --git
a/client/tts.c
b/client/tts.c
index
67038a2
..
08e8d9a
100644
(file)
--- a/
client/tts.c
+++ b/
client/tts.c
@@
-647,7
+647,10
@@
static Eina_Bool __tts_connect_daemon(void *data)
client->utt_id = -1;
ecore_timer_add(0, __tts_notify_error, (void*)client->tts);
client->utt_id = -1;
ecore_timer_add(0, __tts_notify_error, (void*)client->tts);
- client->conn_timer = NULL;
+ if (client->conn_timer) {
+ ecore_timer_del(client->conn_timer);
+ client->conn_timer = NULL;
+ }
return EINA_FALSE;
} else if (TTS_ERROR_PERMISSION_DENIED == ret) {
return EINA_FALSE;
} else if (TTS_ERROR_PERMISSION_DENIED == ret) {
@@
-657,7
+660,10
@@
static Eina_Bool __tts_connect_daemon(void *data)
client->utt_id = -1;
ecore_timer_add(0, __tts_notify_error, (void*)client->tts);
client->utt_id = -1;
ecore_timer_add(0, __tts_notify_error, (void*)client->tts);
- client->conn_timer = NULL;
+ if (client->conn_timer) {
+ ecore_timer_del(client->conn_timer);
+ client->conn_timer = NULL;
+ }
return EINA_FALSE;
} else if (TTS_ERROR_NONE != ret) {
return EINA_FALSE;
} else if (TTS_ERROR_NONE != ret) {
@@
-670,7
+676,10
@@
static Eina_Bool __tts_connect_daemon(void *data)
SLOG(LOG_ERROR, TAG_TTSC, "Supported options : credential(%s)", credential_needed ? "need" : "no need");
}
SLOG(LOG_ERROR, TAG_TTSC, "Supported options : credential(%s)", credential_needed ? "need" : "no need");
}
- client->conn_timer = NULL;
+ if (client->conn_timer) {
+ ecore_timer_del(client->conn_timer);
+ client->conn_timer = NULL;
+ }
client = tts_client_get(tts);
/* check handle */
client = tts_client_get(tts);
/* check handle */
@@
-720,6
+729,10
@@
int tts_prepare(tts_h tts)
}
ecore_thread_main_loop_begin();
}
ecore_thread_main_loop_begin();
+ if (client->conn_timer) {
+ ecore_timer_del(client->conn_timer);
+ client->conn_timer = NULL;
+ }
client->conn_timer = ecore_timer_add(0.02, __tts_connect_daemon, (void*)tts);
ecore_thread_main_loop_end();
client->conn_timer = ecore_timer_add(0.02, __tts_connect_daemon, (void*)tts);
ecore_thread_main_loop_end();