From 38445df0dacd3c20b6df1321fda7d5351dabf176 Mon Sep 17 00:00:00 2001
From: Georgi Gardev <georgi@gardev.com>
Date: Sun, 15 Mar 2020 11:07:17 +0200
Subject: [PATCH] Fix sonos leader usage

---
 lovelace/00_home.yaml        | 42 ++++++++++++++++++++----------------
 packages/modules/music.yaml  | 11 ++++++++++
 packages/modules/speech.yaml |  3 +--
 3 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/lovelace/00_home.yaml b/lovelace/00_home.yaml
index a4be95e..a234832 100644
--- a/lovelace/00_home.yaml
+++ b/lovelace/00_home.yaml
@@ -49,25 +49,29 @@ cards:
           - media_player.nvidia_shield
           - fan.philips_airpurifier
 
-      - type: "custom:mini-media-player"
-        artwork: cover
-        entity: media_player.master_bedroom
-        speaker_group:
-          sync_volume: true
-          entities:
-            - entity_id: media_player.master_bedroom
-              name: Master Bedroom
-            - entity_id: media_player.living_room
-              name: Livingroom
-            - entity_id: media_player.kitchen
-              name: Kitchen
-        hide:
-          power: true
-          icon: true
-          shuffle: false
-        idle_view:
-          when_idle: true
-          when_standby: true
+      - type: custom:config-template-card
+        entities:
+          - input_select.sonos_leader
+        card:
+          type: custom:mini-media-player
+          artwork: cover
+          entity: ${states['input_select.sonos_leader'].state}
+          speaker_group:
+            sync_volume: true
+            entities:
+              - entity_id: media_player.master_bedroom
+                name: Master Bedroom
+              - entity_id: media_player.living_room
+                name: Livingroom
+              - entity_id: media_player.kitchen
+                name: Kitchen
+          hide:
+            power: true
+            icon: true
+            shuffle: false
+          idle_view:
+            when_idle: true
+            when_standby: true
 
       - type: entities
         title: Manual Overrides
diff --git a/packages/modules/music.yaml b/packages/modules/music.yaml
index 2653516..4fa3698 100644
--- a/packages/modules/music.yaml
+++ b/packages/modules/music.yaml
@@ -16,6 +16,17 @@ input_select:
       - media_player.living_room
       - media_player.kitchen
 
+binary_sensor:
+  - platform: template
+    sensors:
+      sonos_leader_paused:
+        value_template: "{{ is_state(states.input_select.sonos_leader.state, 'paused') }}"
+        entity_id:
+          - input_select.sonos_leader
+          - media_player.master_bedroom
+          - media_player.kitchen
+          - media_player.living_room
+
 script:
   music_play:
     alias: Music · Play
diff --git a/packages/modules/speech.yaml b/packages/modules/speech.yaml
index 8ae7672..ccbd92f 100644
--- a/packages/modules/speech.yaml
+++ b/packages/modules/speech.yaml
@@ -67,8 +67,7 @@ script:
           message: "{{ message }}"
       # Wait for phrase to be over and mark as not talking.
       - delay: 00:00:01
-      # TODO: Use sonos_leader, otherwise the whole thing is kinda pointless :/
-      - wait_template: "{{ is_state('media_player.master_bedroom', 'paused') }}"
+      - wait_template: "{{ is_state('binary_sensor.sonos_leader_paused', 'on') }}"
         timeout: 00:02:00
       - service: input_boolean.turn_off
         entity_id: input_boolean.sarah_talking