Change power manager module.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72b3932..00bc551 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,11 +53,11 @@ pkg_check_modules(pkgs REQUIRED
        icu-lx
        icu-uc
        efreet-mime
+       pmapi
        capi-appfw-application
        capi-media-player
        capi-media-sound-manager
        capi-media-image-util
-       capi-system-power
        capi-media-metadata-extractor
        capi-content-media-content
        capi-content-mime-type

diff --git a/org.tizen.video-player.desktop.in b/org.tizen.video-player.desktop.in
deleted file mode 100755 (executable)
index aa65757..0000000
--- a/org.tizen.video-player.desktop.in
+++ /dev/null
@@ -1,14 +0,0 @@
-Name=Video player
-Name[en_US]=Video player
-Name[ko_KR]=비디오 플레이어
-Type=Application
-Exec=/opt/apps/org.tizen.video-player/bin/video-player
-nodisplay=True
-removable=false
-Comment=video-player
-Version=0.1
-Icon=org.tizen.video-player.png
-MimeType=video/mp4; video/3gp; video/x-msvideo; video/x-ms-wmv; video/x-ms-asf; video/3gpp; video/x-matroska; video/vnd.ms-playready.media.pyv; application/vnd.apple.mpegurl; application/x-mpegurl; audio/x-mpegurl; video/x-mpegurl; video/x-flv; video/ogg
-x-tizen-taskManage=true
-x-tizen-multiple=false
-x-tizen-svc=http://tizen.org/appsvc/operation/view|NULL|video/*; http://tizen.org/appsvc/operation/view|http|video/*;

diff --git a/packaging/org.tizen.video-player.spec b/packaging/org.tizen.video-player.spec
old mode 100755 (executable)
new mode 100644 (file)
index e77fef8..66e8975
--- 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.123
+Version:    0.5.124
 Release:    1
 Group:      TO_BE/FILLED_IN
 License:    Flora

diff --git a/src/mp-util.c b/src/mp-util.c
old mode 100755 (executable)
new mode 100644 (file)
index fd3ddbe..e4f2dd6
--- a/src/mp-util.c
+++ b/src/mp-util.c
@@ -24,8 +24,8 @@
 #include <glib.h>
 #include <errno.h>
 #include <vconf.h>
-#include <power.h>
 #include <utilX.h>
+#include <pmapi.h>
 #include <unistd.h>
 #include <E_DBus.h>
 #include <signal.h>
@@ -1334,21 +1334,21 @@ void MpUtilLcdNormalPowerLockForResume(void)
 {
        VideoLogInfo("");
 
-       power_lock_state(POWER_STATE_NORMAL, 0);
+       pm_lock_state(LCD_NORMAL, GOTO_STATE_NOW | HOLD_KEY_BLOCK, 0);
 }
 
 void MpUtilLcdNormalPowerUnlockForPause(void)
 {
        VideoLogInfo("");
 
-       power_unlock_state(POWER_STATE_NORMAL);
+       pm_unlock_state(LCD_NORMAL, PM_RESET_TIMER);
 }
 
 void MpUtilLcdOffForPowerButton(void)
 {
        VideoLogInfo("");
 
-       power_unlock_state(POWER_STATE_NORMAL);
+       pm_unlock_state(LCD_NORMAL, PM_RESET_TIMER);
 }
 
 void MpUtilMultimediaKeyGrab(void)

diff --git a/src/mp-video-app-ctrl.c b/src/mp-video-app-ctrl.c
old mode 100755 (executable)
new mode 100644 (file)
index f4b1c41..809686c
--- a/src/mp-video-app-ctrl.c
+++ b/src/mp-video-app-ctrl.c
@@ -260,7 +260,7 @@ static int MpVideoAppCtrlSeekCompletePipeCb(void *pUserData)
                pAppData->VideoAppCtrlCallbackFunc.VideoAppCtrlSetPosition(pAppData);
                pAppData->nSeekPosition = 0;
                MpVideoViewCtrlUpdateProgressbar((void *)pAppData);
-               return;
+               return 0;
        }
 
        if(pAppData->nSeekPlayerState == MP_PLAYER_STATE_PAUSE) {

diff --git a/src/mp-video-display-view.c b/src/mp-video-display-view.c
index e8b408d..3a2a894 100644 (file)
--- a/src/mp-video-display-view.c
+++ b/src/mp-video-display-view.c
@@ -717,7 +717,7 @@ void MpVideoDisplayViewPop(void *pNaviFrame, void *pUserData)
                nTmpPlayerType == MP_VIDEO_PLAYER_EMAIL||
                nTmpPlayerType == MP_VIDEO_PLAYER_MMS)
        {
-               elm_win_lower(pAppData->pMainWindow);
+               pAppData->VideoAppCtrlCallbackFunc.VideoAppCtrlExit(pAppData);
        }
 }
 

diff --git a/src/mp-video-view-mgr.c b/src/mp-video-view-mgr.c
old mode 100755 (executable)
new mode 100644 (file)
index 6cb64cd..a0c4480
--- a/src/mp-video-view-mgr.c
+++ b/src/mp-video-view-mgr.c
@@ -58,18 +58,6 @@ static Ecore_Timer *pLongPressSpeedPlayingTimer = NULL;
 
 static bool bShowLayout = FALSE;
 
-static MpDisplayMethod nCurDisplayMethod = MP_DISPLAY_METHOD_LETTER_BOX;
-
-static int nLastSrcWidth = 0;
-static int nLastSrcHeight = 0;
-
-static int nLastPosX = 0;
-static int nLastPosY = 0;
-static int nLastPosW = 0;
-static int nLastPosH = 0;
-
-static bool bPixmapShowStatus = FALSE;
-
 static void MpVideoVideoViewCtrlLongpressSpeedKeyUp(void *pUserData);
 static void MpVideoVideoViewCtrlLongpressSpeedKeyDown(void *pUserData);
 static void MpVideoViewCtrlChangeViewCb(int nChangePlayerView, void *pUserData);
@@ -177,6 +165,7 @@ static Eina_Bool MpVideoViewCtrlHardkeyDownCb(void *pUserData, int nType, void *
        }
        else if(!strcmp(pKeyEvent->keyname, KEY_CANCLE))
        {
+               VideoLogInfo("Cancel key down");
                bIsKeyCancle = TRUE;
        }
 
@@ -214,6 +203,7 @@ static Eina_Bool MpVideoViewCtrlHardkeyUpCb(void *pUserData, int nType, void *pE
        else if(!strcmp(pKeyEvent->keyname, HOME_KEY))
        {
                VideoLogInfo("Home key up");
+               pAppData->VideoAppCtrlCallbackFunc.VideoAppCtrlExit(pAppData);
        }
        else if(!strcmp(pKeyEvent->keyname, POWER_KEY))
        {

diff --git a/src/video-player.c b/src/video-player.c
index 35f95e3..757c796 100644 (file)
--- a/src/video-player.c
+++ b/src/video-player.c
@@ -19,7 +19,7 @@
 
 #include <app.h>
 #include <glib.h>
-#include <power.h>
+#include <pmapi.h>
 
 #include "mp-util.h"
 #include "mp-video-log.h"
@@ -137,7 +137,7 @@ static void appExit(void *pUserData)
                return;
        }
 
-       power_unlock_state(POWER_STATE_NORMAL);
+       MpUtilLcdOffForPowerButton();
 
        MpUtilSetKeyUngrab(HOME_KEY);
        MpUtilMultimediaKeyUngrab();