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

Fix async_volume_up / async_volume_down #5249

Merged
merged 1 commit into from Jan 10, 2017

Conversation

glance-
Copy link
Contributor

@glance- glance- commented Jan 9, 2017

async_volume_up / async_volume_down should be async versions of
volume_up / volume_down, not a async version of the default variants of
volume_up / volume_down.

The previous code always called into the mediaplayers set_volume_level,
and never into volume_up / volume_down.

Signed-off-by: Anton Lundin glance@acc.umu.se

async_volume_up / async_volume_down should be async versions of
volume_up / volume_down, not a async version of the default variants of
volume_up / volume_down.

The previous code always called into the mediaplayers set_volume_level,
and never into volume_up / volume_down.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
@mention-bot
Copy link

@glance-, thanks for your PR! By analyzing the history of the files in this pull request, we identified @armills, @balloob and @bjarniivarsson to be potential reviewers.

@emlove
Copy link
Contributor

emlove commented Jan 9, 2017

Hmm, good catch, but this change fixes synchronous media players, but will break async media players that don't have a specific async_volume_up implementation. Maybe a try/except NotImplementedError and then revert to the original?

@emlove emlove mentioned this pull request Jan 9, 2017
@glance-
Copy link
Contributor Author

glance- commented Jan 9, 2017

I don't really get what you mean.

If a media player doesn't have a specific async_volume_up, the default volume_up will be called, which does about the same as the previous async_volume_up code, but calling set_volume_level instead of async_set_volume_level.

If theres a MediaPlayerDevice which doesn't implement async_volume_up and doesn't implement set_volume_level, I'd guess its best to just fix that one. As far as I can see, there are none, and if there where one out of tree, async_volume_up / async_volume_down will just start returning NotImplementedError(), and it's quite easy then to just re-wire async_volume_up / async_volume_down to call async_set_volume_level.

@emlove
Copy link
Contributor

emlove commented Jan 9, 2017

The specific case would be an async media player like this:
Implements async_set_volume_level, does not implement async_volume_up/down. The new code would call async_volume_up -> volume_up -> set_volume_level -> NotImplementedError.

I'd be OK merging this for now, since it's better than what's there, but we need a better solution long-term. Async media players should only implement async_set_volume_level, not set_volume_level. The helper functions are there specifically so that each media player doesn't need to reimplement.

@balloob
Copy link
Member

balloob commented Jan 10, 2017

@armills I think that when a media player is async, all things should be async.

I see now that they are "helper" methods. We might just have to decide to move these into the service handlers and remove from the ABC.

@balloob balloob merged commit 7e1629a into home-assistant:dev Jan 10, 2017
@balloob balloob added this to the 0.36 milestone Jan 10, 2017
nordlead2005 pushed a commit to nordlead2005/home-assistant that referenced this pull request Jan 13, 2017
async_volume_up / async_volume_down should be async versions of
volume_up / volume_down, not a async version of the default variants of
volume_up / volume_down.

The previous code always called into the mediaplayers set_volume_level,
and never into volume_up / volume_down.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
@glance- glance- deleted the async_volume_fixes branch January 16, 2017 19:39
balloob pushed a commit that referenced this pull request Jan 27, 2017
* Added forecast support to DarkSky

	modified:   homeassistant/components/sensor/darksky.py
	modified:   tests/components/sensor/test_darksky.py

* Fix async_volume_up / async_volume_down (#5249)

async_volume_up / async_volume_down should be async versions of
volume_up / volume_down, not a async version of the default variants of
volume_up / volume_down.

The previous code always called into the mediaplayers set_volume_level,
and never into volume_up / volume_down.

Signed-off-by: Anton Lundin <glance@acc.umu.se>

* adding a default icon "blind" to a PowerView blinds scene. (#5210)

* adding a default icon "blind" to a PowerView blinds scene.

* Adding icon property to define blind icon. Removed it from the state attributes dict.

* fixing lint error

* Added forecast support to DarkSky

	modified:   homeassistant/components/sensor/darksky.py
	modified:   tests/components/sensor/test_darksky.py

* Use SHA hash to make token harder to guess (#5258)

* Use SHA hash to make token harder to guess

Use hashlib SHA256 to encode object id instead of using it directly.

* Cache access token

Instead of generating a token on the fly cache it in the constructor.

* Fix lint

* Bugfix async device_tracker see callback (#5259)

* Add support for NAD receivers (#5191)

* Add support for NAD receivers

* remove self.update() in various methods

* remove setting attributes in various methods

* Change import to hass style

* Updated Config Validation, extended daily forecast to all supported types

* Fix style errors from previous commit, fix test since adding daily for all supported types

* Removed temperature from daily as it isn't supported

* Added forecast support to DarkSky

	modified:   homeassistant/components/sensor/darksky.py
	modified:   tests/components/sensor/test_darksky.py

* Updated Config Validation, extended daily forecast to all supported types

* Fix style errors from previous commit, fix test since adding daily for all supported types

* Removed temperature from daily as it isn't supported

* Revert "Bugfix camera streams (#5306)"

This reverts commit 4b43537.

Revert "Version bump for kodi dependency (#5307)"

This reverts commit 6abad6b.

Revert "Add HMWIOSwitch to sensor, binary (#5304)"

This reverts commit 2c3f55a.

Revert "Remove GTFS default name & string change"

This reverts commit 6000c59.

Revert "Update pyhomematic 1.19 & small cleanups (#5299)"

This reverts commit a30711f.

Revert "[sensor] Add Dublin bus RTPI sensor (#5257)"

This reverts commit 1219ca3.

Revert "Bugfix group reload (#5292)"

This reverts commit baa8e53.

Revert "Support for TrackR device trackers (#5010)"

This reverts commit f7a1d63.

Revert "Bump pywemo version."

This reverts commit dc937cc.

Revert "Upgrade to voluptuous to 0.9.3 (#5288)"

This reverts commit d12decc.

Revert "Upgrade distro to 1.0.2 (#5291)"

This reverts commit 64800fd.

Revert "Don't build Adafruit_BBIO - doesn't work on all platforms. (#5281)"

This reverts commit 9a3c0c8.

Revert "Convert flic to synchronous platform. (#5276)"

This reverts commit eb9b95c.

Revert "Upgrade to aiohttp 1.2 (#4964)"

This reverts commit e68e29e.

Revert "Fix TCP sensor to correctly use value_template (#5211)"

This reverts commit 1cf9ae5.

Revert "Cleanup language support on TTS (#5255)"

This reverts commit 3f3a3bc.

Revert "Add last triggered to script (#5261)"

This reverts commit 467cb18.

Revert "Bump flux_led version and make use of PyPi package (#5267)"

This reverts commit 34a9fb0.

Revert "Add support for NAD receivers (#5191)"

This reverts commit 3b59e16.

Revert "Bugfix async device_tracker see callback (#5259)"

This reverts commit 71fddd2.

Revert "Use SHA hash to make token harder to guess (#5258)"

This reverts commit 922308b.

* Revert "Revert "Bugfix camera streams (#5306)""

This reverts commit 2ee8c44.

* Update darksky.py
@home-assistant home-assistant locked and limited conversation to collaborators Apr 30, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants