[Xbmc4xbox-commits] SF.net SVN: xbmc4xbox:[30918] branches/dvdplayer_improvements/xbmc/cores/ dvdplayer/DVDClock.cpp

[<ar...@us...>]

Revision: 30918
          http://xbmc4xbox.svn.sourceforge.net/xbmc4xbox/?rev=30918&view=rev
Author:   arnova
Date:     2011-07-07 20:13:33 +0000 (Thu, 07 Jul 2011)

Log Message:
-----------
merged: xbmc mainline
- c4a433142aa9170eb5dab2c33dd8e07f1eefe670 - fixed: current time would go wonky when seeking while player is paused 

Modified Paths:
--------------
    branches/dvdplayer_improvements/xbmc/cores/dvdplayer/DVDClock.cpp

Modified: branches/dvdplayer_improvements/xbmc/cores/dvdplayer/DVDClock.cpp
===================================================================
--- branches/dvdplayer_improvements/xbmc/cores/dvdplayer/DVDClock.cpp	2011-07-07 20:00:36 UTC (rev 30917)
+++ branches/dvdplayer_improvements/xbmc/cores/dvdplayer/DVDClock.cpp	2011-07-07 20:13:33 UTC (rev 30918)
@@ -103,6 +103,8 @@
 {
   CExclusiveLock lock(m_critSection);
   QueryPerformanceCounter(&m_startClock);
+  if(m_pauseClock.QuadPart)
+    m_pauseClock.QuadPart = m_startClock.QuadPart;
   m_iDisc = currentPts;
   m_bReset = false;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.