Merge "Fix the size of app id" into tizen

diff --git a/server/sttd_recorder.c b/server/sttd_recorder.c
index e1b0e82..5f58a5d 100644 (file)
--- a/server/sttd_recorder.c
+++ b/server/sttd_recorder.c
@@ -714,10 +714,10 @@ int sttd_recorder_stop_file()
        return 0;
 }
 
-int sttd_recorder_reset()
+int sttd_recorder_clear()
 {
 #ifdef TV_BT_MODE
-       SLOG(LOG_DEBUG, TAG_STTD, "[Recorder DEBUG] Reset recorder on TV");
+       SLOG(LOG_DEBUG, TAG_STTD, "[Recorder DEBUG] Clear recorder on TV");
 
        if (STTD_RECORDER_STATE_RECORDING == g_recorder_state) {
                sttd_recorder_stop();

diff --git a/server/sttd_recorder.h b/server/sttd_recorder.h
index fa599c1..ec51764 100644 (file)
--- a/server/sttd_recorder.h
+++ b/server/sttd_recorder.h
@@ -46,7 +46,7 @@ int sttd_recorder_start_file(int uid, const char *filepath);
 
 int sttd_recorder_stop_file();
 
-int sttd_recorder_reset();
+int sttd_recorder_clear();
 
 #ifdef __cplusplus
 }

diff --git a/server/sttd_server.c b/server/sttd_server.c
index 0213b5e..38735c7 100644 (file)
--- a/server/sttd_server.c
+++ b/server/sttd_server.c
@@ -222,7 +222,7 @@ int __server_recognition_result_callback(stte_result_event_e event, const char*
                sttd_config_time_save();
                sttd_config_time_reset();
 
-               sttd_recorder_reset();
+               sttd_recorder_clear();
 
                sttd_client_set_state(uid, APP_STATE_READY);
                stt_client_unset_current_recognition();
@@ -1084,10 +1084,13 @@ void __sttd_server_recorder_start(void* data)
                return;
        }
 
-       /* Notify uid state change */
-       sttdc_send_set_state(uid, APP_STATE_RECORDING);
-
-       SLOG(LOG_DEBUG, TAG_STTD, "[Server SUCCESS] Start recognition");
+       app_state_e temp_app_state;
+       sttd_client_get_state(uid, &temp_app_state);
+       if (APP_STATE_READY != temp_app_state && 0 != stt_client_get_current_recognition()) {
+               /* Notify uid state change */
+               sttdc_send_set_state(uid, APP_STATE_RECORDING);
+               SLOG(LOG_DEBUG, TAG_STTD, "[Server SUCCESS] Start recognition");
+       }
 }
 
 void __sttd_start_sound_completed_cb(int id, void *user_data)
@@ -1210,6 +1213,8 @@ int sttd_server_start(int uid, const char* lang, const char* recognition_type, i
 
        g_recording_log_count = 0;
 
+       app_state_e temp_app_state;
+
        if (true == is_sound_done) {
                SLOG(LOG_DEBUG, TAG_STTD, "[Server] No sound play");
 
@@ -1226,8 +1231,11 @@ int sttd_server_start(int uid, const char* lang, const char* recognition_type, i
                        return ret;
                }
 
-               /* Notify uid state change */
-               sttdc_send_set_state(uid, APP_STATE_RECORDING);
+               sttd_client_get_state(uid, &temp_app_state);
+               if (APP_STATE_READY != temp_app_state && 0 != stt_client_get_current_recognition()) {
+                       /* Notify uid state change */
+                       sttdc_send_set_state(uid, APP_STATE_RECORDING);
+               }
 
                SLOG(LOG_DEBUG, TAG_STTD, "[Server SUCCESS] Start recognition");
                return STTD_RESULT_STATE_DONE;