Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pvr] open default streams after demuxer changed streams #1564

Merged
merged 1 commit into from
Oct 10, 2012
Merged

[pvr] open default streams after demuxer changed streams #1564

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions xbmc/cores/dvdplayer/DVDPlayer.cpp
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -770,15 +770,6 @@ bool CDVDPlayer::ReadPacket(DemuxPacket*& packet, CDemuxStream*& stream)


if(packet) if(packet)
{ {
if(packet->iStreamId == DMX_SPECIALID_STREAMCHANGE)
{
// reset the caching state for pvr streams
if (m_pInputStream->IsStreamType(DVDSTREAM_TYPE_PVRMANAGER))
SetCaching(CACHESTATE_PVR);
CDVDDemuxUtils::FreeDemuxPacket(packet);
return true;
}

UpdateCorrection(packet, m_offset_pts); UpdateCorrection(packet, m_offset_pts);
if(packet->iStreamId < 0) if(packet->iStreamId < 0)
return true; return true;
Expand All @@ -804,6 +795,15 @@ bool CDVDPlayer::ReadPacket(DemuxPacket*& packet, CDemuxStream*& stream)


if(packet) if(packet)
{ {
// stream changed, update and open defaults
if(packet->iStreamId == DMX_SPECIALID_STREAMCHANGE)
{
m_SelectionStreams.Clear(STREAM_NONE, STREAM_SOURCE_DEMUX);
m_SelectionStreams.Update(m_pInputStream, m_pDemuxer);
OpenDefaultStreams();
return true;
}

UpdateCorrection(packet, m_offset_pts); UpdateCorrection(packet, m_offset_pts);
// this groupId stuff is getting a bit messy, need to find a better way // this groupId stuff is getting a bit messy, need to find a better way
// currently it is used to determine if a menu overlay is associated with a picture // currently it is used to determine if a menu overlay is associated with a picture
Expand Down