summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSangchul Lee <sc11.lee@samsung.com>2017-03-22 17:19:52 +0900
committerSangchul Lee <sc11.lee@samsung.com>2017-03-22 17:23:57 +0900
commitb1f8134eefc1c831f8fa75d71a2c94dfed326e8c (patch)
tree50ad8617066b1d08e0c200def55b63f622f75207
parent6a3c521c93e5f7f3bd4eafb8b16b99090f060913 (diff)
downloadlibmm-player-b1f8134eefc1c831f8fa75d71a2c94dfed326e8c.tar.gz
libmm-player-b1f8134eefc1c831f8fa75d71a2c94dfed326e8c.tar.bz2
libmm-player-b1f8134eefc1c831f8fa75d71a2c94dfed326e8c.zip
[0.6.37] do not set acquired flag to true in case of focus callback for resumption
That flag(player->sound_focus.acquired) will be set when start/resume player. Fill ext_info parameter when acquiring/releasing internal focus. Change-Id: I9eaf04da5c378157a87af607a409546bcc841845 Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>
-rw-r--r--packaging/libmm-player.spec2
-rw-r--r--src/mm_player_priv.c1
-rw-r--r--src/mm_player_sound_focus.c4
3 files changed, 3 insertions, 4 deletions
diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec
index 7be12bd..a64f63c 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.36
+Version: 0.6.37
Release: 0
Group: Multimedia/Libraries
License: Apache-2.0
diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c
index 63a78c5..0e4e5b0 100644
--- a/src/mm_player_priv.c
+++ b/src/mm_player_priv.c
@@ -8379,7 +8379,6 @@ __mmplayer_sound_focus_callback(int id, mm_sound_focus_type_e focus_type, mm_sou
}
} else if (focus_state == FOCUS_IS_ACQUIRED) {
LOGW("FOCUS_IS_ACQUIRED: Got msg from asm to resume");
- player->sound_focus.acquired = TRUE;
player->sound_focus.antishock = TRUE;
player->sound_focus.by_asm_cb = FALSE;
diff --git a/src/mm_player_sound_focus.c b/src/mm_player_sound_focus.c
index d38414c..5088a76 100644
--- a/src/mm_player_sound_focus.c
+++ b/src/mm_player_sound_focus.c
@@ -132,7 +132,7 @@ _mmplayer_sound_acquire_focus(MMPlayerSoundFocus* sound_focus)
if (_mmplayer_is_using_internal_sound_focus(sound_focus)) {
- ret = mm_sound_acquire_focus(sound_focus->focus_id, FOCUS_FOR_BOTH, NULL);
+ ret = mm_sound_acquire_focus(sound_focus->focus_id, FOCUS_FOR_BOTH, "mm-player acquire focus");
if (ret != MM_ERROR_NONE) {
LOGE("failed to acquire sound focus\n");
return ret;
@@ -163,7 +163,7 @@ _mmplayer_sound_release_focus(MMPlayerSoundFocus* sound_focus)
}
if (_mmplayer_is_using_internal_sound_focus(sound_focus)) {
- ret = mm_sound_release_focus(sound_focus->focus_id, FOCUS_FOR_BOTH, NULL);
+ ret = mm_sound_release_focus(sound_focus->focus_id, FOCUS_FOR_BOTH, "mm-player release focus");
if (ret != MM_ERROR_NONE) {
LOGE("failed to release sound focus\n");
return ret;