From: Jiyong Min <jiyong.min@samsung.com>
Date: Tue, 5 Jul 2016 04:09:23 +0000 (+0900)
Subject: Fix return value after face detection is completed
X-Git-Tag: accepted/tizen/common/20160706.141809~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f967eb592da1662cb65a6da52f7646beb71dca72;p=platform%2Fcore%2Fmultimedia%2Fmedia-server.git

Fix return value after face detection is completed

Change-Id: I1bc360cd676cf3fea340250bd54b925ef4f6806b
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>
---

diff --git a/lib/media-util-dcm.c b/lib/media-util-dcm.c
index 0ceba43..1c0c835 100644
--- a/lib/media-util-dcm.c
+++ b/lib/media-util-dcm.c
@@ -194,19 +194,14 @@ gboolean __media_dcm_write_socket(GIOChannel *src, GIOCondition condition, gpoin
 		return FALSE;
 	}
 
-	MSAPI_DBG("Completed.. %s", recv_msg.msg);
-
-	if (recv_msg.msg_type != 0) {
-		MSAPI_DBG_ERR("Failed to run dcm(%d)", recv_msg.msg_type);
-		err = MS_MEDIA_ERR_INTERNAL;
-	}
+	MSAPI_DBG("Completed.. %d, %s, %d", recv_msg.msg_type, recv_msg.msg, recv_msg.result);
 
 	if (__media_dcm_check_cancel()) {
 		MSAPI_DBG_ERR("__media_dcm_check_cancel is true");
 		if (data) {
 			faceUserData* cb = (faceUserData*)data;
 			if (cb->func != NULL) {
-				cb->func(err, (int)(recv_msg.result), cb->user_data);
+				cb->func(recv_msg.msg_type, (int)(recv_msg.result), cb->user_data);
 			}
 		}
 	}
diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index abcabcd..bcaf38f 100755
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.2.94
+Version:    0.2.95
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0
diff --git a/src/server/media-server-dcm.c b/src/server/media-server-dcm.c
index 9b8b3a5..723e8a9 100644
--- a/src/server/media-server-dcm.c
+++ b/src/server/media-server-dcm.c
@@ -316,7 +316,7 @@ gboolean _ms_dcm_agent_send_msg_to_dcm_server(dcmMsg *recv_msg, dcmMsg *res_msg)
 		return FALSE;
 	}
 
-	MS_DBG_SLOG("recv %s from DCM daemon is successful", res_msg->msg);
+	MS_DBG_SLOG("recv %s(%d, %d) from DCM daemon is successful", res_msg->msg, res_msg->msg_type, res_msg->result);
 	ms_ipc_delete_client_socket(&sock_info);
 
 	if (res_msg->msg_type == 1 && g_dcm_comm_sock > 0) { /* DCM_REQUEST_ALL_MEDIA */