Skip to content

Commit

Permalink
dvdplayer: remove invalid special case for isbetterstream for pvr
Browse files Browse the repository at this point in the history
This can cause dvdplayer to change streams for no apparent
reason.
  • Loading branch information
Joakim Plate committed Sep 17, 2012
1 parent 21fe257 commit 53038ce
Showing 1 changed file with 0 additions and 24 deletions.
24 changes: 0 additions & 24 deletions xbmc/cores/dvdplayer/DVDPlayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -901,30 +901,6 @@ bool CDVDPlayer::IsBetterStream(CCurrentStream& current, CDemuxStream* stream)
if(current.type == STREAM_VIDEO && current.id < 0)
return true;
}
else if (m_pInputStream && m_pInputStream->IsStreamType(DVDSTREAM_TYPE_PVRMANAGER))
{
if(stream->source == current.source &&
stream->iId == current.id)
return false;

if(stream->disabled)
return false;

if(stream->type != current.type)
return false;

if(current.type == STREAM_AUDIO && stream->iPhysicalId == m_dvd.iSelectedAudioStream)
return true;

if(current.type == STREAM_SUBTITLE && stream->iPhysicalId == m_dvd.iSelectedSPUStream)
return true;

if(current.type == STREAM_TELETEXT)
return true;

if(current.id < 0)
return true;
}
else
{
if(stream->source == current.source
Expand Down

0 comments on commit 53038ce

Please sign in to comment.