return nullptr;
}
-int ttsd_data_new_client(int pid, unsigned int uid)
+int ttsd_data_new_client(int pid, unsigned int uid, ttsd_mode_e mode, tts_ipc_method_e method)
{
lock_guard<mutex> lock(g_app_data_mutex);
if(nullptr != __get_client_app_data(uid) ) {
app.utt_id_stopped = 0;
app.state = APP_STATE_READY;
app.type = TTS_APP_PLAY_TYPE_SYNTH;
- app.mode = TTSD_MODE_DEFAULT;
+ app.mode = mode;
app.result_event = TTSE_RESULT_EVENT_FAIL;
- app.ipc_method = TTS_IPC_METHOD_UNDEFINED;
+ app.ipc_method = method;
app.credential = nullptr;
app.paused_data_existing = false;
return app_data->pid;
}
-int ttsd_data_set_ipc_method(unsigned int uid, tts_ipc_method_e method)
-{
- lock_guard<mutex> lock(g_app_data_mutex);
- app_data_s* app_data = __get_client_app_data(uid);
- if (nullptr == app_data) {
- SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] uid is not valid (%u)", uid);
- return TTSD_ERROR_INVALID_PARAMETER;
- }
-
- app_data->ipc_method = method;
-
- return TTSD_ERROR_NONE;
-}
-
tts_ipc_method_e ttsd_data_get_ipc_method(unsigned int uid)
{
lock_guard<mutex> lock(g_app_data_mutex);
return app_data->ipc_method;
}
-int ttsd_data_set_mode(unsigned int uid, ttsd_mode_e mode)
-{
- lock_guard<mutex> lock(g_app_data_mutex);
- app_data_s* app_data = __get_client_app_data(uid);
- if (nullptr == app_data) {
- SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] uid is not valid (%u)", uid);
- return TTSD_ERROR_INVALID_PARAMETER;
- }
-
- app_data->mode = mode;
-
- return TTSD_ERROR_NONE;
-}
-
ttsd_mode_e ttsd_data_get_mode(unsigned int uid)
{
lock_guard<mutex> lock(g_app_data_mutex);
typedef void (* ttsd_used_voice_cb)(const char* lang, int type);
-int ttsd_data_new_client(int pid, unsigned int uid);
+int ttsd_data_new_client(int pid, unsigned int uid, ttsd_mode_e mode, tts_ipc_method_e method);
int ttsd_data_delete_client(unsigned int uid);
int ttsd_data_get_pid(unsigned int uid);
-int ttsd_data_set_ipc_method(unsigned int uid, tts_ipc_method_e method);
-
tts_ipc_method_e ttsd_data_get_ipc_method(unsigned int uid);
-int ttsd_data_set_mode(unsigned int uid, ttsd_mode_e mode);
-
ttsd_mode_e ttsd_data_get_mode(unsigned int uid);
int ttsd_data_set_credential(unsigned int uid, const char* credential);
ttsd_server_is_already_initialized(pid, uid, &is_initialized);
if (false == is_initialized) {
- ret = ttsd_server_initialize(pid, uid, TTS_IPC_METHOD_DBUS, &is_credential_needed);
+ ret = ttsd_server_initialize(pid, uid, (ttsd_mode_e)mode, TTS_IPC_METHOD_DBUS, &is_credential_needed);
if (0 != ret) {
SLOG(LOG_ERROR, tts_tag(), "[IN ERROR] ttsd Hello : server initialize, ret(%d)", ret);
}
dbus_error_free(&err);
ret = TTSD_ERROR_OPERATION_FAILED;
} else {
-
SECURE_SLOG(LOG_DEBUG, tts_tag(), "[IN] tts initialize : pid(%d), uid(%u), mode(%d)", pid, uid, mode);
- ret = ttsd_server_initialize(pid, uid, TTS_IPC_METHOD_DBUS, &credential_needed);
+ ret = ttsd_server_initialize(pid, uid, (ttsd_mode_e)mode, TTS_IPC_METHOD_DBUS, &credential_needed);
}
DBusMessage* reply;
ret = TTSD_ERROR_OPERATION_FAILED;
} else {
SLOG(LOG_DEBUG, tts_tag(), "[IN] tts set mode. uid(%u), mode(%d)", uid, mode);
- ret = ttsd_server_set_mode(uid, mode);
}
DBusMessage* reply;
return TTSD_ERROR_NONE;
}
-int ttsd_server_initialize(int pid, unsigned int uid, tts_ipc_method_e method, bool* credential_needed)
+int ttsd_server_initialize(int pid, unsigned int uid, ttsd_mode_e mode, tts_ipc_method_e method, bool* credential_needed)
{
SLOG(LOG_INFO, tts_tag(), "[Server] Server initialize");
}
}
- if (0 != ttsd_data_new_client(pid, uid)) {
+ if (0 != ttsd_data_new_client(pid, uid, mode, method)) {
SLOG(LOG_ERROR, tts_tag(), "[Server ERROR] Fail to add client info");
return TTSD_ERROR_OPERATION_FAILED;
}
- if (0 != ttsd_data_set_ipc_method(uid, method)) {
- SLOG(LOG_ERROR, tts_tag(), "[Server ERROR] Fail to set ipc method");
- return TTSD_ERROR_OPERATION_FAILED;
- }
-
return TTSD_ERROR_NONE;
}
return TTSD_ERROR_NONE;
}
-int ttsd_server_set_mode(unsigned int uid, ttsd_mode_e mode)
-{
- app_tts_state_e state = ttsd_data_get_client_state(uid);
- if (APP_STATE_NONE == state) {
- SLOG(LOG_ERROR, tts_tag(), "[Server ERROR] uid(%u) is NOT valid", uid);
- return TTSD_ERROR_INVALID_PARAMETER;
- }
-
- if (APP_STATE_READY != state) {
- SLOG(LOG_ERROR, tts_tag(), "[Server ERROR] Current state(%d) is NOT 'READY'", uid);
- return TTSD_ERROR_INVALID_STATE;
- }
-
- int ret = ttsd_data_set_mode(uid, mode);
- if (0 != ret) {
- SLOG(LOG_ERROR, tts_tag(), "[Server ERROR] Fail to set mode : ret(%d)", ret);
- } else {
- SLOG(LOG_DEBUG, tts_tag(), "[Server] Set mode. uid(%u), mode(%d)", uid, mode);
- }
-
- return ret;
-}
-
static bool __is_connected_to_network()
{
/* Check network */
int ttsd_server_is_already_initialized(int pid, unsigned int uid, bool* is_initialized);
-int ttsd_server_initialize(int pid, unsigned int uid, tts_ipc_method_e method, bool* credential_needed);
+int ttsd_server_initialize(int pid, unsigned int uid, ttsd_mode_e mode, tts_ipc_method_e method, bool* credential_needed);
int ttsd_server_finalize(unsigned int uid);
-int ttsd_server_set_mode(unsigned int uid, ttsd_mode_e mode);
-
int ttsd_server_get_support_voices(unsigned int uid, GList** voice_list);
int ttsd_server_get_current_voice(unsigned int uid, char** language, int* voice_type);
int credential_needed = 0;
if (false == is_initialized) {
bool is_credential_needed = false;
- ret = ttsd_server_initialize(pid, u_uid, TTS_IPC_METHOD_TIDL, &is_credential_needed);
+ ret = ttsd_server_initialize(pid, u_uid, mode, TTS_IPC_METHOD_TIDL, &is_credential_needed);
if (0 != ret) {
SLOG(LOG_ERROR, tts_tag(), "[IN ERROR] ttsd Hello : server initialize, ret(%d)", ret);
}
unsigned int u_uid = (unsigned int)uid;
SLOG(LOG_INFO, tts_tag(), ">>>>> TTS SET MODE. uid(%u). mode (%d)", u_uid, mode);
- int ret = ttsd_server_set_mode(u_uid, mode);
- if (TTSD_ERROR_NONE != ret) {
- SLOG(LOG_ERROR, tts_tag(), "[ERROR] TTS SET MODE (%u) fail (%d/%s) <<<<<", u_uid, ret, get_error_message(ret));
- return ret;
- }
-
SLOG(LOG_DEBUG, tts_tag(), "<<<<<");
return TTSD_ERROR_NONE;
}
unsigned int u_uid = (unsigned int)uid;
SECURE_SLOG(LOG_ERROR, tts_tag(), "[IN] tts initialize : pid(%d), uid(%u), mode(%d)", pid, u_uid, mode);
- if (0 != ttsd_server_initialize(pid, u_uid, TTS_IPC_METHOD_TIDL, credential_needed)) {
+ if (0 != ttsd_server_initialize(pid, u_uid, mode, TTS_IPC_METHOD_TIDL, credential_needed)) {
return TTSD_ERROR_OPERATION_FAILED;
}