Merge pull request xbmc#2658 from arnova/bluray_flag_fix

fixed: Streamdetails & resume-bookmark saving etc. for bluray folder...

Author: arnova

xbmc/Application.cpp

@@ -4546,7 +4546,8 @@ void CApplication::UpdateFileState()
       // Check whether we're *really* playing video else we may race when getting eg. stream details
       if (IsPlayingVideo())
       {
-        // Special case for DVDs: Only extract streamdetails if title length > 15m. Should yield more correct info
+        /* Always update streamdetails, except for DVDs where we only update
+           streamdetails if title length > 15m (Should yield more correct info) */
         if (!(m_progressTrackingItem->IsDVDImage() || m_progressTrackingItem->IsDVDFile()) || m_pPlayer->GetTotalTime() > 15*60*1000)
         {
           CStreamDetails details;

xbmc/utils/SaveFileStateJob.h

@@ -31,13 +31,14 @@ class CSaveFileStateJob : public CJob
 bool CSaveFileStateJob::DoWork()
 {
   CStdString progressTrackingFile = m_item.GetPath();
+
   if (m_item.HasVideoInfoTag() && m_item.GetVideoInfoTag()->m_strFileNameAndPath.Find("removable://") == 0)
     progressTrackingFile = m_item.GetVideoInfoTag()->m_strFileNameAndPath; // this variable contains removable:// suffixed by disc label+uniqueid or is empty if label not uniquely identified
   else if (m_item.HasProperty("original_listitem_url"))
   {
-    // only use original_listitem_url for Python & UPnP sources
+    // only use original_listitem_url for Python, UPnP and Bluray sources
     CStdString original = m_item.GetProperty("original_listitem_url").asString();
-    if (URIUtils::IsPlugin(original) || URIUtils::IsUPnP(original))
+    if (URIUtils::IsPlugin(original) || URIUtils::IsUPnP(original) || URIUtils::IsBluray(m_item.GetPath()))
       progressTrackingFile = original;
   }
 
@@ -122,10 +123,9 @@ bool CSaveFileStateJob::DoWork()
         if (m_item.HasVideoInfoTag() && m_item.GetVideoInfoTag()->HasStreamDetails())
         {
           CFileItem dbItem(m_item);
-          videodatabase.GetStreamDetails(dbItem); // Fetch stream details from the db (if any)
 
           // Check whether the item's db streamdetails need updating
-          if (!dbItem.GetVideoInfoTag()->HasStreamDetails() || dbItem.GetVideoInfoTag()->m_streamDetails != m_item.GetVideoInfoTag()->m_streamDetails)
+          if (!videodatabase.GetStreamDetails(dbItem) || dbItem.GetVideoInfoTag()->m_streamDetails != m_item.GetVideoInfoTag()->m_streamDetails)
           {
             videodatabase.SetStreamDetailsForFile(m_item.GetVideoInfoTag()->m_streamDetails, progressTrackingFile);
             updateListing = true;