Permalink
Browse files

[resume] if a played item has a resume point set in its videoinfotag,…

… use it over and above the database value when resuming in the player
  • Loading branch information...
1 parent 18e16d8 commit ce606cda96451fecb3a99d27baec16afe1abbc1c Jonathan Marshall committed Jul 8, 2012
Showing with 8 additions and 0 deletions.
  1. +8 −0 xbmc/Application.cpp
View
@@ -4012,6 +4012,14 @@ bool CApplication::PlayFile(const CFileItem& item, bool bRestart)
options.starttime = bookmark.timeInSeconds;
options.state = bookmark.playerState;
}
+ /*
+ override with information from the actual item if available. We do this as the VFS (eg plugins)
+ may set the resume point to override whatever XBMC has stored, yet we ignore it until now so that,
+ should the playerState be required, it is fetched from the database.
+ See the note in CGUIWindowVideoBase::ShowResumeMenu.
+ */
+ if (item.HasVideoInfoTag() && item.GetVideoInfoTag()->m_resumePoint.IsSet())
+ options.starttime = item.GetVideoInfoTag()->m_resumePoint.timeInSeconds;
}
else if (item.HasVideoInfoTag())
{

0 comments on commit ce606cd

Please sign in to comment.