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

Fix #313 by catching when unhide occurs and explicitly re-opening video player #326

Merged
merged 1 commit into from Mar 13, 2015

Conversation

tdicola
Copy link

@tdicola tdicola commented Mar 12, 2015

This fixes a bug with the hide & unhide video actions, #313. The issue is that hide will close the video player component and unhide will cause a seek which expects the video player to be re-opened. However an optimization was made to seek so that it wouldn't close and re-open the video player (#322), and this ends up breaking unhide.

As a fix this change catches the case where unhide occurs and does an explicit re-open of the video player. For all other seeks (like looping, user initiated seek, etc.) the quick reset occurs instead of a full close & open.

I tested this by playing a video and using the dbuscontrol.sh to run hide, unhide, and setvideopos. Before the fix hide would work but neither unhide or setvideopos would work as expected. After the fix the same commands work as expected--hide will stop displaying the video, unhide will show the video again, and setvideopos will change what area of the screen displays the video.

@tdicola
Copy link
Author

tdicola commented Mar 12, 2015

Just updated to remove that redundant part and gave it a quick test to make sure hide, unhide, and setvideopos worked as expected.

@popcornmix
Copy link
Owner

Can you squash the two commits and force push?

@tdicola
Copy link
Author

tdicola commented Mar 12, 2015

No problem, should be one commit now. Let me know if there are any issues, thanks!

@42loop
Copy link

42loop commented Mar 13, 2015

fix #313 makes the dbus functions work, but breaks the loop functionality

@popcornmix
Copy link
Owner

@42loop are you saying that loop functionality is broken with this PR?
We know #313 broke it, but this PR should fix it.

@42loop
Copy link

42loop commented Mar 13, 2015

sorry, got the wrong number(313). but anyway, pull request #326, as stated above, fixes the dbus issue but loop does not work

@42loop
Copy link

42loop commented Mar 13, 2015

sorry again, i restarted with a fresh copy including compiling the new ffmeg, and the pull request #326 works.

popcornmix added a commit that referenced this pull request Mar 13, 2015
Fix #313 by catching when unhide occurs and explicitly re-opening video player
@popcornmix popcornmix merged commit 4a91dd8 into popcornmix:master Mar 13, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants