This repository has been archived by the owner on Apr 15, 2023. It is now read-only.
Add iLastPlayedPosition to PVR_RECORDING #170
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
opdenkamp
pushed a commit
that referenced
this pull request
Mar 7, 2013
|
the second commit needs to be rebased. the other ones could be merged in in 1 go, since they either applied cleanly or were easily fixed. this one needed more time than i got right now ;-) |
|
Thanks for pulling everything! Quickly rebased and tested this one. The auto merge didn't work, both conflicting functions had to be appended. I updated the changelog as well to describe the added functionality. |
| if (it->second.Framterate() <0) | ||
| it->second.SetFramerate(m_db.GetRecordingFrameRate(it->second)); | ||
| float frameRate = (float)it->second.Framterate() / 1000.0f; | ||
| if (programInfo.Framterate() < 0) |
There was a problem hiding this comment.
and fix the silly typo next round ;)
There was a problem hiding this comment.
Thanks for the post merge review ;)
I'll fix it up right away, that's the downside of editors with auto completion.
opdenkamp
pushed a commit
that referenced
this pull request
Mar 7, 2013
Add iLastPlayedPosition to PVR_RECORDING
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sync with xbmc/xbmc#1823