# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1282204458 -10800
# Node ID 798ee5f1972c9e386c15f63cace20de85863f879
# Parent  e53284de66c2c8a71f6714e1d016e024c50f36f5
Revision: 201029
Kit: 201033

diff -r e53284de66c2 -r 798ee5f1972c videoscheduler/SchedulerServer/src/CCseScheduleDB.cpp
--- a/videoscheduler/SchedulerServer/src/CCseScheduleDB.cpp	Thu Jul 15 19:48:39 2010 +0300
+++ b/videoscheduler/SchedulerServer/src/CCseScheduleDB.cpp	Thu Aug 19 10:54:18 2010 +0300
@@ -1430,11 +1430,16 @@
     {
     CSELOGSTRING_HIGH_LEVEL(">>>CCseScheduleDB::CompactDb");
     // Compact database
-    TInt err( iScheduleDb.Compact() );
-    if ( err != KErrNone )
+
+    if( iDbAccess != ECseDbLocked )
         {
-        CSELOGSTRING2_HIGH_LEVEL("iScheduleDb.Compact() failed: %d", err);    
+        TInt err( iScheduleDb.Compact() );
+        if ( err != KErrNone )
+            {
+            CSELOGSTRING2_HIGH_LEVEL("iScheduleDb.Compact() failed: %d", err);    
+            }
         }
+    
     // Cancel timer if it is running    
 	if ( iCompactTimer )
 		{
@@ -1463,6 +1468,14 @@
             {
             // Backup and restore starting, close the db
             CloseDbFile();
+            
+            // Cancel timer if it is running    
+            if ( iCompactTimer )
+                {
+                iCompactTimer->Cancel();
+                delete iCompactTimer;
+                iCompactTimer = NULL;       
+                }
             }
             break;
             
diff -r e53284de66c2 -r 798ee5f1972c videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h
--- a/videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h	Thu Jul 15 19:48:39 2010 +0300
+++ b/videoutils_plat/videoplayer_constants_api/inc/mpxvideoplaybackdefs.h	Thu Aug 19 10:54:18 2010 +0300
@@ -15,7 +15,7 @@
 */
 
 
-// Version : %version: 13 %
+// Version : %version: 14 %
 
 
 #ifndef CMPXVIDEOPLAYBACKDEFS_H
@@ -123,7 +123,8 @@
     EPbCmdRetrieveBufferingPercentage,
     EPbCmdLoadingStarted,
     EPbCmdHideControls,
-    EPbCmdSetPosterFrame
+    EPbCmdSetPosterFrame,
+    EPbCmdSurfaceRemovedFromWindow
 };
 
 enum TMPXGeneralError