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
Delete ecore timer when quit ecore main loop
[platform/core/uifw/tts.git]
/
server
/
ttse.c
diff --git
a/server/ttse.c
b/server/ttse.c
index
44b61c1
..
0f40802
100755
(executable)
--- a/
server/ttse.c
+++ b/
server/ttse.c
@@
-23,6
+23,7
@@
#include <Ecore.h>
#include "ttse.h"
#include <Ecore.h>
#include "ttse.h"
+#include "ttse_internal.h"
static ttsd_mode_e g_tts_mode = TTSD_MODE_DEFAULT;
static ttsd_mode_e g_tts_mode = TTSD_MODE_DEFAULT;
@@
-32,6
+33,8
@@
const char* tts_tag()
return "ttsdnoti";
} else if (TTSD_MODE_SCREEN_READER == g_tts_mode) {
return "ttsdsr";
return "ttsdnoti";
} else if (TTSD_MODE_SCREEN_READER == g_tts_mode) {
return "ttsdsr";
+ } else if (TTSD_MODE_INTERRUPT == g_tts_mode) {
+ return "ttsdinterrupt";
} else {
return "ttsd";
}
} else {
return "ttsd";
}
@@
-63,6
+66,8
@@
int ttse_main(int argc, char** argv, ttse_request_callback_s *callback)
mode = TTSD_MODE_NOTIFICATION;
} else if (!strcmp("sr", val)) {
mode = TTSD_MODE_SCREEN_READER;
mode = TTSD_MODE_NOTIFICATION;
} else if (!strcmp("sr", val)) {
mode = TTSD_MODE_SCREEN_READER;
+ } else if (!strcmp("interrupt", val)) {
+ mode = TTSD_MODE_INTERRUPT;
} else {
SLOG(LOG_WARN, tts_tag(), "[WARNING] mode (%s)", val);
}
} else {
SLOG(LOG_WARN, tts_tag(), "[WARNING] mode (%s)", val);
}
@@
-105,8
+110,14
@@
int ttse_main(int argc, char** argv, ttse_request_callback_s *callback)
SLOG(LOG_WARN, tts_tag(), "[WARNING] Fail to initialize network");
}
SLOG(LOG_WARN, tts_tag(), "[WARNING] Fail to initialize network");
}
- SLOG(LOG_DEBUG, tts_tag(), "====");
- SLOG(LOG_DEBUG, tts_tag(), "");
+ SLOG(LOG_DEBUG, tts_tag(), "@@@");
+
+ return TTSE_ERROR_NONE;
+}
+
+int ttse_terminate()
+{
+ ttsd_terminate();
return TTSE_ERROR_NONE;
}
return TTSE_ERROR_NONE;
}
@@
-160,11
+171,6
@@
int ttse_send_error(ttse_error_e error, const char* msg)
{
int ret;
{
int ret;
- if (NULL == msg) {
- SLOG(LOG_ERROR, tts_tag(), "[ERROR] Input parameter is null");
- return TTSE_ERROR_INVALID_PARAMETER;
- }
-
ret = ttsd_send_error(error, msg);
if (0 != ret) {
ret = ttsd_send_error(error, msg);
if (0 != ret) {
@@
-204,4
+210,4
@@
int ttse_set_private_data_requested_cb(ttse_private_data_requested_cb callback_f
}
return ret;
}
return ret;
-}
\ No newline at end of file
+}