diff options
| author | NAMJEONGYOON <just.nam@samsung.com> | 2016-11-22 13:22:24 +0900 |
|---|---|---|
| committer | NAMJEONGYOON <just.nam@samsung.com> | 2016-11-22 13:22:24 +0900 |
| commit | b9c056fc3b1f88d325e8ea61a0e9cea2442de84a (patch) | |
| tree | 669b1fc897cf89f3b445ad35c977c4a51a7374cb | |
| parent | a24d9ed511a6fb0f475df83b736479dc12032023 (diff) | |
| parent | 660e2936ec2ded6b130fe8b720453a886fc1a064 (diff) | |
| download | libmm-player-accepted/tizen/3.0/wearable/20161123.083605.tar.gz libmm-player-accepted/tizen/3.0/wearable/20161123.083605.tar.bz2 libmm-player-accepted/tizen/3.0/wearable/20161123.083605.zip | |
Merge branch 'tizen' into tizen_3.0submit/tizen_3.0/20161122.043110submit/tizen/20161122.044017accepted/tizen/wearable/20161122.235849accepted/tizen/tv/20161122.235812accepted/tizen/mobile/20161122.235728accepted/tizen/ivi/20161122.235942accepted/tizen/common/20161122.192932accepted/tizen/3.0/wearable/20161123.083605accepted/tizen/3.0/tv/20161123.083512accepted/tizen/3.0/mobile/20161123.083405accepted/tizen/3.0/ivi/20161123.083652accepted/tizen/3.0/common/20161123.140810
Change-Id: Ib92c57ee0104f6a6bee37bd315e363fc98695e62
| -rw-r--r-- | packaging/libmm-player.spec | 2 | ||||
| -rw-r--r-- | src/mm_player_resource.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec index c38c4ed..72bd49d 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.13 +Version: 0.6.14 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/mm_player_resource.c b/src/mm_player_resource.c index 7c7e879..5474c0e 100644 --- a/src/mm_player_resource.c +++ b/src/mm_player_resource.c @@ -296,8 +296,8 @@ static int set_resource_release_cb(MMPlayerResourceManager *resource_manager) static gpointer __mmplayer_launch_glib_murphy_loop(void *user_data) { - LOGI("Run mrp_loop"); MMPlayerResourceManager *resource_manager= (MMPlayerResourceManager *)user_data; + LOGI("Run mrp_loop"); g_main_loop_run(resource_manager->mrp_loop); LOGI("Murphy glib loop exit"); return NULL; @@ -484,15 +484,21 @@ int _mmplayer_resource_manager_deinit(MMPlayerResourceManager *resource_manager) mrp_res_delete_resource_set(resource_manager->rset); resource_manager->rset = NULL; } + if (resource_manager->context) { mrp_res_destroy(resource_manager->context); resource_manager->context = NULL; } + if (resource_manager->mrp_loop) { g_main_loop_quit(resource_manager->mrp_loop); + g_main_loop_unref(resource_manager->mrp_loop); resource_manager->mrp_loop = NULL; } + g_thread_join(resource_manager->starter); + g_thread_unref(resource_manager->starter); + resource_manager->starter = NULL; if (resource_manager->mloop) { mrp_mainloop_destroy(resource_manager->mloop); |