[python] added missing onPlayback* events to python #1001

Merged
merged 2 commits into from Jun 4, 2012

3 participants

@nuka1195

[python] added support for params in SPyEvent(_Function)

is push one to add the missing onPlayback* events to python. replaces #994.

thanks @jmarshallnz, but i think it was hopeless to correct my other branch.

@jmarshallnz
Team Kodi member

Is the other commit coming as well?

@nuka1195

Shortly

@nuka1195

shall we leave the other changes for another time and close #994

@jmarshallnz
Team Kodi member

Sure - changes look fine. Will assign to the June window.

@jmarshallnz jmarshallnz was assigned May 24, 2012
@nuka1195

thanks for your effort and thanks for the code snippets you supplied.

@Montellese Montellese and 1 other commented on an outdated diff May 24, 2012
xbmc/interfaces/python/xbmcmodule/PythonPlayer.cpp
@@ -29,12 +29,12 @@
struct SPyEvent
{
- SPyEvent(CPythonPlayer* player
- , const char* function)
+ SPyEvent(CPythonPlayer *player, const char *function, std::vector<int> &params=std::vector<int>())
@Montellese
Team Kodi member
Montellese added a line comment May 24, 2012

Any reason for the params parameter being a reference and not a const reference?

@nuka1195
nuka1195 added a line comment May 26, 2012

no good reason. will up the change.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@jmarshallnz
Team Kodi member

Mind squashing the fixup commit into 4b0b760. With that done I'm happy to pull it in.

@nuka1195

My Internet is flaking, so I'm on my phone, but what is squashing. I get a not valid Git command and nothing in help.

@MartijnKaijser
Team Kodi member

combining two or more commits into one commit.
search for "git squash" to get more info

@jmarshallnz
Team Kodi member

git rebase -i HEAD~5.

Rearrange commits so the one you want to squash is just after the one you want to squash into, then mark it as a fixup (f) or as squash (s).

@nuka1195

Ok I think I have it rebased correctly, but no Internet on the computer will try in the next day or so.

@nuka1195

well i don't know. i think i messed it up again.

@jmarshallnz
Team Kodi member

You merged (or pulled) instead of rebasing.

From your python_onPlaybackEvents branch, rebase onto your master branch (which I assume is virgin from xbmc's master - if not, rebase on origin/master or whatever your upstream branch is).

git rebase master

That should get rid of the merge commits etc.

The key when maintaining feature branches is to never pull in changes from master unless you have to (you didn't here as far as I can tell), and then, it's preferable to rebase on master instead of merging.

@nuka1195

hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

@jmarshallnz
Team Kodi member

If you're sure your local branch is correct, git push -f to force push it up.

@nuka1195 nuka1195 [python] added support for params in SPyEvent(_Function)
fixup!
changed SPyEvent function params to a const vector
65a2b34
@nuka1195

well i think i lost all the other commits. will have to do this later, but i think the function is correct now.

@nuka1195

65a2b34 and 0ea2bdc is what you want.

@jmarshallnz
Team Kodi member

Cheers - looks good.

@jmarshallnz jmarshallnz merged commit 0f2f1de into xbmc:master Jun 4, 2012
@tru tru added a commit to plexinc/plex-home-theater-public that referenced this pull request May 19, 2014
@tru tru Fix dim screensaver when playing movies.
Fixes #1001
a89709f
@tru tru added a commit to RasPlex/plex-home-theatre that referenced this pull request Aug 21, 2014
@tru tru Fix dim screensaver when playing movies.
Fixes #1001
c563dbb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment