Skip to content

Commit

Permalink
Merge pull request #5245 from da-anda/consistent-playback
Browse files Browse the repository at this point in the history 
[UX] consistent playback behavior for music and video
  • Loading branch information
da-anda committed Sep 6, 2014
2 parents bb5cdbc + 481f28c commit f678628
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions xbmc/video/windows/GUIWindowVideoBase.cpp
View file
Expand Up @@ -207,9 +207,19 @@ bool CGUIWindowVideoBase::OnMessage(CGUIMessage& message)
{
return OnInfo(iItem);
}
else if (iAction == ACTION_PLAYER_PLAY && !g_application.m_pPlayer->IsPlayingVideo())
else if (iAction == ACTION_PLAYER_PLAY)
{
return OnResumeItem(iItem);
// if playback is paused or playback speed != 1, return
if (g_application.m_pPlayer->IsPlayingVideo())
{
if (g_application.m_pPlayer->IsPausedPlayback())
return false;
if (g_application.m_pPlayer->GetPlaySpeed() != 1)
return false;
}

// not playing video, or playback speed == 1
return OnResumeItem(iItem);
}
else if (iAction == ACTION_DELETE_ITEM)
{
Expand Down

2 comments on commit f678628

@Tolriq
Copy link
Contributor

@Tolriq Tolriq commented on f678628 Sep 7, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@da-anda are you sure about this change ?

For video, 90% users does use fastforward multiple times to skip intro then press play to resume the media.
Now they'll need to press multiple time rewind hoping they do not press too much, or continue to press forward but loosing more of the current media (and also hoping they do not press too much again).

This is a major change from hardware remote usage point of view.

@da-anda
Copy link
Member

@da-anda da-anda commented on f678628 Sep 7, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when you FFWD or FRWD and press play, it will still continue playing in normal speed (this is handled in cApplication)

Please sign in to comment.