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] Guide window: Fix selection after channelgroup switching #11879

Merged
merged 3 commits into from
Mar 27, 2017

Conversation

ksooo
Copy link
Member

@ksooo ksooo commented Mar 20, 2017

This PR fixes wrong epg event selection after channel group switching in the PVR Guide window. Expected behavior is that the same event is still selected after a channel group switch, if the previously selected channel is also part of the new channel group. Otherwise, the first channel of the new group is selected.

The second commit introduces asynchrounous channel group switching. The gui render thread is no longer blocked while the epg grid gets refilled. A wait dialog is shown if the refill lasts longer than 100 msecs.

This was runtime tested on macOS and Linux on latest Kodi master.

@Jalle19 for code review?
@xhaggi for runtime testing (you reported the problems ;-)

@ksooo ksooo added Type: Fix non-breaking change which fixes an issue Type: Improvement non-breaking change which improves existing functionality Component: PVR v18 Leia labels Mar 20, 2017
@ksooo ksooo added this to the L 18.0-alpha1 milestone Mar 20, 2017
@ksooo ksooo requested a review from Jalle19 March 20, 2017 06:16
@ksooo ksooo force-pushed the pvr-fix-epg-grid-channelgroup-switching branch 4 times, most recently from 9d3bece to a3a7dcb Compare March 20, 2017 13:32
@ksooo
Copy link
Member Author

ksooo commented Mar 21, 2017

Just discovered that this is not yet ready to merge as I'm now doing a little too aggressive caching. Needs some more love... Adding WIP badge for now.

@ksooo ksooo added the WIP PR that is still being worked on label Mar 21, 2017
@Jalle19
Copy link
Member

Jalle19 commented Mar 21, 2017

Ping me again when you want a new review.

@xhaggi
Copy link
Member

xhaggi commented Mar 21, 2017

same here, let me know if you're happy with it.

@ksooo ksooo force-pushed the pvr-fix-epg-grid-channelgroup-switching branch 6 times, most recently from 30764f5 to 5fe7ca3 Compare March 22, 2017 21:12
@ksooo
Copy link
Member Author

ksooo commented Mar 23, 2017

@Jalle19 @xhaggi Ping. :-) The PR imo is ready for review and runtime test.

@ksooo ksooo removed the WIP PR that is still being worked on label Mar 23, 2017
@ksooo
Copy link
Member Author

ksooo commented Mar 23, 2017

@MilhouseVH could you please include this PR into your next build, to get early feedback in case I broke stuff.

@MilhouseVH
Copy link
Contributor

Will do.

@@ -79,7 +80,7 @@ namespace PVR
void StartRefreshTimelineItemsThread();
void StopRefreshTimelineItemsThread();

std::unique_ptr<CPVRRefreshTimelineItemsThread> m_refreshTimelineItemsThread;
std::shared_ptr<CPVRRefreshTimelineItemsThread> m_refreshTimelineItemsThread;

This comment was marked as spam.

RefreshTimelineItems();
// never call DoRefresh with locked mutex!
if (refreshTimelineItemsThread)
refreshTimelineItemsThread->DoRefresh();

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 pvr-fix-epg-grid-channelgroup-switching branch from 5fe7ca3 to 8cc5697 Compare March 23, 2017 13:53
@ksooo
Copy link
Member Author

ksooo commented Mar 23, 2017

@xhaggi the changes you requested are now in.

@xhaggi
Copy link
Member

xhaggi commented Mar 23, 2017

Looks good thanks

@ksooo
Copy link
Member Author

ksooo commented Mar 23, 2017

Thanks guys. I guess I will wait with the merge for some days to give milhouse build users the chance for some testing.

@ksooo
Copy link
Member Author

ksooo commented Mar 23, 2017

In case we will do a 17.2 release, should we backport this?

@xhaggi
Copy link
Member

xhaggi commented Mar 23, 2017

Sure, because it's a really annoying bug.

@ksooo ksooo force-pushed the pvr-fix-epg-grid-channelgroup-switching branch from 8cc5697 to 4be46fa Compare March 26, 2017 08:39
@ksooo
Copy link
Member Author

ksooo commented Mar 26, 2017

rebased

jenkins build this please

@Jalle19
Copy link
Member

Jalle19 commented Mar 26, 2017

+1 for backport if you're up for it

@ksooo ksooo force-pushed the pvr-fix-epg-grid-channelgroup-switching branch from 4be46fa to 5feed5e Compare March 26, 2017 18:56
@ksooo
Copy link
Member Author

ksooo commented Mar 27, 2017

jenkins build this please

@ksooo ksooo merged commit 8a96c67 into xbmc:master Mar 27, 2017
@ksooo ksooo deleted the pvr-fix-epg-grid-channelgroup-switching branch March 27, 2017 14:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport: Done Component: PVR Type: Fix non-breaking change which fixes an issue Type: Improvement non-breaking change which improves existing functionality v18 Leia
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants