Merge "Add parsing extra voice info xml" into tizen

diff --git a/client/tts.c b/client/tts.c
index 54420f9..188af5b 100644 (file)
--- a/client/tts.c
+++ b/client/tts.c
@@ -514,6 +514,7 @@ int tts_set_credential(tts_h tts, const char* credential)
        return TTS_ERROR_NONE;
 }
 
+//LCOV_EXCL_START
 int tts_set_server_tts(tts_h tts, const char* credential)
 {
        if (0 != __tts_get_feature_enabled()) {
@@ -598,6 +599,7 @@ int tts_set_server_tts(tts_h tts, const char* credential)
 
        return TTS_ERROR_NONE;
 }
+// LCOV_EXCL_STOP
 
 static Eina_Bool __tts_connect_daemon(void *data)
 {
@@ -711,6 +713,7 @@ int tts_prepare(tts_h tts)
        return TTS_ERROR_NONE;
 }
 
+//LCOV_EXCL_START
 int tts_prepare_sync(tts_h tts)
 {
        if (0 != __tts_get_feature_enabled()) {
@@ -749,6 +752,7 @@ int tts_prepare_sync(tts_h tts)
 
        return TTS_ERROR_NONE;
 }
+//LCOV_EXCL_STOP
 
 int tts_unprepare(tts_h tts)
 {
@@ -1233,6 +1237,7 @@ int tts_add_text(tts_h tts, const char* text, const char* language, int voice_ty
        return ret;
 }
 
+//LCOV_EXCL_START
 static void __tts_play_async(void *data)
 {
        tts_h tts = (tts_h)data;
@@ -1339,7 +1344,7 @@ int tts_play_async(tts_h tts)
 
        return TTS_ERROR_NONE;
 }
-
+//LCOV_EXCL_STOP
 int tts_play(tts_h tts)
 {
        if (0 != __tts_get_feature_enabled()) {
@@ -1419,7 +1424,7 @@ int tts_play(tts_h tts)
 
        return TTS_ERROR_NONE;
 }
-
+//LCOV_EXCL_START
 static void __tts_stop_async(void *data)
 {
        tts_h tts = (tts_h)data;
@@ -1521,7 +1526,7 @@ int tts_stop_aync(tts_h tts)
 
        return TTS_ERROR_NONE;
 }
-
+//LCOV_EXCL_STOP
 int tts_stop(tts_h tts)
 {
        if (0 != __tts_get_feature_enabled()) {
@@ -1595,7 +1600,7 @@ int tts_stop(tts_h tts)
 
        return TTS_ERROR_NONE;
 }
-
+//LCOV_EXCL_START
 static void __tts_pause_async(void *data)
 {
        tts_h tts = (tts_h)data;
@@ -1698,7 +1703,7 @@ int tts_pause_async(tts_h tts)
 
        return TTS_ERROR_NONE;
 }
-
+//LCOV_EXCL_STOP
 int tts_pause(tts_h tts)
 {
        if (0 != __tts_get_feature_enabled()) {
@@ -2492,6 +2497,7 @@ int tts_unset_engine_changed_cb(tts_h tts)
        return 0;
 }
 
+//LCOV_EXCL_START
 int tts_add_pcm(tts_h tts, int event, const void* data, unsigned int data_size, int audio_type, int rate)
 {
        if (0 != __tts_get_feature_enabled()) {
@@ -2796,3 +2802,4 @@ int tts_repeat(tts_h tts, char** text_repeat, int* utt_id)
 
        return TTS_ERROR_NONE;
 }
+//LCOV_EXCL_STOP

diff --git a/client/tts_dbus.c b/client/tts_dbus.c
index 71015b6..d1c1953 100644 (file)
--- a/client/tts_dbus.c
+++ b/client/tts_dbus.c
@@ -355,7 +355,7 @@ int tts_dbus_request_hello(int uid)
        result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, HELLO_WAITING_TIME, &err);
        dbus_message_unref(msg);
        if (dbus_error_is_set(&err)) {
-               SLOG(LOG_DEBUG, TAG_TTSC, "<<<< tts dbus log : %s", err);
+               SLOG(LOG_DEBUG, TAG_TTSC, "<<<< tts dbus log : %s", err.message);
                dbus_error_free(&err);
        }
 

diff --git a/server/ttsd_player.c b/server/ttsd_player.c
index 20a9eb4..c259ad8 100644 (file)
--- a/server/ttsd_player.c
+++ b/server/ttsd_player.c
@@ -351,7 +351,7 @@ int ttsd_player_check_current_playback_focus(bool *is_current_interrupt)
 
                ret = sound_manager_get_current_playback_focus(&reason, &sound_behavior, &extra_info);
 
-               SLOG(LOG_DEBUG, tts_tag(), "[Player] current playback focus: extra_info(%s), reason(%d), sound_behavior(%d)", extra_info, reason, sound_behavior, extra_info);
+               SLOG(LOG_DEBUG, tts_tag(), "[Player] current playback focus: extra_info(%s), reason(%d), sound_behavior(%d)", extra_info, reason, sound_behavior);
 
                if (SOUND_MANAGER_ERROR_NONE == ret && NULL != extra_info && 0 < strlen(extra_info)) {
                        if (SOUND_STREAM_FOCUS_CHANGED_BY_VOICE_INFORMATION == reason && 0 == strncmp(extra_info, "TTSD_MODE_INTERRUPT", strlen(extra_info))) {