Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #3338 from Voyager1/fix-dvdextsub

[fix] Allow the use of external subtitles for DVDs
  • Loading branch information...
commit 571e69aa2391205589364dd0c6beb9ff03a20a5d 2 parents 1755968 + cc5b821
@Voyager1 Voyager1 authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 xbmc/cores/dvdplayer/DVDPlayer.cpp
View
4 xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -3727,9 +3727,9 @@ bool CDVDPlayer::HasMenu()
bool CDVDPlayer::GetCurrentSubtitle(CStdString& strSubtitle)
{
- double pts = m_clock.GetClock();
+ double pts = m_clock.GetClock() + m_State.time_offset;
- if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD))
+ if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD) && m_CurrentSubtitle.source != STREAM_SOURCE_TEXT && m_CurrentSubtitle.source != STREAM_SOURCE_DEMUX_SUB)
return false;
m_dvdPlayerSubtitle.GetCurrentSubtitle(strSubtitle, pts - m_dvdPlayerVideo.GetSubtitleDelay());
Please sign in to comment.
Something went wrong with that request. Please try again.