[0.6.101] Disconnect bus watch before destroy msg threadsubmit/tizen_4.0/20180620.044015accepted/tizen/4.0/unified/20180629.124831

- remove unused value and defines

Change-Id: I4bf17e078be040d9222dcc4db1ac678b88b8d13c

3 files changed, 5 insertions, 15 deletions

diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec
index 0aed82c..2b7a577 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.100
+Version:    0.6.101
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0
diff --git a/src/include/mm_player_priv.h b/src/include/mm_player_priv.h
index 7df59c0..c49b50c 100644
--- a/src/include/mm_player_priv.h
+++ b/src/include/mm_player_priv.h
@@ -583,7 +583,6 @@ typedef struct {
 	gboolean bus_msg_thread_exit;
 	GCond bus_msg_thread_cond;
 	GMutex bus_msg_thread_mutex;
-	gint bus_msg_timeout; /* ms */
 
 	/* fakesink handling lock */
 	GMutex fsink_lock;
diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c
index ddccc3d..529a0dd 100644
--- a/src/mm_player_priv.c
+++ b/src/mm_player_priv.c
@@ -103,9 +103,6 @@
 /* For PD mode */
 #define PLAYER_PD_EXT_MAX_SIZE_BYTE		1024 * 1024 * 3
 
-#define PLAYER_BUS_MSG_DEFAULT_TIMEOUT 500 /* bus msg wait timeout */
-#define PLAYER_BUS_MSG_PREPARE_TIMEOUT 10
-
 #define SPATIAL_AUDIO_CAPS "audio/x-raw,format=S16LE,channels=4"
 
 /*---------------------------------------------------------------------------
@@ -1103,7 +1100,10 @@ void _mmplayer_bus_msg_thread_destroy(MMHandleType hplayer)
 	MMPLAYER_FENTER();
 	MMPLAYER_RETURN_IF_FAIL(player);
 
-	player->bus_msg_timeout = PLAYER_BUS_MSG_DEFAULT_TIMEOUT;
+	/* disconnecting bus watch */
+	if (player->bus_watcher)
+		__mmplayer_remove_g_source_from_context(player->context.thread_default, player->bus_watcher);
+	player->bus_watcher = 0;
 
 	/* destroy the gst bus msg thread */
 	if (player->bus_msg_thread) {
@@ -1542,7 +1542,6 @@ __mmplayer_gst_callback(GstMessage *msg, gpointer data)
 			case GST_STATE_PAUSED:
 				{
 					gboolean prepare_async = FALSE;
-					player->bus_msg_timeout = PLAYER_BUS_MSG_DEFAULT_TIMEOUT;
 
 					if (!player->audio_cb_probe_id && player->set_mode.pcm_extraction && !player->audio_stream_render_cb_ex)
 						__mmplayer_configure_audio_callback(player);
@@ -1572,8 +1571,6 @@ __mmplayer_gst_callback(GstMessage *msg, gpointer data)
 
 			case GST_STATE_PLAYING:
 				{
-					player->bus_msg_timeout = PLAYER_BUS_MSG_DEFAULT_TIMEOUT;
-
 					if (MMPLAYER_IS_STREAMING(player)) {
 						// managed prepare async case when buffering is completed
 						// pending state should be reset otherwise, it's still playing even though it's resumed after bufferging.
@@ -7053,7 +7050,6 @@ __mmplayer_gst_create_pipeline(mm_player_t* player)
 	g_mutex_init(&player->bus_msg_thread_mutex);
 	g_cond_init(&player->bus_msg_thread_cond);
 	player->bus_msg_thread_exit = FALSE;
-	player->bus_msg_timeout = PLAYER_BUS_MSG_DEFAULT_TIMEOUT;
 	player->bus_msg_thread =
 		g_thread_try_new("gst_bus_msg_thread", __mmplayer_gst_bus_msg_thread, (gpointer)player, NULL);
 	if (!player->bus_msg_thread) {
@@ -7163,10 +7159,6 @@ __mmplayer_gst_destroy_pipeline(mm_player_t* player)
 		/* first we need to disconnect all signal hander */
 		__mmplayer_release_signal_connection(player, MM_PLAYER_SIGNAL_TYPE_ALL);
 
-		if (player->bus_watcher)
-			__mmplayer_remove_g_source_from_context(player->context.thread_default, player->bus_watcher);
-		player->bus_watcher = 0;
-
 		if (mainbin) {
 			MMPlayerGstElement* audiobin = player->pipeline->audiobin;
 			MMPlayerGstElement* videobin = player->pipeline->videobin;
@@ -9288,7 +9280,6 @@ _mmplayer_realize(MMHandleType hplayer)
 	else
 		ret = __mmplayer_realize_streaming_ext(player);
 
-	player->bus_msg_timeout = PLAYER_BUS_MSG_PREPARE_TIMEOUT;
 	MMPLAYER_BUS_MSG_THREAD_SIGNAL(player);
 
 	MMPLAYER_FLEAVE();