/*
-* Copyright (c) 2011-2014 Samsung Electronics Co., Ltd All Rights Reserved
+* Copyright (c) 2011-2016 Samsung Electronics Co., Ltd All Rights Reserved
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
using namespace std;
-typedef struct
+typedef struct
{
char* lang;
int vctype;
}used_voice_s;
-typedef struct
+typedef struct
{
int pid;
int uid;
int utt_id_stopped;
- app_state_e state;
+ app_tts_state_e state;
std::list<speak_data_s*> m_speak_data;
std::list<sound_data_s*> m_wav_data;
static vector<app_data_s> g_app_list;
+static pthread_mutex_t g_speak_data_mutex = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t g_sound_data_mutex = PTHREAD_MUTEX_INITIALIZER;
/*
{
int vsize = g_app_list.size();
- SLOG(LOG_DEBUG, get_tag(), "----- client list -----");
+ SLOG(LOG_DEBUG, tts_tag(), "----- client list -----");
- for (int i=0; i<vsize; i++) {
- SECURE_SLOG(LOG_DEBUG, get_tag(), "[%dth] pid(%d), uid(%d), state(%d)", i, g_app_list[i].pid, g_app_list[i].uid, g_app_list[i].state);
+ for (int i=0; i < vsize; i++) {
+ SECURE_SLOG(LOG_DEBUG, tts_tag(), "[%dth] pid(%d), uid(%d), state(%d)", i, g_app_list[i].pid, g_app_list[i].uid, g_app_list[i].state);
}
if (0 == vsize) {
- SLOG(LOG_DEBUG, get_tag(), "No Client");
+ SLOG(LOG_DEBUG, tts_tag(), "No Client");
}
- SLOG(LOG_DEBUG, get_tag(), "-----------------------");
+ SLOG(LOG_DEBUG, tts_tag(), "-----------------------");
return TTSD_ERROR_NONE;
}
int __data_show_sound_list(int index)
{
- SLOG(LOG_DEBUG, get_tag(), "----- Sound list -----");
-
+ SLOG(LOG_DEBUG, tts_tag(), "----- Sound list -----");
+
unsigned int i = 0;
std::list<sound_data_s*>::iterator iter;
- for (iter = g_app_list[index].m_wav_data.begin(); iter != g_app_list[index].m_wav_data.end(); iter++) {
- SLOG(LOG_DEBUG, get_tag(), "[%dth][%p] data(%p) data size(%ld), uttid(%d), type(%d)",
+ for (iter = g_app_list[index].m_wav_data.begin(); iter != g_app_list[index].m_wav_data.end(); ++iter) {
+ SLOG(LOG_DEBUG, tts_tag(), "[%dth][%p] data(%p) data size(%d), uttid(%d), type(%d)",
i, *iter, (*iter)->data, (*iter)->data_size, (*iter)->utt_id, (*iter)->audio_type);
i++;
}
if (i == 0) {
- SLOG(LOG_DEBUG, get_tag(), "No Sound Data");
+ SLOG(LOG_DEBUG, tts_tag(), "No Sound Data");
}
- SLOG(LOG_DEBUG, get_tag(), "----------------------");
+ SLOG(LOG_DEBUG, tts_tag(), "----------------------");
return TTSD_ERROR_NONE;
}
int __data_show_text_list(int index)
{
- SLOG(LOG_DEBUG, get_tag(), "----- Text list -----");
+ SLOG(LOG_DEBUG, tts_tag(), "----- Text list -----");
unsigned int i = 0;
std::list<speak_data_s*>::iterator iter;
- for (iter = g_app_list[index].m_speak_data.begin(); iter != g_app_list[index].m_speak_data.end(); iter++) {
- SLOG(LOG_DEBUG, get_tag(), "[%dth][%p] lang(%s), vctype(%d), speed(%d), uttid(%d), text(%s)",
+ for (iter = g_app_list[index].m_speak_data.begin(); iter != g_app_list[index].m_speak_data.end(); ++iter) {
+ SLOG(LOG_DEBUG, tts_tag(), "[%dth][%p] lang(%s), vctype(%d), speed(%d), uttid(%d), text(%s)",
i + 1, *iter, (*iter)->lang, (*iter)->vctype, (*iter)->speed, (*iter)->utt_id, (*iter)->text);
i++;
}
if (0 == i) {
- SLOG(LOG_DEBUG, get_tag(), "No Text Data");
+ SLOG(LOG_DEBUG, tts_tag(), "No Text Data");
}
- SLOG(LOG_DEBUG, get_tag(), "---------------------");
+ SLOG(LOG_DEBUG, tts_tag(), "---------------------");
return TTSD_ERROR_NONE;
}
int __data_show_used_voice_list(int index)
{
- SLOG(LOG_DEBUG, get_tag(), "----- Used voice list -----");
+ SLOG(LOG_DEBUG, tts_tag(), "----- Used voice list -----");
unsigned int i = 0;
std::list<used_voice_s>::iterator iter;
- for (iter = g_app_list[index].m_used_voice.begin(); iter != g_app_list[index].m_used_voice.end(); iter++) {
- SLOG(LOG_DEBUG, get_tag(), "[%dth] lang(%s), vctype(%d)", i + 1, iter->lang, iter->vctype);
+ for (iter = g_app_list[index].m_used_voice.begin(); iter != g_app_list[index].m_used_voice.end(); ++iter) {
+ SLOG(LOG_DEBUG, tts_tag(), "[%dth] lang(%s), vctype(%d)", i + 1, iter->lang, iter->vctype);
i++;
}
if (0 == i) {
- SLOG(LOG_DEBUG, get_tag(), "No Voice Data");
+ SLOG(LOG_DEBUG, tts_tag(), "No Voice Data");
}
- SLOG(LOG_DEBUG, get_tag(), "---------------------------");
+ SLOG(LOG_DEBUG, tts_tag(), "---------------------------");
return TTSD_ERROR_NONE;
}
int ttsd_data_new_client(int pid, int uid)
{
if( -1 != ttsd_data_is_client(uid) ) {
- SECURE_SLOG(LOG_ERROR, get_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
+ SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
return TTSD_ERROR_INVALID_PARAMETER;
}
app.utt_id_stopped = 0;
app.state = APP_STATE_READY;
- g_app_list.insert( g_app_list.end(), app);
+ g_app_list.insert(g_app_list.end(), app);
#ifdef DATA_DEBUG
__data_show_list();
-#endif
+#endif
return TTSD_ERROR_NONE;
}
int index = 0;
index = ttsd_data_is_client(uid);
-
+
if (index < 0) {
- SECURE_SLOG(LOG_ERROR, get_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
+ SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
return -1;
}
if (0 != ttsd_data_clear_data(uid)) {
- SLOG(LOG_ERROR, get_tag(), "[DATA ERROR] Fail to clear data");
+ SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] Fail to clear data");
return -1;
}
#ifdef DATA_DEBUG
__data_show_list();
-#endif
+#endif
return TTSD_ERROR_NONE;
}
{
int vsize = g_app_list.size();
- for (int i=0; i<vsize; i++) {
+ for (int i = 0; i < vsize; i++) {
if(g_app_list[i].uid == uid) {
- return i;
+ return i;
}
}
int index;
index = ttsd_data_is_client(uid);
-
+
if (index < 0) {
- SECURE_SLOG(LOG_ERROR, get_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
+ SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
return TTSD_ERROR_INVALID_PARAMETER;
}
{
int index = 0;
index = ttsd_data_is_client(uid);
-
+
if (index < 0) {
- SECURE_SLOG(LOG_ERROR, get_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
+ SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
return TTSD_ERROR_INVALID_PARAMETER;
}
+ /* mutex is locked */
+ pthread_mutex_lock(&g_speak_data_mutex);
int size = g_app_list[index].m_speak_data.size();
+
+ /* mutex is unlocked */
+ pthread_mutex_unlock(&g_speak_data_mutex);
+
return size;
}
index = ttsd_data_is_client(uid);
if (index < 0) {
- SECURE_SLOG(LOG_ERROR, get_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
+ SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
return TTSD_ERROR_INVALID_PARAMETER;
}
/* Find voice */
std::list<used_voice_s>::iterator iter;
- for (iter = g_app_list[index].m_used_voice.begin();iter != g_app_list[index].m_used_voice.end();iter++) {
+ for (iter = g_app_list[index].m_used_voice.begin(); iter != g_app_list[index].m_used_voice.end();++iter) {
if (0 == strcmp(lang, iter->lang) && type == iter->vctype) {
- SLOG(LOG_DEBUG, get_tag(), "[DATA] The voice is already registered (%s)(%d)", lang, type);
+ SLOG(LOG_DEBUG, tts_tag(), "[DATA] The voice is already registered (%s)(%d)", lang, type);
return 0;
}
}
used_voice.lang = strdup(lang);
used_voice.vctype = type;
- g_app_list[index].m_used_voice.insert(g_app_list[index].m_used_voice.end(), used_voice);
+ try {
+ iter = g_app_list[index].m_used_voice.insert(g_app_list[index].m_used_voice.end(), used_voice);
+ } catch (const std::bad_alloc&) {
+ SLOG(LOG_ERROR, tts_tag(), "[DATA][ERROR] Fail to insert m_used_voice (bad_alloc)");
+ return -1;
+ }
+ SLOG(LOG_ERROR, tts_tag(), "[DATA] lang(%s), vctype(%d)", iter->lang, iter->vctype);
#ifdef DATA_DEBUG
__data_show_used_voice_list(index);
index = ttsd_data_is_client(uid);
if (index < 0) {
- SECURE_SLOG(LOG_ERROR, get_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
+ SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
return TTSD_ERROR_INVALID_PARAMETER;
}
if (NULL == callback) {
- SLOG(LOG_WARN, get_tag(), "[DATA WARNING] Used voice callback is NULL");
+ SLOG(LOG_WARN, tts_tag(), "[DATA WARNING] Used voice callback is NULL");
}
/* Find voice */
std::list<used_voice_s>::iterator iter;
- for (iter = g_app_list[index].m_used_voice.begin(); iter != g_app_list[index].m_used_voice.end(); iter++) {
+ for (iter = g_app_list[index].m_used_voice.begin(); iter != g_app_list[index].m_used_voice.end(); ++iter) {
if (NULL != callback) {
callback(iter->lang, iter->vctype);
}
if (NULL != iter->lang) {
free(iter->lang);
+ iter->lang = NULL;
}
- }
+ }
g_app_list[index].m_used_voice.clear();
index = ttsd_data_is_client(uid);
if (index < 0) {
- SECURE_SLOG(LOG_ERROR, get_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
+ SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
return TTSD_ERROR_INVALID_PARAMETER;
}
-
- g_app_list[index].m_speak_data.insert(g_app_list[index].m_speak_data.end(), data);
+
+ /* mutex is locked */
+ pthread_mutex_lock(&g_speak_data_mutex);
+
+ std::list<speak_data_s*>::iterator iter;
+
+ try {
+ iter = g_app_list[index].m_speak_data.insert(g_app_list[index].m_speak_data.end(), data);
+ } catch (const std::bad_alloc&) {
+ SLOG(LOG_ERROR, tts_tag(), "[DATA][ERROR] Fail to insert m_speak_data (bad_alloc)");
+ pthread_mutex_unlock(&g_speak_data_mutex);
+
+ return TTSD_ERROR_OUT_OF_MEMORY;
+ }
+ SLOG(LOG_ERROR, tts_tag(), "[DATA][%p] utt_id(%d), text(%s), lang(%s), vctype(%d), speed(%d)",
+ *iter, (*iter)->utt_id, (*iter)->text, (*iter)->lang, (*iter)->vctype, (*iter)->speed);
if (1 == data->utt_id)
g_app_list[index].utt_id_stopped = 0;
#ifdef DATA_DEBUG
__data_show_text_list(index);
-#endif
+#endif
+ pthread_mutex_unlock(&g_speak_data_mutex);
+
return TTSD_ERROR_NONE;
}
index = ttsd_data_is_client(uid);
if (index < 0) {
- SECURE_SLOG(LOG_ERROR, get_tag(), "[DATA ERROR] uid is not valid(%d)", uid);
+ SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] uid is not valid(%d)", uid);
return TTSD_ERROR_INVALID_PARAMETER;
}
+ /* mutex is locked */
+ pthread_mutex_lock(&g_speak_data_mutex);
+
if (0 == g_app_list[index].m_speak_data.size()) {
#ifdef DATA_DEBUG
- SLOG(LOG_WARN, get_tag(), "[DATA WARNING] There is no speak data");
-#endif
+ SLOG(LOG_WARN, tts_tag(), "[DATA WARNING] There is no speak data");
+#endif
+ pthread_mutex_unlock(&g_speak_data_mutex);
return -1;
}
std::list<speak_data_s*>::iterator iter = g_app_list[index].m_speak_data.begin();
*data = *iter;
- g_app_list[index].m_speak_data.pop_front();
+ if (!g_app_list[index].m_speak_data.empty())
+ g_app_list[index].m_speak_data.pop_front();
#ifdef DATA_DEBUG
__data_show_text_list(index);
-#endif
+#endif
+ pthread_mutex_unlock(&g_speak_data_mutex);
+
return TTSD_ERROR_NONE;
}
index = ttsd_data_is_client(uid);
if(index < 0) {
- SECURE_SLOG(LOG_ERROR, get_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
+ SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
return TTSD_ERROR_INVALID_PARAMETER;
}
if (NULL == data) {
- SLOG(LOG_ERROR, get_tag(), "[DATA ERROR] sound data is NULL");
+ SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] sound data is NULL");
return TTSD_ERROR_INVALID_PARAMETER;
}
/* mutex is locked */
pthread_mutex_lock(&g_sound_data_mutex);
- g_app_list[index].m_wav_data.insert(g_app_list[index].m_wav_data.end(), data);
+ std::list<sound_data_s*>::iterator iter;
+
+ try {
+ iter = g_app_list[index].m_wav_data.insert(g_app_list[index].m_wav_data.end(), data);
+ } catch (const std::bad_alloc&) {
+ SLOG(LOG_ERROR, tts_tag(), "[DATA][ERROR] Fail to insert m_sound_data (bad_alloc)");
+ pthread_mutex_unlock(&g_sound_data_mutex);
+
+ return TTSD_ERROR_OUT_OF_MEMORY;
+ }
+ SLOG(LOG_ERROR, tts_tag(), "[DATA][%p] utt_id(%d), data(%p)", *iter, (*iter)->utt_id, (*iter)->data);
#ifdef DATA_DEBUG
__data_show_sound_list(index);
-#endif
+#endif
/* mutex is unlocked */
pthread_mutex_unlock(&g_sound_data_mutex);
index = ttsd_data_is_client(uid);
if (index < 0) {
- SECURE_SLOG(LOG_ERROR, get_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
+ SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
return TTSD_ERROR_INVALID_PARAMETER;
}
if (0 == g_app_list[index].m_wav_data.size()) {
#ifdef DATA_DEBUG
- SLOG(LOG_DEBUG, get_tag(), "[DATA] There is no wav data");
+ SLOG(LOG_DEBUG, tts_tag(), "[DATA] There is no wav data");
#endif
/* mutex is unlocked */
pthread_mutex_unlock(&g_sound_data_mutex);
std::list<sound_data_s*>::iterator iter = g_app_list[index].m_wav_data.begin();
*data = *iter;
- g_app_list[index].m_wav_data.pop_front();
+ if (!g_app_list[index].m_wav_data.empty())
+ g_app_list[index].m_wav_data.pop_front();
#ifdef DATA_DEBUG
__data_show_sound_list(index);
-#endif
+#endif
/* mutex is unlocked */
pthread_mutex_unlock(&g_sound_data_mutex);
int ttsd_data_get_sound_data_size(int uid)
{
int index = 0;
+ int data_size = 0;
index = ttsd_data_is_client(uid);
if (index < 0) {
- SECURE_SLOG(LOG_ERROR, get_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
+ SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
return TTSD_ERROR_INVALID_PARAMETER;
}
- return g_app_list[index].m_wav_data.size();
+ /* mutex is locked */
+ pthread_mutex_lock(&g_sound_data_mutex);
+ data_size = g_app_list[index].m_wav_data.size();
+
+ /* mutex is unlocked */
+ pthread_mutex_unlock(&g_sound_data_mutex);
+
+ return data_size;
}
int ttsd_data_clear_data(int uid)
index = ttsd_data_is_client(uid);
if (index < 0) {
- SECURE_SLOG(LOG_ERROR, get_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
+ SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
return TTSD_ERROR_INVALID_PARAMETER;
}
}
if (NULL != temp_speak) {
- SLOG(LOG_DEBUG, get_tag(), "[DEBUG] utt(%d), text(%s), lang(%s), vctype(%d) speed(%d)",
+ SLOG(LOG_DEBUG, tts_tag(), "[DEBUG] utt(%d), text(%s), lang(%s), vctype(%d) speed(%d)",
temp_speak->utt_id, temp_speak->text, temp_speak->lang, temp_speak->vctype, temp_speak->speed);
if (NULL != temp_speak->text) {
}
if (NULL != temp_sound) {
- SLOG(LOG_ERROR, get_tag(), "[DEBUG][%p] uid(%d), event(%d) data(%p) size(%d) rate(%d) utt(%d)",
+ SLOG(LOG_ERROR, tts_tag(), "[DEBUG][%p] uid(%d), event(%d) data(%p) size(%d) rate(%d) utt(%d)",
temp_sound, uid, temp_sound->event, temp_sound->data, temp_sound->data_size, temp_sound->rate, temp_sound->utt_id);
if (NULL != temp_sound->data) {
}
}
+ pthread_mutex_lock(&g_speak_data_mutex);
g_app_list[index].m_speak_data.clear();
+ pthread_mutex_unlock(&g_speak_data_mutex);
+
+ pthread_mutex_lock(&g_sound_data_mutex);
g_app_list[index].m_wav_data.clear();
+ pthread_mutex_unlock(&g_sound_data_mutex);
return TTSD_ERROR_NONE;
}
-int ttsd_data_get_client_state(int uid, app_state_e* state)
+int ttsd_data_get_client_state(int uid, app_tts_state_e* state)
{
int index = 0;
index = ttsd_data_is_client(uid);
if (index < 0) {
- SECURE_SLOG(LOG_ERROR, get_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
+ SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
return TTSD_ERROR_INVALID_PARAMETER;
}
return TTSD_ERROR_NONE;
}
-int ttsd_data_set_client_state(int uid, app_state_e state)
+int ttsd_data_set_client_state(int uid, app_tts_state_e state)
{
int index = 0;
index = ttsd_data_is_client(uid);
if (index < 0) {
- SECURE_SLOG(LOG_ERROR, get_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
+ SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
return TTSD_ERROR_INVALID_PARAMETER;
}
/* The client of playing state of all clients is only one. need to check state. */
if (APP_STATE_PLAYING == state) {
int vsize = g_app_list.size();
- for (int i=0 ; i<vsize ; i++) {
+ for (int i = 0; i < vsize; i++) {
if(g_app_list[i].state == APP_STATE_PLAYING) {
- SLOG(LOG_ERROR, get_tag(), "[DATA ERROR] A playing client has already existed.");
+ SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] A playing client has already existed.");
return -1;
}
}
{
int vsize = g_app_list.size();
- for (int i=0; i<vsize; i++) {
+ for (int i = 0; i < vsize; i++) {
if (APP_STATE_PLAYING == g_app_list[i].state) {
- SLOG(LOG_DEBUG, get_tag(), "[DATA] uid(%d) is playing", g_app_list[i].uid);
+ SLOG(LOG_DEBUG, tts_tag(), "[DATA] uid(%d) is playing", g_app_list[i].uid);
return g_app_list[i].uid;
}
}
int ttsd_data_foreach_clients(ttsd_data_get_client_cb callback, void* user_data)
{
if (NULL == callback) {
- SLOG(LOG_ERROR, get_tag(), "[DATA ERROR] input data is NULL!!");
+ SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] input data is NULL!!");
return -1;
}
#ifdef DATA_DEBUG
__data_show_list();
-#endif
-
+#endif
+
/* Copy app info */
vector<app_data_s> temp_app_list;
int vsize = g_app_list.size();
}
for (i = 0;i < vsize;i++) {
- SECURE_SLOG(LOG_DEBUG, get_tag(), "[%dth] pid(%d), uid(%d), state(%d)", i, temp_app_list[i].pid, temp_app_list[i].uid, temp_app_list[i].state);
+ SECURE_SLOG(LOG_DEBUG, tts_tag(), "[%dth] pid(%d), uid(%d), state(%d)", i, temp_app_list[i].pid, temp_app_list[i].uid, temp_app_list[i].state);
if (false == callback(temp_app_list[i].pid, temp_app_list[i].uid, temp_app_list[i].state, user_data)) {
break;
}
for (i = 0;i < vsize;i++) {
temp_app_list.erase(temp_app_list.begin());
}
-
+
return 0;
}
index = ttsd_data_is_client(uid);
if (index < 0) {
- SECURE_SLOG(LOG_ERROR, get_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
- return TTSD_ERROR_INVALID_PARAMETER;
+ SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
+ return false;
}
if (uttid < g_app_list[index].utt_id_stopped)
{
int vsize = g_app_list.size();
- for (int i=0; i<vsize; i++) {
+ for (int i = 0; i < vsize; i++) {
if(g_app_list[i].state == APP_STATE_PLAYING) {
- return g_app_list[i].uid;
+ return g_app_list[i].uid;
}
}
for (int i = 0;i < vsize;i++) {
if(g_app_list[i].pid == pid) {
- number++;
+ number++;
}
}
/* pid */
pid = ttsd_data_get_pid(uid);
if (0 > pid) {
- SLOG(LOG_ERROR, get_tag(), "[ERROR] Fail to get pid");
+ SLOG(LOG_ERROR, tts_tag(), "[ERROR] Fail to get pid");
} else {
fprintf(fp, "pid - %d", pid);
}
/* app state */
- app_state_e state;
+ app_tts_state_e state;
ret = ttsd_data_get_client_state(uid, &state);
if (0 != ret) {
- SLOG(LOG_ERROR, get_tag(), "[ERROR] Fail to get app state");
+ SLOG(LOG_ERROR, tts_tag(), "[ERROR] Fail to get app state");
} else {
fprintf(fp, "app state - %d", state);
}
index = ttsd_data_is_client(uid);
if (0 > index) {
- SLOG(LOG_ERROR, get_tag(), "[ERROR] Invalid client");
+ SLOG(LOG_ERROR, tts_tag(), "[ERROR] Invalid client");
return -1;
}
i = 0;
std::list<sound_data_s*>::iterator iter;
- for (iter = g_app_list[index].m_wav_data.begin(); iter != g_app_list[index].m_wav_data.end(); iter++) {
- SLOG(LOG_DEBUG, get_tag(), "[%dth][%p] data(%p) data size(%ld), uttid(%d), type(%d)",
+ for (iter = g_app_list[index].m_wav_data.begin(); iter != g_app_list[index].m_wav_data.end(); ++iter) {
+ SLOG(LOG_DEBUG, tts_tag(), "[%dth][%p] data(%p) data size(%d), uttid(%d), type(%d)",
i, *iter, (*iter)->data, (*iter)->data_size, (*iter)->utt_id, (*iter)->audio_type);
i++;
}
fprintf(fp, "----------------------");
-
+
/* get speck data */
fprintf(fp, "----- Text list -----");
i = 0;
std::list<speak_data_s*>::iterator iter_speak;
- for (iter_speak = g_app_list[index].m_speak_data.begin(); iter_speak != g_app_list[index].m_speak_data.end(); iter_speak++) {
- SLOG(LOG_DEBUG, get_tag(), "[%dth][%p] lang(%s), vctype(%d), speed(%d), uttid(%d), text(%s)",
+ for (iter_speak = g_app_list[index].m_speak_data.begin(); iter_speak != g_app_list[index].m_speak_data.end(); ++iter_speak) {
+ SLOG(LOG_DEBUG, tts_tag(), "[%dth][%p] lang(%s), vctype(%d), speed(%d), uttid(%d), text(%s)",
i, *iter_speak, (*iter_speak)->lang, (*iter_speak)->vctype, (*iter_speak)->speed, (*iter_speak)->utt_id, (*iter_speak)->text);
i++;
}
fprintf(fp, "---------------------");
-
+
return 0;
}
projects / platform / core / uifw / tts.git / blobdiff