N_SE-24778 bug fix.

Change-Id: Ife2898c6c21916587ee906d89e8239f17d05bcce

diff --git a/packaging/org.tizen.video-player.spec b/packaging/org.tizen.video-player.spec
index f96bda6..58acbf4 100755 (executable)
--- a/packaging/org.tizen.video-player.spec
+++ b/packaging/org.tizen.video-player.spec
@@ -1,6 +1,6 @@
 Name:       org.tizen.video-player
 Summary:    Video & streaming player
-Version:    0.5.139
+Version:    0.5.140
 Release:    1
 Group:      TO_BE/FILLED_IN
 License:    Flora

diff --git a/src/mp-video-display-view.c b/src/mp-video-display-view.c
index aafeab9..1607e4c 100755 (executable)
--- a/src/mp-video-display-view.c
+++ b/src/mp-video-display-view.c
@@ -146,10 +146,17 @@ static void MpVideoDisplayViewPressPauseButtonCb(void *pUserData, Evas_Object *p
        {
                VideoLogInfo("Press Pause button.");
 
+               if(pAppData->bSeekComplete == FALSE)
+               {
+                       bIsPauseByUser = TRUE;
+                       pAppData->nSeekPlayerState = MP_PLAYER_STATE_PAUSE;
+                       return;
+               }
+
                if (pAppData->nCurPlayerState == MP_PLAYER_STATE_RESUME || pAppData->nCurPlayerState == MP_PLAYER_STATE_PLAY)
                {
-                       pAppData->VideoAppCtrlCallbackFunc.VideoAppCtrlPause(pAppData);
                        bIsPauseByUser = TRUE;
+                       pAppData->VideoAppCtrlCallbackFunc.VideoAppCtrlPause(pAppData);
                }
        }
 }
@@ -174,9 +181,17 @@ static void MpVideoDisplayViewPressResumeButtonCb(void *pUserData, Evas_Object *
        if (!strcmp(szEmission, SIGNAL_CONTROL_PLAY_RESUME_PRESS)) {
                VideoLogInfo("Press Resume/Play button.");
 
-               if (pAppData->nCurPlayerState == MP_PLAYER_STATE_PAUSE) {
-                       pAppData->VideoAppCtrlCallbackFunc.VideoAppCtrlResume(pAppData);
+               if(pAppData->bSeekComplete == FALSE)
+               {
                        bIsPauseByUser = FALSE;
+                       pAppData->nSeekPlayerState = MP_PLAYER_STATE_RESUME;
+                       return;
+               }
+
+               if (pAppData->nCurPlayerState != MP_PLAYER_STATE_RESUME && pAppData->nCurPlayerState != MP_PLAYER_STATE_PLAY)
+               {
+                       bIsPauseByUser = FALSE;
+                       pAppData->VideoAppCtrlCallbackFunc.VideoAppCtrlResume(pAppData);
                }
        }
 }
@@ -949,6 +964,8 @@ void MpVideoDisplayViewInitAfterBeginOfStream(void *pUserData)
 
        bIsBeginOfStream = TRUE;
 
+       pAppData->bSeekComplete = TRUE;
+
        MpVideoProgressbarBeginOfStream((void *)pAppData);
 
        if (pAppData->nDuration > 1) {