From: Eunhae Choi <eunhae1.choi@samsung.com>
Date: Thu, 12 May 2016 04:44:46 +0000 (+0900)
Subject: revert the max server timeout to sec
X-Git-Tag: accepted/tizen/common/20160517.174336~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F59%2F69159%2F1;p=platform%2Fcore%2Fapi%2Fplayer.git

revert the max server timeout to sec

Change-Id: I5305d595257653409ee8985b6699c1434ddc4e11
---

diff --git a/include/player_private.h b/include/player_private.h
index 65cb073..5fc5029 100644
--- a/include/player_private.h
+++ b/include/player_private.h
@@ -45,8 +45,8 @@ extern "C" {
 #define PLAYER_NULL_ARG_CHECK(arg)      \
 		PLAYER_CHECK_CONDITION(arg != NULL, PLAYER_ERROR_INVALID_PARAMETER, "PLAYER_ERROR_INVALID_PARAMETER")
 
-#define CALLBACK_TIME_OUT 5000
-#define MAX_SERVER_TIME_OUT 35000
+#define CALLBACK_TIME_OUT (5*1000) /* ms */
+#define MAX_SERVER_TIME_OUT 35     /* sec */
 
 typedef struct _ret_msg_s {
 	gint api;
@@ -95,7 +95,7 @@ typedef struct _callback_cb_info {
 
 typedef struct {
 	intptr_t bo;
-	gint timeout;
+	gint timeout; /* sec */
 } server_info_s;
 
 typedef struct _player_cli_s {
@@ -120,7 +120,7 @@ typedef struct _player_cli_s {
 
 /* server tbm bo */
 #define SERVER_TBM_BO(h)	((h)->server.bo)
-/* server state change timeout */
+/* server state change timeout (sec) */
 #define SERVER_TIMEOUT(h)		((h)->server.timeout)
 
 int player_set_evas_object_cb(player_h player, Evas_Object * eo);
diff --git a/src/player.c b/src/player.c
index f2ea1ef..96ffe1b 100644
--- a/src/player.c
+++ b/src/player.c
@@ -1106,7 +1106,7 @@ int client_get_api_timeout(player_cli_s * pc, muse_player_api_e api)
 		break;
 	}
 	timeout += CALLBACK_TIME_OUT;
-	return timeout;
+	return timeout;	/* ms */
 }
 
 int client_wait_for_cb_return(muse_player_api_e api, callback_cb_info_s * cb_info, char **ret_buf, int time_out)