Added navigation controls for EDL (commercials) in PVR playback #10064
Conversation
|
No real review but you will have to deal with it anyway. Indent is 2 spaces and braces go on separate lines. |
|
why did you limit it for pvr only? |
|
@akva2 The second commit fixes the indenting and braces - Did I miss something? |
| @@ -4355,6 +4355,21 @@ bool CVideoPlayer::OnAction(const CAction &action) | |||
| case ACTION_NEXT_ITEM: | |||
| case ACTION_CHANNEL_UP: | |||
| { | |||
| if (m_pInputStream->IsStreamType(DVDSTREAM_TYPE_PVRMANAGER)) | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
@FernetMenta Removed the restriction as requested. |
| @@ -840,6 +840,50 @@ bool CEdl::InCut(const int iSeek, Cut *pCut) const | |||
| return false; | |||
| } | |||
|
|
|||
| bool CEdl::GetNearestCut(bool bPlus, const int iSeek, Cut *pCut) const | |||
| { | |||
| if (bPlus) { | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
thanks, apart from the minors (see comments) I am ok with this. |
FernetMenta
added
Type: Feature
|
@thardie could you please squash the 4 commits into a single one. then we are good to go |
|
@FernetMenta Done |
|
there is a "merge remote tracking" commit in this branch. always rebase on upstream, never merge upstream |
|
Oops, sorry. Will fix it this evening (approx 8 hours from now) |
|
thanks! |
thardie
force-pushed
the
master
branch
2 times, most recently
from
53e0eb8
to
8577295
Compare
(commercials) to go to the end of the next commercial block, or prev to the beginning of the previous commercial block.
|
@FernetMenta Should be good now. |
|
jenkins build this please |
Added functionality so that when playing from a PVR if there is an EDL, NEXT will go to the end of the next commercial block, and PREV will go to the beginning of the previous commercial block. If no EDL is present, old behavior is preserved.