Skip to content
This repository
Browse code

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 authored October 01, 2013

Showing 1 changed file with 2 additions and 2 deletions. Show diff stats Hide diff stats

  1. 4  xbmc/cores/dvdplayer/DVDPlayer.cpp
4  xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -3727,9 +3727,9 @@ bool CDVDPlayer::HasMenu()
3727 3727
 
3728 3728
 bool CDVDPlayer::GetCurrentSubtitle(CStdString& strSubtitle)
3729 3729
 {
3730  
-  double pts = m_clock.GetClock();
  3730
+  double pts = m_clock.GetClock() + m_State.time_offset;
3731 3731
 
3732  
-  if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD))
  3732
+  if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_DVD) && m_CurrentSubtitle.source != STREAM_SOURCE_TEXT && m_CurrentSubtitle.source != STREAM_SOURCE_DEMUX_SUB)
3733 3733
     return false;
3734 3734
 
3735 3735
   m_dvdPlayerSubtitle.GetCurrentSubtitle(strSubtitle, pts - m_dvdPlayerVideo.GetSubtitleDelay());

0 notes on commit 571e69a

Please sign in to comment.
Something went wrong with that request. Please try again.