From b14088d5ebebede7f7c71082544044ac04b61ac1 Mon Sep 17 00:00:00 2001
From: Dylan Thies <dylan.thies@gmail.com>
Date: Fri, 4 Jul 2025 20:45:45 -0400
Subject: [PATCH] adding master bedroom combined

---
 configuration.yaml               |  2 +-
 media_players/livingroom.yaml    |  1 +
 media_players/masterbedroom.yanl | 40 ++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 media_players/masterbedroom.yanl

diff --git a/configuration.yaml b/configuration.yaml
index 98694d8..9247d84 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -19,4 +19,4 @@ http:
 #media_player:
 #  - platform: panasonic_bluray
 #    host: 10.0.1.150
-media_player: !include media_players/livingroom.yaml
+media_player: !include_dir_merge_list media_players/
diff --git a/media_players/livingroom.yaml b/media_players/livingroom.yaml
index 8104c80..92c9d72 100644
--- a/media_players/livingroom.yaml
+++ b/media_players/livingroom.yaml
@@ -1,5 +1,6 @@
 - platform: universal
   name: combined_livingroom_tv
+  unique_id: combined_livingroom_tv
   children:
     - media_player.living_room_tv
     - media_player.samsung_8_series_65
diff --git a/media_players/masterbedroom.yanl b/media_players/masterbedroom.yanl
new file mode 100644
index 0000000..6248f0b
--- /dev/null
+++ b/media_players/masterbedroom.yanl
@@ -0,0 +1,40 @@
+- platform: universal
+  name: combined_master_bedroom_tv
+  unique_id: combined_master_bedroom_tv
+  children:
+    - media_player.master_bedroom_tv_2
+    - media_player.samsung_6_series_65
+  commands:
+    turn_on:
+      action: media_player.turn_on
+      target:
+        entity_id: media_player.master_bedroom_tv_2
+    turn_off:
+      action: media_player.turn_off
+      target:
+        entity_id: media_player.master_bedroom_tv_2
+    volume_up:
+      action: media_player.volume_up
+      target:
+        entity_id: media_player.samsung_6_series_65
+    volume_down:
+      action: media_player.volume_down
+      target:
+        entity_id: media_player.samsung_6_series_65
+    volume_mute:
+      action: media_player.volume_mute
+      target:
+        entity_id: media_player.samsung_6_series_65
+      data:
+        is_volume_muted: "{{ is_volume_muted }}"
+    volume_set:
+      action: media_player.volume_set
+      target:
+        entity_id: media_player.samsung_6_series_65
+      data:
+        volume_level: "{{ volume_level }}"
+  attributes:
+    is_volume_muted: media_player.samsung_6_series_65|is_volume_muted
+    volume_level: media_player.samsung_6_series_65|volume_level
+
+