Permalink
Browse files

Merge pull request #4912 from FernetMenta/clock

dvdplayer: set clock for all streams as long master has not synced
  • Loading branch information...
2 parents 57a7082 + b6b1e0a commit 06959f165ceeb916d86043848b3c47d182af710d @FernetMenta FernetMenta committed Jun 19, 2014
Showing with 4 additions and 2 deletions.
  1. +4 −2 xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -1706,9 +1706,11 @@ bool CDVDPlayer::CheckPlayerInit(CCurrentStream& current)
{
if( current.player == DVDPLAYER_AUDIO)
setclock = m_clock.GetMaster() == MASTER_CLOCK_AUDIO
- || m_clock.GetMaster() == MASTER_CLOCK_AUDIO_VIDEOREF;
+ || m_clock.GetMaster() == MASTER_CLOCK_AUDIO_VIDEOREF
+ || !m_CurrentVideo.inited;
else if(current.player == DVDPLAYER_VIDEO)
- setclock = m_clock.GetMaster() == MASTER_CLOCK_VIDEO;
+ setclock = m_clock.GetMaster() == MASTER_CLOCK_VIDEO
+ || !m_CurrentAudio.inited;
}
else
{

0 comments on commit 06959f1

Please sign in to comment.