Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #3040 from FernetMenta/pvr3d

fixing pvr after stereoscopic pull
  • Loading branch information...
commit 1cbeb20232f49b62c043d3482b2f579cd08cc69d 2 parents eccd7ba + 9dffdcc
Rainer Hochecker FernetMenta authored
1  xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp
View
@@ -383,6 +383,7 @@ void CDVDDemuxPVRClient::RequestStreams()
st->iHeight = props.stream[i].iHeight;
st->iWidth = props.stream[i].iWidth;
st->fAspect = props.stream[i].fAspect;
+ st->stereo_mode = "mono";
m_streams[i] = st;
st->m_parser_split = true;
}
4 xbmc/cores/dvdplayer/DVDPlayer.cpp
View
@@ -1287,6 +1287,7 @@ void CDVDPlayer::ProcessAudioData(CDemuxStream* pStream, DemuxPacket* pPacket)
OpenAudioStream( pPacket->iStreamId, pStream->source );
m_CurrentAudio.stream = (void*)pStream;
+ m_CurrentAudio.changes = pStream->changes;
}
// check if we are too slow and need to recache
@@ -1336,6 +1337,7 @@ void CDVDPlayer::ProcessVideoData(CDemuxStream* pStream, DemuxPacket* pPacket)
OpenVideoStream(pPacket->iStreamId, pStream->source);
m_CurrentVideo.stream = (void*)pStream;
+ m_CurrentVideo.changes = pStream->changes;
}
// check if we are too slow and need to recache
@@ -1369,6 +1371,7 @@ void CDVDPlayer::ProcessSubData(CDemuxStream* pStream, DemuxPacket* pPacket)
OpenSubtitleStream(pPacket->iStreamId, pStream->source);
m_CurrentSubtitle.stream = (void*)pStream;
+ m_CurrentSubtitle.changes = pStream->changes;
}
UpdateTimestamps(m_CurrentSubtitle, pPacket);
@@ -1397,6 +1400,7 @@ void CDVDPlayer::ProcessTeletextData(CDemuxStream* pStream, DemuxPacket* pPacket
OpenTeletextStream( pPacket->iStreamId, pStream->source );
m_CurrentTeletext.stream = (void*)pStream;
+ m_CurrentTeletext.changes = pStream->changes;
}
UpdateTimestamps(m_CurrentTeletext, pPacket);
4 xbmc/cores/omxplayer/OMXPlayer.cpp
View
@@ -1501,6 +1501,7 @@ void COMXPlayer::ProcessAudioData(CDemuxStream* pStream, DemuxPacket* pPacket)
OpenAudioStream( pPacket->iStreamId, pStream->source );
m_CurrentAudio.stream = (void*)pStream;
+ m_CurrentAudio.changes = pStream->changes;
}
// check if we are too slow and need to recache
@@ -1550,6 +1551,7 @@ void COMXPlayer::ProcessVideoData(CDemuxStream* pStream, DemuxPacket* pPacket)
OpenVideoStream(pPacket->iStreamId, pStream->source);
m_CurrentVideo.stream = (void*)pStream;
+ m_CurrentVideo.changes = pStream->changes;
}
// check if we are too slow and need to recache
@@ -1583,6 +1585,7 @@ void COMXPlayer::ProcessSubData(CDemuxStream* pStream, DemuxPacket* pPacket)
OpenSubtitleStream(pPacket->iStreamId, pStream->source);
m_CurrentSubtitle.stream = (void*)pStream;
+ m_CurrentSubtitle.changes = pStream->changes;
}
UpdateTimestamps(m_CurrentSubtitle, pPacket);
@@ -1611,6 +1614,7 @@ void COMXPlayer::ProcessTeletextData(CDemuxStream* pStream, DemuxPacket* pPacket
OpenTeletextStream( pPacket->iStreamId, pStream->source );
m_CurrentTeletext.stream = (void*)pStream;
+ m_CurrentTeletext.changes = pStream->changes;
}
UpdateTimestamps(m_CurrentTeletext, pPacket);
Please sign in to comment.
Something went wrong with that request. Please try again.