From afd99a0c6ccf59fbb4d01d947f8945834222ede4 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Sun, 31 May 2015 00:38:14 -0700
Subject: [PATCH] Media Player and cast improvements

---
 homeassistant/components/frontend/version.py  |  2 +-
 .../frontend/www_static/frontend.html         | 21 +++++++++++--------
 .../cards/state-card-media_player.html        | 17 ++++++++-------
 .../more-infos/more-info-media_player.html    |  6 +++---
 .../components/media_player/__init__.py       |  5 +++++
 homeassistant/components/media_player/cast.py | 18 +++++++++++++++-
 requirements.txt                              |  2 +-
 7 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/homeassistant/components/frontend/version.py b/homeassistant/components/frontend/version.py
index 93571ba7d39..b69400142e0 100644
--- a/homeassistant/components/frontend/version.py
+++ b/homeassistant/components/frontend/version.py
@@ -1,2 +1,2 @@
 """ DO NOT MODIFY. Auto-generated by build_frontend script """
-VERSION = "d9e860658bd8d9767b748b1b193776e6"
+VERSION = "6fb0e76d325bb7472fa25355e60539cd"
diff --git a/homeassistant/components/frontend/www_static/frontend.html b/homeassistant/components/frontend/www_static/frontend.html
index d18421cfc90..1a23b706988 100644
--- a/homeassistant/components/frontend/www_static/frontend.html
+++ b/homeassistant/components/frontend/www_static/frontend.html
@@ -22208,13 +22208,8 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
     <div class="horizontal justified layout">
       <state-info state-obj="[[stateObj]]"></state-info>
       <div class="state">
-        <template is="dom-if" if="[[stateObj.attributes.media_title]]">
-          <div class="main-text">[[stateObj.attributes.media_title]]</div>
-          <div class="secondary-text">[[stateObj.stateDisplay]]</div>
-        </template>
-        <template is="dom-if" if="[[!stateObj.attributes.media_title]]">
-          <div class="main-text">[[stateObj.stateDisplay]]</div>
-        </template>
+        <div class="main-text">[[computePrimaryText(stateObj)]]</div>
+        <div class="secondary-text">[[computeSecondaryText(stateObj)]]</div>
       </div>
     </div>
   </template>
@@ -22230,6 +22225,14 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         type: Object,
       },
     },
+
+    computePrimaryText: function(stateObj) {
+      return stateObj.attributes.media_title || stateObj.stateDisplay;
+    },
+
+    computeSecondaryText: function(stateObj) {
+      return stateObj.attributes.media_title ? stateObj.stateDisplay : '';
+    },
   });
 })();
 </script>
@@ -25726,9 +25729,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
   <template>
     <div class="layout horizontal">
       <div class="flex">
-        <paper-button on-tap="handleTogglePower">[[computePowerButtonCaption(isIdle)]]</paper-button>
+        <paper-icon-button icon="power-settings-new" on-tap="handleTogglePower"></paper-icon-button>
       </div>
-      <div class="">
+      <div>
         <template is="dom-if" if="[[!isIdle]]">
           <paper-icon-button icon="av:skip-previous" on-tap="handlePrevious"></paper-icon-button>
           <paper-icon-button icon="[[computePlayPauseIcon(stateObj)]]" on-tap="handlePlayPause"></paper-icon-button>
diff --git a/homeassistant/components/frontend/www_static/polymer/cards/state-card-media_player.html b/homeassistant/components/frontend/www_static/polymer/cards/state-card-media_player.html
index 4c405149efe..a9709795d7f 100644
--- a/homeassistant/components/frontend/www_static/polymer/cards/state-card-media_player.html
+++ b/homeassistant/components/frontend/www_static/polymer/cards/state-card-media_player.html
@@ -32,13 +32,8 @@
     <div class='horizontal justified layout'>
       <state-info state-obj="[[stateObj]]"></state-info>
       <div class='state'>
-        <template is='dom-if' if='[[stateObj.attributes.media_title]]'>
-          <div class='main-text'>[[stateObj.attributes.media_title]]</div>
-          <div class='secondary-text'>[[stateObj.stateDisplay]]</div>
-        </template>
-        <template is='dom-if' if='[[!stateObj.attributes.media_title]]'>
-          <div class='main-text'>[[stateObj.stateDisplay]]</div>
-        </template>
+        <div class='main-text'>[[computePrimaryText(stateObj)]]</div>
+        <div class='secondary-text'>[[computeSecondaryText(stateObj)]]</div>
       </div>
     </div>
   </template>
@@ -54,6 +49,14 @@
         type: Object,
       },
     },
+
+    computePrimaryText: function(stateObj) {
+      return stateObj.attributes.media_title || stateObj.stateDisplay;
+    },
+
+    computeSecondaryText: function(stateObj) {
+      return stateObj.attributes.media_title ? stateObj.stateDisplay : '';
+    },
   });
 })();
 </script>
diff --git a/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-media_player.html b/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-media_player.html
index 65c7a60611c..8dd20fdbabe 100644
--- a/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-media_player.html
+++ b/homeassistant/components/frontend/www_static/polymer/more-infos/more-info-media_player.html
@@ -1,6 +1,5 @@
 <link rel='import' href='../bower_components/polymer/polymer.html'>
 
-<link rel='import' href='../bower_components/paper-button/paper-button.html'>
 <link rel='import' href='../bower_components/paper-icon-button/paper-icon-button.html'>
 
 <dom-module id='more-info-media_player'>
@@ -16,9 +15,10 @@
   <template>
     <div class='layout horizontal'>
       <div class='flex'>
-        <paper-button on-tap='handleTogglePower'>[[computePowerButtonCaption(isIdle)]]</paper-button>
+        <paper-icon-button icon='power-settings-new'
+          on-tap='handleTogglePower'></paper-icon-button>
       </div>
-      <div class=''>
+      <div>
         <template is='dom-if' if='[[!isIdle]]'>
           <paper-icon-button icon='av:skip-previous'
             on-tap='handlePrevious'></paper-icon-button>
diff --git a/homeassistant/components/media_player/__init__.py b/homeassistant/components/media_player/__init__.py
index 537a5f16f39..0ce00eae43f 100644
--- a/homeassistant/components/media_player/__init__.py
+++ b/homeassistant/components/media_player/__init__.py
@@ -130,6 +130,7 @@ SERVICE_TO_METHOD = {
     SERVICE_MEDIA_PLAY: 'media_play',
     SERVICE_MEDIA_PAUSE: 'media_pause',
     SERVICE_MEDIA_NEXT_TRACK: 'media_next_track',
+    SERVICE_MEDIA_PREV_TRACK: 'media_prev_track',
 }
 
 
@@ -211,6 +212,10 @@ class MediaPlayerDevice(Entity):
         """ media_pause media player. """
         pass
 
+    def media_prev_track(self):
+        """ media_prev_track media player. """
+        pass
+
     def media_next_track(self):
         """ media_next_track media player. """
         pass
diff --git a/homeassistant/components/media_player/cast.py b/homeassistant/components/media_player/cast.py
index f18c1db0760..9a9244a6939 100644
--- a/homeassistant/components/media_player/cast.py
+++ b/homeassistant/components/media_player/cast.py
@@ -24,6 +24,8 @@ from homeassistant.components.media_player import (
     MEDIA_STATE_PLAYING, MEDIA_STATE_PAUSED, MEDIA_STATE_STOPPED,
     MEDIA_STATE_UNKNOWN)
 
+CAST_SPLASH = 'https://home-assistant.io/images/cast/splash.png'
+
 
 # pylint: disable=unused-argument
 def setup_platform(hass, config, add_devices, discovery_info=None):
@@ -130,6 +132,13 @@ class CastDevice(MediaPlayerDevice):
 
         return state_attr
 
+    def turn_on(self):
+        """ Turns on the ChromeCast. """
+        # The only way we can turn the Chromecast is on is by launching an app
+        if not self.cast.status.is_active_input:
+            self.cast.play_media(
+                CAST_SPLASH, pychromecast.STREAM_TYPE_BUFFERED)
+
     def turn_off(self):
         """ Service to exit any running app on the specimedia player ChromeCast and
         shows idle screen. Will quit all ChromeCasts if nothing specified.
@@ -163,6 +172,14 @@ class CastDevice(MediaPlayerDevice):
         if self.media_state == MEDIA_STATE_PLAYING:
             self.cast.media_controller.pause()
 
+    def media_prev_track(self):
+        """ media_prev_track media player. """
+        self.cast.media_controller.rewind()
+
+    def media_next_track(self):
+        """ media_next_track media player. """
+        self.cast.media_controller.skip()
+
     def play_youtube_video(self, video_id):
         """ Plays specified video_id on the Chromecast's YouTube channel. """
         self.youtube.play_video(video_id)
@@ -170,7 +187,6 @@ class CastDevice(MediaPlayerDevice):
     def new_cast_status(self, status):
         """ Called when a new cast status is received. """
         self.cast_status = status
-        self.media_status = None
         self.update_ha_state()
 
     def new_media_status(self, status):
diff --git a/requirements.txt b/requirements.txt
index 5dc0e7cc18b..624cd3797cd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,7 +18,7 @@ phue>=0.8
 ledcontroller>=1.0.7
 
 # media_player.cast
-pychromecast>=0.6.0.3
+pychromecast>=0.6.2
 
 # keyboard
 pyuserinput>=0.1.9