jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-25 14:17:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed universal media player to keep service attrs in dict

Browse Source 
Revised universal media player to keep service data in a dictionary
rather than passing it around as magic parameters.
This commit is contained in:
Ryan Kraus 2016-01-12 01:39:02 -05:00 committed by Paulus Schoutsen
parent a8d5b0e5ec
commit d829497c3d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
homeassistant/components/media_player/universal.py
View File

@ -174,16 +174,16 @@ class UniversalMediaPlayer(MediaPlayerDevice):
active_child = self.active_child_state active_child = self.active_child_state
return active_child.attributes.get(attr_name) if active_child else None return active_child.attributes.get(attr_name) if active_child else None
def _override_or_child_service(self, service_name, **service_data): def _override_or_child_service(self, service_name, service_data):
""" calls either a specified or active child's service """ """ calls either a specified or active child's service """
if service_name in self._cmds: if service_name in self._cmds:
call_from_config( call_from_config(
self.hass, self._cmds[service_name], blocking=True) self.hass, self._cmds[service_name], blocking=True)
return return
self._child_service(service_name, **service_data) self._child_service(service_name, service_data)
def _child_service(self, service_name, **service_data): def _child_service(self, service_name, service_data):
""" calls the active child's specified service """ """ calls the active child's specified service """
active_child = self.active_child_state active_child = self.active_child_state
service_data[ATTR_ENTITY_ID] = active_child.entity_id service_data[ATTR_ENTITY_ID] = active_child.entity_id
@ -376,12 +376,12 @@ class UniversalMediaPlayer(MediaPlayerDevice):
def mute_volume(self, is_volume_muted): def mute_volume(self, is_volume_muted):
""" mute the volume. """ """ mute the volume. """
data = {ATTR_MEDIA_VOLUME_MUTED: is_volume_muted} data = {ATTR_MEDIA_VOLUME_MUTED: is_volume_muted}
self._override_or_child_service(SERVICE_VOLUME_MUTE, **data) self._override_or_child_service(SERVICE_VOLUME_MUTE, data)
def set_volume_level(self, volume_level): def set_volume_level(self, volume_level):
""" set volume level, range 0..1. """ """ set volume level, range 0..1. """
data = {ATTR_MEDIA_VOLUME_LEVEL: volume_level} data = {ATTR_MEDIA_VOLUME_LEVEL: volume_level}
self._child_service(SERVICE_VOLUME_SET, **data) self._child_service(SERVICE_VOLUME_SET, data)
def media_play(self): def media_play(self):
""" Send play commmand. """ """ Send play commmand. """
@ -402,16 +402,17 @@ class UniversalMediaPlayer(MediaPlayerDevice):
def media_seek(self, position): def media_seek(self, position):
""" Send seek command. """ """ Send seek command. """
data = {ATTR_MEDIA_SEEK_POSITION: position} data = {ATTR_MEDIA_SEEK_POSITION: position}
self._child_service(SERVICE_MEDIA_SEEK, **data) self._child_service(SERVICE_MEDIA_SEEK, data)
def play_youtube(self, media_id): def play_youtube(self, media_id):
""" Plays a YouTube media. """ """ Plays a YouTube media. """
self._child_service(SERVICE_YOUTUBE_VIDEO, media_id=media_id) data = {'media_id': media_id}
self._child_service(SERVICE_YOUTUBE_VIDEO, data)
def play_media(self, media_type, media_id): def play_media(self, media_type, media_id):
""" Plays a piece of media. """ """ Plays a piece of media. """
self._child_service( data = {'media_type': media_type, 'media_id': media_id}
SERVICE_PLAY_MEDIA, media_type=media_type, media_id=media_id) self._child_service(SERVICE_PLAY_MEDIA, data)
def volume_up(self): def volume_up(self):
""" volume_up media player. """ """ volume_up media player. """