Merge remote-tracking branch 'origin/current' into next

This commit is contained in:
Paulus Schoutsen 2017-07-23 21:33:35 -07:00
commit 8660f52610
64 changed files with 476 additions and 264 deletions

View file

@ -1,7 +1,7 @@
---
layout: page
title: "Media Extractor"
description: "Instructions how to integrate the Media Extrator into Home Assistant."
description: "Instructions how to integrate the Media Extractor into Home Assistant."
date: 2017-07-12 07:00
sidebar: true
comments: false
@ -18,7 +18,7 @@ The `media_extractor` component gets an stream URL and send it to a media player
Media extractor doesn't transcode streams, it just tries to find stream that match requested query.
</p>
To use the media extrator service in your installation, add the following to your `configuration.yaml` file:
To use the media extractor service in your installation, add the following to your `configuration.yaml` file:
```yaml
# Example configuration.yaml entry
@ -59,8 +59,6 @@ This will download the file from the given URL.
| Service data attribute | Optional | Description |
| ---------------------- | -------- | ----------- |
| `entity_id` | yes | Name(s) of entities to seek media on, eg. `media_player.living_room_chromecast`. Defaults to all.
| `entity_id` | yes | Name(s) of entities to seek media on, e.g., `media_player.living_room_chromecast`. Defaults to all.
| `media_content_id` | no | The ID of the content to play. Platform dependent.
| `media_content_type` | no | The type of the content to play. Must be one of MUSIC, TVSHOW, VIDEO, EPISODE, CHANNEL or PLAYLIST MUSIC.