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][Settings] Recording timer padding #23644

Merged
merged 1 commit into from Aug 24, 2023
Merged

Conversation

ivanllc
Copy link
Contributor

@ivanllc ivanllc commented Aug 21, 2023

Description

Padding time in PVR Recording settings. Add "2" minutes in padding time option box.

Motivation and context

Padding time should allows user more fine-grained control of recording.
The padding time prevents PVR settings from EGP not match with real broadcasting time, in many cases just a little bit time shift.
0, 1, 2, 3, 5... Fibonacci series?

How has this been tested?

Simple variable return list of integers.

What is the effect on users?

Add padding time option "2" minutes.

Screenshots (if appropriate):

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • Clean up (non-breaking change which removes non-working, unmaintained functionality)
  • [x ] Improvement (non-breaking change which improves existing functionality)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that will cause existing functionality to change)
  • Cosmetic change (non-breaking change that doesn't touch code)
  • Student submission (PR was done for educational purposes and will be treated as such)
  • None of the above (please explain below)

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

@ivanllc ivanllc requested a review from ksooo as a code owner August 21, 2023 11:33
@ivanllc ivanllc changed the title PVR Recording timer padding [PVR][Settings] Recording timer padding Aug 21, 2023
@ivanllc ivanllc changed the title [PVR][Settings] Recording timer padding [PVR][Settings] Recording timer padding label:"Component: PVR" label:"Type: Improvement" Aug 21, 2023
@ivanllc ivanllc changed the title [PVR][Settings] Recording timer padding label:"Component: PVR" label:"Type: Improvement" [PVR][Settings] Recording timer padding Aug 21, 2023
@ksooo ksooo added Type: Improvement non-breaking change which improves existing functionality Component: PVR v21 Omega labels Aug 21, 2023
@ksooo ksooo added this to the Omega 21.0 Alpha 3 milestone Aug 21, 2023
@ksooo
Copy link
Member

ksooo commented Aug 21, 2023

@ivanllc please squash down to a single commit and I will approve the PR. Thanks.

ivanllc added a commit to ivanllc/xbmc that referenced this pull request Aug 22, 2023
commit cbef731
Merge: 3e6a4d8 c22ff3d
Author: ivanllc <tagccgca@gmail.com>
Date:   Mon Aug 21 19:04:07 2023 +0800

    Merge branch 'xbmc:master' into rec_timer_padding

commit 3e6a4d8
Author: ivanllc <tagccgca@gmail.com>
Date:   Sun Aug 20 20:08:25 2023 +0800

    add 2 minutes padding recording time option.
@ivanllc
Copy link
Contributor Author

ivanllc commented Aug 22, 2023

@ivanllc please squash down to a single commit and I will approve the PR. Thanks.

@ksooo coz I don't know how to squash pull request commits in Github web, no "squash and merge button" in my PR view.
I have tried Github desktop and merge form ivanllc/xbmc:rec_timer_padding into ivanllc/xbmc:master (may be incorrect branch operation).
I have read the contribute guide, I also know incorrect git push may mess the commits history, Any tutorial web page or video about that correct squash and merge is welcome, especial in kodi. Thanks.

@ksooo
Copy link
Member

ksooo commented Aug 22, 2023

@garbear
Copy link
Member

garbear commented Aug 22, 2023

I checked the commit history and you should be able to do

git reset --hard 3e6a4d8461b357bd85c8d40bc2d36f00c90b3e76
git push -f

@ivanllc
Copy link
Contributor Author

ivanllc commented Aug 24, 2023

I checked the commit history and you should be able to do

git reset --hard 3e6a4d8461b357bd85c8d40bc2d36f00c90b3e76
git push -f

Thanks,
I have reset it in branch rec_timer_padding and roll back to the commit.
Should i run this command in "master" branch of my repo again coz some incorrect merge(dcaa61c) I have made?

@ksooo
Copy link
Member

ksooo commented Aug 24, 2023

@ivanllc can you please apply the code formatting diff from Jenkins and squash down to a single commit? Then we are ready to go.

Copy link
Member

@ksooo ksooo left a comment

Choose a reason for hiding this comment

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

Thank you very much for your first contribution to the Kodi project.

@ksooo ksooo merged commit 76cea55 into xbmc:master Aug 24, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: PVR Type: Improvement non-breaking change which improves existing functionality v21 Omega
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants