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

[python/json/appmessenger] Announce DPMS state change to XBMCMonitor and JSON #4766

Merged
merged 2 commits into from
Jun 1, 2014

Conversation

herrnst
Copy link
Member

@herrnst herrnst commented May 21, 2014

Follow-up to #4760, enables addon devs to add onDPMSActivated() and onDPMSDeactivated() methods to their XBMCMonitor classes or just take the JSON notification if they like to be informed if the DPMS state changes (messages are sent from CApplication::ToggleDPMS() ).

@herrnst
Copy link
Member Author

herrnst commented May 21, 2014

jenkins build this please

@herrnst
Copy link
Member Author

herrnst commented May 21, 2014

Looks like jenkins had some troubles getting himself sorted on XBMC-LINUX-64...

@MartijnKaijser MartijnKaijser added this to the Pending for inclusion milestone May 24, 2014
@herrnst
Copy link
Member Author

herrnst commented May 31, 2014

ping @Montellese @jimfcarroll ok with this? NB should probably get another jenkins round after the latest rebase.

@Montellese
Copy link
Member

Looks good for me.

@jimfcarroll
Copy link
Member

Should be fine as long as someone tried it out. It looks fine to me.

@herrnst
Copy link
Member Author

herrnst commented Jun 1, 2014

I'm using https://github.com/herrnst/script.xbmc.testing as a little testing addon for this stuff. Upon DPMS activation and deactivation, it happily dumps

16:55:13 T:139697060177664  NOTICE: ### [script.xbmc.testing] - CXBMCMonitor::onDPMSActivated()
16:55:13 T:139697060177664  NOTICE: ### [script.xbmc.testing] - CXBMCMonitor::onNotification() - dumping
16:55:13 T:139697060177664  NOTICE: ### [script.xbmc.testing] - CXBMCMonitor::onNotification() - sender: xbmc
16:55:13 T:139697060177664  NOTICE: ### [script.xbmc.testing] - CXBMCMonitor::onNotification() - methods: GUI.OnDPMSActivated
16:55:13 T:139697060177664  NOTICE: ### [script.xbmc.testing] - CXBMCMonitor::onNotification() - data: null
16:55:34 T:139697060177664  NOTICE: ### [script.xbmc.testing] - CXBMCMonitor::onDPMSDeactivated()
16:55:34 T:139697060177664  NOTICE: ### [script.xbmc.testing] - CXBMCMonitor::onNotification() - dumping
16:55:34 T:139697060177664  NOTICE: ### [script.xbmc.testing] - CXBMCMonitor::onNotification() - sender: xbmc
16:55:34 T:139697060177664  NOTICE: ### [script.xbmc.testing] - CXBMCMonitor::onNotification() - methods: GUI.OnDPMSDeactivated
16:55:34 T:139697060177664  NOTICE: ### [script.xbmc.testing] - CXBMCMonitor::onNotification() - data: null

to xbmc.log, so addons receive the notifications via XBMCMonitor and JSON. Since this is mostly c/p from the screensaver notification things, I guess it'll work on all platforms. So I'd merge this when jenkins doesn't complain (had to rebase and resolve conflicts in the mean time).

jenkins build this please again

jmarshallnz added a commit that referenced this pull request Jun 1, 2014
[python/json/appmessenger] Announce DPMS state change to XBMCMonitor and JSON
@jmarshallnz jmarshallnz merged commit 686ffc8 into xbmc:master Jun 1, 2014
@herrnst herrnst deleted the dpms-message branch June 1, 2014 22:51
@MartijnKaijser MartijnKaijser modified the milestones: Helix 14.0-alpha1, Pending for inclusion Jun 7, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants