From a1aac4a2e9c84fedd64215cb90a6e997a75146c2 Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Sat, 10 Sep 2022 22:12:37 +0200
Subject: [PATCH] Use new media player enums in esphome (#78099)

---
 .../components/esphome/media_player.py        | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/homeassistant/components/esphome/media_player.py b/homeassistant/components/esphome/media_player.py
index 17635157754..6b72d366754 100644
--- a/homeassistant/components/esphome/media_player.py
+++ b/homeassistant/components/esphome/media_player.py
@@ -7,21 +7,19 @@ from aioesphomeapi import (
     MediaPlayerCommand,
     MediaPlayerEntityState,
     MediaPlayerInfo,
-    MediaPlayerState,
+    MediaPlayerState as EspMediaPlayerState,
 )
 
 from homeassistant.components import media_source
 from homeassistant.components.media_player import (
+    BrowseMedia,
     MediaPlayerDeviceClass,
     MediaPlayerEntity,
-)
-from homeassistant.components.media_player.browse_media import (
-    BrowseMedia,
+    MediaPlayerEntityFeature,
+    MediaPlayerState,
     async_process_play_media_url,
 )
-from homeassistant.components.media_player.const import MediaPlayerEntityFeature
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import STATE_IDLE, STATE_PAUSED, STATE_PLAYING
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -50,11 +48,11 @@ async def async_setup_entry(
     )
 
 
-_STATES: EsphomeEnumMapper[MediaPlayerState, str] = EsphomeEnumMapper(
+_STATES: EsphomeEnumMapper[EspMediaPlayerState, MediaPlayerState] = EsphomeEnumMapper(
     {
-        MediaPlayerState.IDLE: STATE_IDLE,
-        MediaPlayerState.PLAYING: STATE_PLAYING,
-        MediaPlayerState.PAUSED: STATE_PAUSED,
+        EspMediaPlayerState.IDLE: MediaPlayerState.IDLE,
+        EspMediaPlayerState.PLAYING: MediaPlayerState.PLAYING,
+        EspMediaPlayerState.PAUSED: MediaPlayerState.PAUSED,
     }
 )
 
@@ -68,7 +66,7 @@ class EsphomeMediaPlayer(
 
     @property  # type: ignore[misc]
     @esphome_state_property
-    def state(self) -> str | None:
+    def state(self) -> MediaPlayerState | None:
         """Return current state."""
         return _STATES.from_esphome(self._state.state)