From: Eunhae Choi <eunhae1.choi@samsung.com>
Date: Mon, 17 Dec 2018 12:48:27 +0000 (+0900)
Subject: [0.6.162] check resource manager daemon state
X-Git-Tag: submit/tizen/20181218.081409~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a928e9791f99df12aa6ec5a39cfe852458067dc9;p=platform%2Fcore%2Fmultimedia%2Flibmm-player.git

[0.6.162] check resource manager daemon state

- check 'resource manager ready' file before creating the rm handle
  to clarify the error case

Change-Id: I1177a825aed22c238110fbe24792ba29e1a156a6
---

diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec
index 8e8b501..cb27e2f 100644
--- a/packaging/libmm-player.spec
+++ b/packaging/libmm-player.spec
@@ -1,6 +1,6 @@
 Name:       libmm-player
 Summary:    Multimedia Framework Player Library
-Version:    0.6.161
+Version:    0.6.162
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0
diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c
index e6cef96..cddddb5 100644
--- a/src/mm_player_priv.c
+++ b/src/mm_player_priv.c
@@ -4417,11 +4417,18 @@ _mmplayer_create_player(MMHandleType handle)
 		goto ERROR;
 	}
 
+	/* check resource manager state */
+	if (access(MM_RESOURCE_MANAGER_READY, F_OK) != 0) {
+		LOGE("resource manager is not ready");
+		ret = MM_ERROR_PLAYER_INTERNAL;
+		goto ERROR;
+	}
+
 	/* initialize resource manager */
-	if (MM_RESOURCE_MANAGER_ERROR_NONE != mm_resource_manager_create(
-			MM_RESOURCE_MANAGER_APP_CLASS_MEDIA, __resource_release_cb, player,
-			&player->resource_manager)) {
-		LOGE("failed to initialize resource manager\n");
+	if (mm_resource_manager_create(MM_RESOURCE_MANAGER_APP_CLASS_MEDIA,
+		__resource_release_cb, player, &player->resource_manager)
+		!= MM_RESOURCE_MANAGER_ERROR_NONE) {
+		LOGE("failed to initialize resource manager");
 		ret = MM_ERROR_PLAYER_INTERNAL;
 		goto ERROR;
 	}
@@ -4486,6 +4493,8 @@ _mmplayer_create_player(MMHandleType handle)
 	MMPLAYER_STATE_CHANGE_TIMEOUT(player) = player->ini.localplayback_state_change_timeout;
 	MMPLAYER_SET_STATE(player, MM_PLAYER_STATE_NULL);
 
+	MMPLAYER_FLEAVE();
+
 	return MM_ERROR_NONE;
 
 ERROR: