Extend Functionality of Media_Player

aioesphomeapi/api.proto

@@ -1121,17 +1121,36 @@ message ButtonCommandRequest {
 
 // ==================== MEDIA PLAYER ====================
 enum MediaPlayerState {
-  MEDIA_PLAYER_STATE_NONE = 0;
-  MEDIA_PLAYER_STATE_IDLE = 1;
-  MEDIA_PLAYER_STATE_PLAYING = 2;
-  MEDIA_PLAYER_STATE_PAUSED = 3;
+  MEDIA_PLAYER_STATE_OFF = 0;
+  MEDIA_PLAYER_STATE_ON = 1;
+  MEDIA_PLAYER_STATE_NONE = 2;
+  MEDIA_PLAYER_STATE_IDLE = 3;
+  MEDIA_PLAYER_STATE_PLAYING = 4;
+  MEDIA_PLAYER_STATE_PAUSED = 5;
+  MEDIA_PLAYER_STATE_ANNOUNCING = 6;
+
 }
 enum MediaPlayerCommand {
   MEDIA_PLAYER_COMMAND_PLAY = 0;
   MEDIA_PLAYER_COMMAND_PAUSE = 1;
   MEDIA_PLAYER_COMMAND_STOP = 2;
   MEDIA_PLAYER_COMMAND_MUTE = 3;
   MEDIA_PLAYER_COMMAND_UNMUTE = 4;
+  MEDIA_PLAYER_COMMAND_TOGGLE = 5;
+  MEDIA_PLAYER_COMMAND_VOLUME_UP = 6;
+  MEDIA_PLAYER_COMMAND_VOLUME_DOWN = 7;
+  MEDIA_PLAYER_COMMAND_NEXT_TRACK = 8;
+  MEDIA_PLAYER_COMMAND_PREVIOUS_TRACK = 9;
+  MEDIA_PLAYER_COMMAND_TURN_ON = 10;
+  MEDIA_PLAYER_COMMAND_TURN_OFF = 11;
+  MEDIA_PLAYER_COMMAND_CLEAR_PLAYLIST = 12;
+  MEDIA_PLAYER_COMMAND_SHUFFLE = 13;
+  MEDIA_PLAYER_COMMAND_UNSHUFFLE = 14;
+  MEDIA_PLAYER_COMMAND_REPEAT_OFF = 15;
+  MEDIA_PLAYER_COMMAND_REPEAT_ONE = 16;
+  MEDIA_PLAYER_COMMAND_REPEAT_ALL = 17;
+  MEDIA_PLAYER_COMMAND_JOIN = 18;
+  MEDIA_PLAYER_COMMAND_UNJOIN = 19;
 }
 message ListEntitiesMediaPlayerResponse {
   option (id) = 63;
@@ -1148,6 +1167,9 @@ message ListEntitiesMediaPlayerResponse {
   EntityCategory entity_category = 7;
 
   bool supports_pause = 8;
+  bool supports_next_previous_track = 9;
+  bool supports_turn_off_on = 10;
+  bool supports_grouping = 11;
 }
 message MediaPlayerStateResponse {
   option (id) = 64;
@@ -1158,6 +1180,13 @@ message MediaPlayerStateResponse {
   MediaPlayerState state = 2;
   float volume = 3;
   bool muted = 4;
+  string repeat = 5;
+  bool shuffle = 6;
+  string artist = 7;
+  string album = 8;
+  string title = 9;
+  int32 duration = 10;
+  int32 position = 11;
 }
 message MediaPlayerCommandRequest {
   option (id) = 65;
@@ -1178,6 +1207,12 @@ message MediaPlayerCommandRequest {
 
   bool has_announcement = 8;
   bool announcement = 9;
+
+  bool has_enqueue = 10;
+  string enqueue = 11;
+
+  bool has_group_members = 12;
+  string group_members = 13;
 }
 
 // ==================== BLUETOOTH ====================

aioesphomeapi/client.py

@@ -1196,6 +1196,8 @@ def media_player_command(
         volume: float | None = None,
         media_url: str | None = None,
         announcement: bool | None = None,
+        enqueue: str | None = None,
+        group_members: str | None = None,
     ) -> None:
         req = MediaPlayerCommandRequest(key=key)
         if command is not None:
@@ -1210,6 +1212,12 @@ def media_player_command(
         if announcement is not None:
             req.announcement = announcement
             req.has_announcement = True
+        if enqueue is not None:
+            req.enqueue = enqueue
+            req.has_enqueue = True
+        if group_members is not None:
+            req.group_members = group_members
+            req.has_group_members = True
         self._get_connection().send_message(req)
 
     def text_command(self, key: int, state: str) -> None:

aioesphomeapi/model.py

@@ -806,10 +806,13 @@ class ValveState(EntityState):
 
 # ==================== MEDIA PLAYER ====================
 class MediaPlayerState(APIIntEnum):
-    NONE = 0
-    IDLE = 1
-    PLAYING = 2
-    PAUSED = 3
+    OFF = 0
+    ON = 1
+    NONE = 2
+    IDLE = 3
+    PLAYING = 4
+    PAUSED = 5
+    ANNOUNCING = 6
 
 
 class MediaPlayerCommand(APIIntEnum):
@@ -818,22 +821,49 @@ class MediaPlayerCommand(APIIntEnum):
     STOP = 2
     MUTE = 3
     UNMUTE = 4
+    TOGGLE = 5
+    VOLUME_UP = 6
+    VOLUME_DOWN = 7
+    NEXT_TRACK = 8
+    PREVIOUS_TRACK = 9
+    TURN_ON = 10
+    TURN_OFF = 11
+
+    CLEAR_PLAYLIST = 12
+    SHUFFLE = 13
+    UNSHUFFLE = 14
+    REPEAT_OFF = 15
+    REPEAT_ONE = 16
+    REPEAT_ALL = 17
+    JOIN = 18
+    UNJOIN = 19
 
 
 @_frozen_dataclass_decorator
 class MediaPlayerInfo(EntityInfo):
     supports_pause: bool = False
+    supports_next_previous_track: bool = False
+    supports_turn_off_on: bool = False
+    supports_grouping: bool = False
 
 
 @_frozen_dataclass_decorator
 class MediaPlayerEntityState(EntityState):
     state: MediaPlayerState | None = converter_field(
-        default=MediaPlayerState.NONE, converter=MediaPlayerState.convert
+        default=MediaPlayerState.OFF, converter=MediaPlayerState.convert
     )
     volume: float = converter_field(
         default=0.0, converter=fix_float_single_double_conversion
     )
     muted: bool = False
+    repeat: str = ""
+    shuffle: bool = False
+
+    artist: str = ""
+    album: str = ""
+    title: str = ""
+    duration: int = 0
+    position: int = 0
 
 
 # ==================== ALARM CONTROL PANEL ====================

tests/test_client.py

@@ -797,7 +797,13 @@ async def test_select_command(
         ),
         (
             dict(key=1, media_url="http://example.com"),
-            dict(key=1, has_media_url=True, media_url="http://example.com"),
+            dict(
+                key=1,
+                has_media_url=True,
+                media_url="http://example.com" 
+                has_enqueue=True,
+                enqueue="replace"
+            ),
         ),
         (
             dict(key=1, media_url="http://example.com", announcement=True),
@@ -809,6 +815,16 @@ async def test_select_command(
                 announcement=True,
             ),
         ),
+        (
+            dict(key=1, command=MediaPlayerCommand.JOIN),
+            dict(
+                 key=1,
+                 has_command=True, 
+                 command=MediaPlayerCommand.JOIN,
+                 has_group_members=True,
+                 group_members="media_player.media_player_2,",
+                 ),
+        ),
     ],
 )
 async def test_media_player_command(