--- a/mmsharing/mmshengine/src/musengclipsession.cpp	Mon Mar 15 12:40:08 2010 +0200
+++ b/mmsharing/mmshengine/src/musengclipsession.cpp	Wed Mar 31 21:25:43 2010 +0300
@@ -152,7 +152,7 @@
             }
 
         // Set new position
-        file->SetPositionL( PositionMicroSecondsL( ETrue ) );
+        file->SetPositionL( PositionMicroSecondsL() );
         MUS_LOG( "                 SetPositionL returned without error " )
         
         // Reset timer
@@ -207,7 +207,7 @@
             }
 
         // Set new position
-        file->SetPositionL( PositionMicroSecondsL( ETrue ) );
+        file->SetPositionL( PositionMicroSecondsL() );
         MUS_LOG( "                 SetPositionL returned without error " )
         
         // Reset timer
@@ -840,8 +840,7 @@
 //
 // -----------------------------------------------------------------------------
 //
-TTimeIntervalMicroSeconds CMusEngClipSession::PositionMicroSecondsL( 
-    TBool aActualPosition )
+TTimeIntervalMicroSeconds CMusEngClipSession::PositionMicroSecondsL()
     {
     __ASSERT_ALWAYS( iSession, User::Leave( KErrNotReady ) );
 
@@ -886,12 +885,6 @@
         {
         calculatedPosition = position;
         }
-    
-    if ( !aActualPosition )
-        {
-        calculatedPosition = 
-            GetVideoSinkRelativeFilePos( calculatedPosition, duration );
-        }
         
     return calculatedPosition;
     }
@@ -1007,65 +1000,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// Modifies file position if position has reached end before clip has ended.
-// File position is not going in sync with local video playback as playback
-// buffers media before starting playing.
-// -----------------------------------------------------------------------------
-//
-TTimeIntervalMicroSeconds CMusEngClipSession::GetVideoSinkRelativeFilePos( 
-    const TTimeIntervalMicroSeconds& aActualPosition, 
-    const TTimeIntervalMicroSeconds& aDuration )
-    { 
-    MUS_LOG1( "mus: [ENGINE] PositionMicroSecondsL, pos before mod:%d", 
-              aActualPosition.Int64() )
-    
-    TTimeIntervalMicroSeconds tempCalculatedPosition( aActualPosition );
-    
-    if ( iDelayFileEndingPos != 0 )
-        {
-        iDelayFileEndingPos = aDuration;
-        tempCalculatedPosition = iDelayFileEndingPos;
-        }
-    else
-        {
-        // FRWD can go to zero even if clip has not ended, do not modify 
-        // time in such situation.
-        if ( aActualPosition == 0 && 
-             !iClipEnded && 
-             iFRWDStartTime.Int64() == 0 && 
-             !iRewindedToBeginning )
-            {
-            const TInt KMusDelayEndingModifier = 2;
-            iDelayFileEndingPos = aDuration.Int64() - 
-                iBufferingPeriod.Int64() / KMusDelayEndingModifier;
-            tempCalculatedPosition = iDelayFileEndingPos;
-            if ( iPreviousPos > tempCalculatedPosition )
-                {
-                tempCalculatedPosition = iPreviousPos;
-                }
-            }
-        else
-            {
-            iDelayFileEndingPos = 0;
-            }
-        
-        if ( iRewindedToBeginning && aActualPosition > 0 )
-            {
-            iRewindedToBeginning = EFalse;
-            }
-            
-        if ( tempCalculatedPosition < 0 )
-            {
-            tempCalculatedPosition = 0;
-            }
-        }
-    
-    iPreviousPos = tempCalculatedPosition;
-            
-    return tempCalculatedPosition;
-    }
-
-// -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 //