aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCrystalP <CrystalP@xbmc.org>2011-12-26 14:17:03 -0500
committerCrystalP <CrystalP@xbmc.org>2011-12-27 13:32:03 -0500
commitdda8fc7e4312acc0353c320174a6c7a009b4c57f (patch)
treee61a8ec6cb23299cd6469f3de89fd3623bd53712
parent90e758f86e2fdbc8a5b55fe9b0c1f7c588ef2f69 (diff)
fix crypted dvd playback
with recent changes to playdisc, CDVDInputStreamNavigator::Open now receives a full path, which must be truncated more completely or libdvdcss won't be able to decrypt.
-rw-r--r--xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
index d4cc77bd9f..b9f42cab18 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp
@@ -80,6 +80,9 @@ bool CDVDInputStreamNavigator::Open(const char* strFile, const std::string& cont
{
strDVDFile[strlen(strDVDFile) - 13] = '\0';
}
+ if (strncasecmp(strDVDFile + strlen(strDVDFile) - 8, "VIDEO_TS", 8) == 0)
+ strDVDFile[strlen(strDVDFile) - 9] = '\0';
+
#if defined(__APPLE__) && !defined(__arm__)
// if physical DVDs, libdvdnav wants "/dev/rdiskN" device name for OSX,
// strDVDFile will get realloc'ed and replaced IF this is a physical DVD.