Fixed OnPlayBackResumed not getting fired anymore. #10739

razzeee · 2016-10-20T22:22:13Z

Description

Make sure OnPlayBackResumed get's fired when we resume.

Motivation and Context

http://trac.kodi.tv/ticket/16976#ticket

How Has This Been Tested?

Tested on windows 10 in the vs debugger

Types of change

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

My code follows the Code guidelines of this project
My change requires a change to the documentation, either Doxygen or wiki
I have updated the documentation accordingly
I have read the CONTRIBUTING document
I have added tests to cover my change
All new and existing tests passed

xbmc/cores/VideoPlayer/VideoPlayer.cpp

@@ -3104,7 +3104,6 @@ void CVideoPlayer::Pause()
  if (GetSpeed() == 0)
  {
    SetSpeed(1);


xbmc/cores/VideoPlayer/VideoPlayer.cpp

@@ -3647,6 +3646,8 @@ void CVideoPlayer::SetSpeed(float speed)

  m_newPlaySpeed = speed * DVD_PLAYSPEED_NORMAL;
  SetPlaySpeed(speed * DVD_PLAYSPEED_NORMAL);
+  if (speed == 1)


razzeee · 2016-10-21T21:38:31Z

Updated

garbear · 2016-10-21T22:00:21Z

I don't think that this will work, because if you call SetSpeed(1) then SetSpeed(2) it will call m_callback.OnPlayBackPaused();

razzeee · 2016-10-21T22:28:14Z

Right forgot about fast forward

garbear · 2016-10-21T22:35:38Z

add the new speed to the comparison.

if (old == 0 && new != 0) OnResume();
else if (old != 0 && new == 0) OnPause();

xbmc/cores/VideoPlayer/VideoPlayer.cpp

  m_newPlaySpeed = speed * DVD_PLAYSPEED_NORMAL;
  SetPlaySpeed(speed * DVD_PLAYSPEED_NORMAL);
+  if (m_oldPlayerSpeed == 0)


razzeee · 2016-10-26T23:02:05Z

Updated, I hope I understood you this time :)

xbmc/cores/VideoPlayer/VideoPlayer.cpp

@@ -3647,6 +3645,14 @@ void CVideoPlayer::SetSpeed(float speed)

  m_newPlaySpeed = speed * DVD_PLAYSPEED_NORMAL;
  SetPlaySpeed(speed * DVD_PLAYSPEED_NORMAL);
+  if (m_newPlaySpeed == DVD_PLAYSPEED_NORMAL && m_playSpeed != DVD_PLAYSPEED_NORMAL)


xbmc/cores/VideoPlayer/VideoPlayer.cpp

+          m_callback.OnPlayBackResumed();
+      else if (m_newPlaySpeed == DVD_PLAYSPEED_PAUSE)
+          m_callback.OnPlayBackPaused();
+  }
  SetPlaySpeed(speed * DVD_PLAYSPEED_NORMAL);


xbmc/cores/VideoPlayer/VideoPlayer.cpp

@@ -3646,6 +3644,13 @@ void CVideoPlayer::SetSpeed(float speed)
    return;

  m_newPlaySpeed = speed * DVD_PLAYSPEED_NORMAL;
+  if (m_newPlaySpeed != m_playSpeed)
+  {
+      if (m_newPlaySpeed == DVD_PLAYSPEED_NORMAL)


razzeee · 2016-10-30T19:23:07Z

Updated

razzeee · 2016-10-30T21:44:16Z

jenkins build this please

xbmc/cores/VideoPlayer/VideoPlayer.cpp

+    if (m_newPlaySpeed == DVD_PLAYSPEED_NORMAL)
+        m_callback.OnPlayBackResumed();
+    else if (m_newPlaySpeed == DVD_PLAYSPEED_PAUSE)
+        m_callback.OnPlayBackPaused();


razzeee · 2016-10-31T19:05:39Z

jenkins build this please

MartijnKaijser · 2016-11-01T09:19:36Z

@FernetMenta all good now?
jenkins build this please

FernetMenta · 2016-11-01T09:57:25Z

looks good

razzeee commented Oct 20, 2016

View reviewed changes

xbmc/cores/VideoPlayer/VideoPlayer.cpp

@@ -3104,7 +3104,6 @@ void CVideoPlayer::Pause()

if (GetSpeed() == 0)

{

SetSpeed(1);

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

FernetMenta reviewed Oct 21, 2016

View reviewed changes

xbmc/cores/VideoPlayer/VideoPlayer.cpp

@@ -3647,6 +3646,8 @@ void CVideoPlayer::SetSpeed(float speed)

m_newPlaySpeed = speed * DVD_PLAYSPEED_NORMAL;

SetPlaySpeed(speed * DVD_PLAYSPEED_NORMAL);

if (speed == 1)

This comment was marked as spam.

Sign in to view

razzeee force-pushed the fixe-onPLaybackResumed-event branch from fed3939 to 69ad77b Compare October 21, 2016 21:37

FernetMenta reviewed Oct 22, 2016

View reviewed changes

xbmc/cores/VideoPlayer/VideoPlayer.cpp

m_newPlaySpeed = speed * DVD_PLAYSPEED_NORMAL;

SetPlaySpeed(speed * DVD_PLAYSPEED_NORMAL);

if (m_oldPlayerSpeed == 0)

This comment was marked as spam.

Sign in to view

FernetMenta added this to the Krypton 17.0-beta5 milestone Oct 26, 2016

FernetMenta added Type: Fix non-breaking change which fixes an issue v17 Krypton Component: Video labels Oct 26, 2016

razzeee force-pushed the fixe-onPLaybackResumed-event branch from 69ad77b to 430fa45 Compare October 26, 2016 23:00

FernetMenta reviewed Oct 27, 2016

View reviewed changes

MartijnKaijser mentioned this pull request Oct 27, 2016

[AirTunes/DACP] - fix remote control #10789

Merged

razzeee force-pushed the fixe-onPLaybackResumed-event branch from 430fa45 to c3b28c7 Compare October 27, 2016 22:28

garbear reviewed Oct 27, 2016

View reviewed changes

FernetMenta reviewed Oct 28, 2016

View reviewed changes

xbmc/cores/VideoPlayer/VideoPlayer.cpp

@@ -3646,6 +3644,13 @@ void CVideoPlayer::SetSpeed(float speed)

return;

m_newPlaySpeed = speed * DVD_PLAYSPEED_NORMAL;

if (m_newPlaySpeed != m_playSpeed)

{

if (m_newPlaySpeed == DVD_PLAYSPEED_NORMAL)

This comment was marked as spam.

Sign in to view

MartijnKaijser modified the milestones: Krypton 17.0-beta5, Krypton 17.0-beta6 Oct 28, 2016

razzeee force-pushed the fixe-onPLaybackResumed-event branch from c3b28c7 to 8e1f559 Compare October 30, 2016 19:22

garbear reviewed Oct 30, 2016

View reviewed changes

xbmc/cores/VideoPlayer/VideoPlayer.cpp

if (m_newPlaySpeed == DVD_PLAYSPEED_NORMAL)

m_callback.OnPlayBackResumed();

else if (m_newPlaySpeed == DVD_PLAYSPEED_PAUSE)

m_callback.OnPlayBackPaused();

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

Fixed OnPlayBackResumed not getting fired anymore.

0d4eec0

razzeee force-pushed the fixe-onPLaybackResumed-event branch from 8e1f559 to 0d4eec0 Compare October 30, 2016 21:51

MartijnKaijser merged commit aa3c8fa into xbmc:master Nov 1, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed OnPlayBackResumed not getting fired anymore. #10739

Fixed OnPlayBackResumed not getting fired anymore. #10739

razzeee commented Oct 20, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

razzeee commented Oct 21, 2016

garbear commented Oct 21, 2016

razzeee commented Oct 21, 2016

garbear commented Oct 21, 2016 •

edited

This comment was marked as spam.

razzeee commented Oct 26, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

razzeee commented Oct 30, 2016

razzeee commented Oct 30, 2016

This comment was marked as spam.

This comment was marked as spam.

razzeee commented Oct 31, 2016

MartijnKaijser commented Nov 1, 2016

FernetMenta commented Nov 1, 2016

Fixed OnPlayBackResumed not getting fired anymore. #10739

Fixed OnPlayBackResumed not getting fired anymore. #10739

Conversation

razzeee commented Oct 20, 2016

Description

Motivation and Context

How Has This Been Tested?

Types of change

Checklist:

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

razzeee commented Oct 21, 2016

garbear commented Oct 21, 2016

razzeee commented Oct 21, 2016

garbear commented Oct 21, 2016 • edited

This comment was marked as spam.

razzeee commented Oct 26, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

razzeee commented Oct 30, 2016

razzeee commented Oct 30, 2016

This comment was marked as spam.

This comment was marked as spam.

razzeee commented Oct 31, 2016

MartijnKaijser commented Nov 1, 2016

FernetMenta commented Nov 1, 2016

garbear commented Oct 21, 2016 •

edited