From: Suyeon Hwang Date: Thu, 20 Jan 2022 03:11:15 +0000 (+0900) Subject: Remove ttsd_player_resume() X-Git-Tag: submit/tizen/20220325.021820~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4733bb9cb067ec5dba64f51368c8f82300d7fac5;p=platform%2Fcore%2Fuifw%2Ftts.git Remove ttsd_player_resume() Change-Id: Iea7fdeeef07dc83f4a75997c4b9c5ecf2aa5dbb9 Signed-off-by: Suyeon Hwang --- diff --git a/server/ttsd_player.cpp b/server/ttsd_player.cpp index 5a520c94..05c12c9e 100644 --- a/server/ttsd_player.cpp +++ b/server/ttsd_player.cpp @@ -503,26 +503,6 @@ int ttsd_player_pause(unsigned int uid) return 0; } -int ttsd_player_resume(unsigned int uid) -{ - SLOG(LOG_DEBUG, tts_tag(), "[Player] Resume player : uid(%u)", uid); - - if (false == g_player_init) { - SLOG(LOG_ERROR, tts_tag(), "[Player ERROR] Not Initialized"); - return TTSD_ERROR_OPERATION_FAILED; - } - - if (0 > ttsd_data_is_client(uid)) { - SLOG(LOG_ERROR, tts_tag(), "[Player ERROR] uid(%u) is not valid", uid); - return -1; - } - - SLOG(LOG_INFO, tts_tag(), "[Player] Resume to run thread"); - g_player_thread->requestPlay(uid); - - return 0; -} - bool __stop_all_client_callback(int pid, unsigned int uid, app_tts_state_e state, void* user_data) { if (0 > ttsd_data_is_client(uid)) { diff --git a/server/ttsd_player.h b/server/ttsd_player.h index d029ccb2..b2ac2a03 100644 --- a/server/ttsd_player.h +++ b/server/ttsd_player.h @@ -45,8 +45,6 @@ int ttsd_player_stop(unsigned int uid); int ttsd_player_pause(unsigned int uid); -int ttsd_player_resume(unsigned int uid); - int ttsd_player_all_stop(); int ttsd_player_set_background_volume_ratio(double ratio); diff --git a/server/ttsd_server.c b/server/ttsd_server.c index a1611bfe..7cb042a6 100644 --- a/server/ttsd_server.c +++ b/server/ttsd_server.c @@ -1004,14 +1004,8 @@ int ttsd_server_play(unsigned int uid, const char* credential) return TTSD_ERROR_OPERATION_FAILED; } - if (APP_STATE_PAUSED == state) { - SLOG(LOG_DEBUG, tts_tag(), "[Server] uid(%u) is 'Pause' state : resume player", uid); - ret = ttsd_player_resume(uid); - } else { - SLOG(LOG_DEBUG, tts_tag(), "[Server] Play player. uid(%u)", uid); - ret = ttsd_player_play(uid); - } - + SLOG(LOG_DEBUG, tts_tag(), "[Server] Play player. uid(%u)", uid); + ret = ttsd_player_play(uid); if (TTSD_ERROR_NONE != ret) { SLOG(LOG_ERROR, tts_tag(), "[Server ERROR] Fail to play sound : uid(%u)", uid); ttsd_data_set_client_state(uid, state); @@ -1241,14 +1235,8 @@ int ttsd_server_play_pcm(unsigned int uid) return TTSD_ERROR_OPERATION_FAILED; } - if (APP_STATE_PAUSED == state) { - SLOG(LOG_DEBUG, tts_tag(), "[Server] uid(%u) is 'Pause' state : resume player", uid); - ret = ttsd_player_resume(uid); - } else { - SLOG(LOG_DEBUG, tts_tag(), "[Server] Play player. uid(%u)", uid); - ret = ttsd_player_play(uid); - } - + SLOG(LOG_DEBUG, tts_tag(), "[Server] Play player. uid(%u)", uid); + ret = ttsd_player_play(uid); if (TTSD_ERROR_NONE != ret) { SLOG(LOG_ERROR, tts_tag(), "[Server ERROR] Fail to play sound : uid(%u)", uid); ttsd_data_set_client_state(uid, state);