daily pastebin goal
80%
SHARE
TWEET

Untitled

a guest Mar 17th, 2017 84 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. Author: S. Davilla <davilla@4pi.com>
  2. Date:   Fri Mar 17 20:11:56 2017 -0400
  3.  
  4.     plex: fixed 3D SBS detection
  5.  
  6. diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
  7. index c4e3801..f4df3d6 100644
  8. --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
  9. +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
  10. @@ -3778,7 +3778,14 @@ bool CDVDPlayer::OpenVideoStream(CDVDStreamInfo& hint, bool reset)
  11.      hint.stills = true;
  12.  
  13.    if (hint.stereo_mode.empty())
  14. -    hint.stereo_mode = CStereoscopicsManager::GetInstance().DetectStereoModeByString(m_item.GetPath());
  15. +  {
  16. +    std::string filepath;
  17. +    if (m_item.HasVideoInfoTag() && m_item.IsMediaServiceBased())
  18. +      filepath = m_item.GetVideoInfoTag()->m_strServiceFile;
  19. +    else
  20. +      filepath = m_item.GetPath();
  21. +    hint.stereo_mode = CStereoscopicsManager::GetInstance().DetectStereoModeByString(filepath);
  22. +  }
  23.  
  24.    SelectionStream& s = m_SelectionStreams.Get(STREAM_VIDEO, 0);
  25.  
  26. diff --git a/xbmc/video/VideoThumbLoader.cpp b/xbmc/video/VideoThumbLoader.cpp
  27. index 5316e12..f0ecc7b 100644
  28. --- a/xbmc/video/VideoThumbLoader.cpp
  29. +++ b/xbmc/video/VideoThumbLoader.cpp
  30. @@ -630,9 +630,13 @@ void CVideoThumbLoader::DetectAndAddMissingItemData(CFileItem &item)
  31.    if (stereoMode.empty())
  32.    {
  33.      std::string path = item.GetPath();
  34. -    if (item.IsVideoDb() && item.HasVideoInfoTag())
  35. -      path = item.GetVideoInfoTag()->GetPath();
  36. -
  37. +    if (item.HasVideoInfoTag())
  38. +    {
  39. +      if (item.IsMediaServiceBased())
  40. +        path = item.GetVideoInfoTag()->m_strServiceFile;
  41. +      else if (item.IsVideoDb())
  42. +        path = item.GetVideoInfoTag()->GetPath();
  43. +    }
  44.      // check for custom stereomode setting in video settings
  45.      CVideoSettings itemVideoSettings;
  46.      m_videoDatabase->Open();
  47. @@ -643,7 +647,7 @@ void CVideoThumbLoader::DetectAndAddMissingItemData(CFileItem &item)
  48.      // still empty, try grabbing from filename
  49.      // TODO: in case of too many false positives due to using the full path, extract the filename only using string utils
  50.      if (stereoMode.empty())
  51. -      stereoMode = CStereoscopicsManager::GetInstance().DetectStereoModeByString( path );
  52. +      stereoMode = CStereoscopicsManager::GetInstance().DetectStereoModeByString(path);
  53.    }
  54.    if (!stereoMode.empty())
  55.      item.SetProperty("stereomode", CStereoscopicsManager::GetInstance().NormalizeStereoMode(stereoMode));
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top