From 6aa3936ffb8adc98dc00224d0ceb3d7f9b3b40ff Mon Sep 17 00:00:00 2001 From: "jongdong.lee" Date: Thu, 31 Jan 2013 16:11:54 +0900 Subject: [PATCH] When the video player is paused by user, Resume function is also doing by user. Change-Id: I9a790c4a5346fb2023b649dc7888b1d16fb67afe --- src/mp-video-app-ctrl.c | 5 +++++ src/video-player.c | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/mp-video-app-ctrl.c b/src/mp-video-app-ctrl.c index f28a604..96df3c9 100755 --- a/src/mp-video-app-ctrl.c +++ b/src/mp-video-app-ctrl.c @@ -712,6 +712,11 @@ static void MpVideoAppCtrlResume(VideoAppData *pAppData) VideoLogInfo(""); + if(MpVideoViewCtrlIsPauseByUser((void *)pAppData)) + { + return; + } + if(pAppData->nCurPlayerState == MP_PLAYER_STATE_RESUME || pAppData->nCurPlayerState == MP_PLAYER_STATE_PLAY) { VideoLogInfo("Allready Resume video player."); diff --git a/src/video-player.c b/src/video-player.c index 8aa81dc..f3b36a8 100755 --- a/src/video-player.c +++ b/src/video-player.c @@ -447,20 +447,20 @@ static void appResume(void *pUserData) MpUtilMultimediaVolumeKeyGrab(); - if(!MpVideoAppCtrlIsTopView(pUserData)) - { + if(!MpVideoAppCtrlIsTopView(pUserData)) + { VideoLogError("Overlay is not staied in top."); - return; - } + return; + } - if(MpVideoAppCtrlIsExistPlayerHandle()) - { - pAppData->VideoAppCtrlCallbackFunc.VideoAppCtrlResume(pAppData); - } - else - { - pAppData->VideoAppCtrlCallbackFunc.VideoAppCtrlStartByAppResume(pAppData); - } + if(MpVideoAppCtrlIsExistPlayerHandle()) + { + pAppData->VideoAppCtrlCallbackFunc.VideoAppCtrlResume(pAppData); + } + else + { + pAppData->VideoAppCtrlCallbackFunc.VideoAppCtrlStartByAppResume(pAppData); + } elm_win_indicator_mode_set(pAppData->pMainWindow, ELM_WIN_INDICATOR_SHOW); -- 2.7.4