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.

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

[PVR][video] Consolidate implementation of "Play", "Mark watched", "Mark unwatched", "Resume from" context menu items #11115

Merged
merged 9 commits into from Dec 17, 2016

Conversation

ksooo
Copy link
Member

@ksooo ksooo commented Dec 11, 2016

Both video files and pvr recordings have similar context menu items, like "Play", "Mark watched", "Mark unwatched" and "Resume from". For historical reasons, there are different implementations for these menu items, although lots of code could be shared.

After #10870 got merged it is now possible to consolidate these implementations. This PR does exactly this. :-) A bunch of code refactoring needed as prerequisite for this is also included here.

A nice visual side effect of these changes is that now "Resume" and "Play" for PVR recordings appear at the topmost positions in the context menu. This has been requested by or users for several times.

The code was runtime-tested on Linux an macOS, latest master.

@Jalle19 for review?

@ksooo ksooo added Type: Cleanup non-breaking change which removes non-working or unmaintained functionality Component: PVR v18 Leia Component: Video labels Dec 11, 2016
@ksooo ksooo added this to the L 18.0-alpha1 milestone Dec 11, 2016
@ksooo ksooo requested a review from Jalle19 December 11, 2016 08:23
@ksooo ksooo changed the title [PVR][video] Consolitate implementation of "Play", "Mark watched", "Mark unwatched", "Resume from" context menu implementation [PVR][video] Consolitate implementation of "Play", "Mark watched", "Mark unwatched", "Resume from" context menu items Dec 11, 2016
@ksooo ksooo changed the title [PVR][video] Consolitate implementation of "Play", "Mark watched", "Mark unwatched", "Resume from" context menu items [PVR][video] Consolidate implementation of "Play", "Mark watched", "Mark unwatched", "Resume from" context menu items Dec 11, 2016
@ksooo
Copy link
Member Author

ksooo commented Dec 11, 2016

jenkins build this please

@ksooo
Copy link
Member Author

ksooo commented Dec 13, 2016

@Jalle19 any comments? I know it's pain to read the large diff, but that's why i split it up into multiple commits. ;-) Stuff is well runtime tested for some time now, btw. Like always I use my family members as beta testers in the living room. No complaints so far. ;-)

@Jalle19
Copy link
Member

Jalle19 commented Dec 14, 2016

Sorry, missed this one.

@ksooo ksooo force-pushed the refactor-watched-unwatched-resume branch 5 times, most recently from e77caa2 to 0594f40 Compare December 16, 2016 11:27
if (channel)
return CFileItem(channel);
}
return CFileItem(*this);

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

@ksooo ksooo force-pushed the refactor-watched-unwatched-resume branch from 0594f40 to 6e67bec Compare December 16, 2016 21:45
@ksooo
Copy link
Member Author

ksooo commented Dec 17, 2016

jenkins build this please

@ksooo
Copy link
Member Author

ksooo commented Dec 17, 2016

Jenkins macOS error is not related to this PR.

make: *** [/Users/Shared/jenkins/workspace/OSX-64/tools/depends/pre-depends/autoconf-pre-depends/../../pre-build-deps/autoconf-2.68.tar.gz] Error 7
autoconf was not found and could not be built. Aborting.

@ksooo ksooo merged commit c21c7e7 into xbmc:master Dec 17, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: PVR Component: Video Type: Cleanup non-breaking change which removes non-working or unmaintained functionality v18 Leia
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants