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.

Sign up for GitHub

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

Jump to bottom

[fix][seekhandler] seek size can exceed min and max time of player #13236

Merged
merged 6 commits into from
Dec 23, 2017
Merged

[fix][seekhandler] seek size can exceed min and max time of player #13236

merged 6 commits into from
Dec 23, 2017

Conversation

xhaggi
Copy link
Member

@xhaggi xhaggi commented Dec 22, 2017

The seek size in CSeekHandler could exceed the min and max time of the current playing item. This PR address it and also does some refactoring and cleanups as discussed with @FernetMenta.

@da-anda as you requested

@xhaggi xhaggi added Type: Cleanup non-breaking change which removes non-working or unmaintained functionality Type: Fix non-breaking change which fixes an issue v18 Leia labels Dec 22, 2017
fritsch
fritsch reviewed Dec 23, 2017
View reviewed changes
xbmc/dialogs/GUIDialogSeekBar.cpp
@@ -67,7 +67,7 @@ void CGUIDialogSeekBar::FrameMove()
return;
}

unsigned int percent((!CSeekHandler::GetInstance().InProgress() && g_infoManager.GetTotalPlayTime())
unsigned int percent((!g_application.m_pPlayer->GetSeekHandler().InProgress() && g_infoManager.GetTotalPlayTime())

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

FernetMenta
FernetMenta reviewed Dec 23, 2017
View reviewed changes
xbmc/ApplicationPlayer.h Outdated

private:
std::shared_ptr<IPlayer> m_pPlayer;
std::unique_ptr<CSeekHandler> m_seekHandler;

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

da-anda
da-anda reviewed Dec 23, 2017
View reviewed changes
xbmc/Application.cpp Outdated
@@ -2911,7 +2911,7 @@ void CApplication::Stop(int exitCode)
CServiceBroker::GetServiceAddons().Stop();

// unregister action listeners
UnregisterActionListener(&CSeekHandler::GetInstance());
UnregisterActionListener(&g_application.m_pPlayer->GetSeekHandler());

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

@xhaggi
Copy link
Member Author

xhaggi commented Dec 23, 2017

@FernetMenta @da-anda addressed in the fixup commit, please take another look.

@xhaggi xhaggi merged commit 8e57c10 into xbmc:master Dec 23, 2017
@Rechi Rechi added this to the L 18.0-alpha1 milestone Dec 23, 2017
@xhaggi xhaggi deleted the seek-overstep branch December 25, 2017 10:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fritsch fritsch fritsch left review comments

@da-anda da-anda da-anda left review comments

@FernetMenta FernetMenta FernetMenta approved these changes

Assignees
No one assigned
Labels
Type: Cleanup non-breaking change which removes non-working or unmaintained functionality Type: Fix non-breaking change which fixes an issue v18 Leia
Projects
None yet
Milestone
Leia 18.0-alpha1
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@xhaggi @FernetMenta @fritsch @da-anda @Rechi