Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Author: S. Davilla <davilla@4pi.com>
- Date: Fri Mar 17 20:11:56 2017 -0400
- plex: fixed 3D SBS detection
- diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
- index c4e3801..f4df3d6 100644
- --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp
- +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp
- @@ -3778,7 +3778,14 @@ bool CDVDPlayer::OpenVideoStream(CDVDStreamInfo& hint, bool reset)
- hint.stills = true;
- if (hint.stereo_mode.empty())
- - hint.stereo_mode = CStereoscopicsManager::GetInstance().DetectStereoModeByString(m_item.GetPath());
- + {
- + std::string filepath;
- + if (m_item.HasVideoInfoTag() && m_item.IsMediaServiceBased())
- + filepath = m_item.GetVideoInfoTag()->m_strServiceFile;
- + else
- + filepath = m_item.GetPath();
- + hint.stereo_mode = CStereoscopicsManager::GetInstance().DetectStereoModeByString(filepath);
- + }
- SelectionStream& s = m_SelectionStreams.Get(STREAM_VIDEO, 0);
- diff --git a/xbmc/video/VideoThumbLoader.cpp b/xbmc/video/VideoThumbLoader.cpp
- index 5316e12..f0ecc7b 100644
- --- a/xbmc/video/VideoThumbLoader.cpp
- +++ b/xbmc/video/VideoThumbLoader.cpp
- @@ -630,9 +630,13 @@ void CVideoThumbLoader::DetectAndAddMissingItemData(CFileItem &item)
- if (stereoMode.empty())
- {
- std::string path = item.GetPath();
- - if (item.IsVideoDb() && item.HasVideoInfoTag())
- - path = item.GetVideoInfoTag()->GetPath();
- -
- + if (item.HasVideoInfoTag())
- + {
- + if (item.IsMediaServiceBased())
- + path = item.GetVideoInfoTag()->m_strServiceFile;
- + else if (item.IsVideoDb())
- + path = item.GetVideoInfoTag()->GetPath();
- + }
- // check for custom stereomode setting in video settings
- CVideoSettings itemVideoSettings;
- m_videoDatabase->Open();
- @@ -643,7 +647,7 @@ void CVideoThumbLoader::DetectAndAddMissingItemData(CFileItem &item)
- // still empty, try grabbing from filename
- // TODO: in case of too many false positives due to using the full path, extract the filename only using string utils
- if (stereoMode.empty())
- - stereoMode = CStereoscopicsManager::GetInstance().DetectStereoModeByString( path );
- + stereoMode = CStereoscopicsManager::GetInstance().DetectStereoModeByString(path);
- }
- if (!stereoMode.empty())
- item.SetProperty("stereomode", CStereoscopicsManager::GetInstance().NormalizeStereoMode(stereoMode));
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement