Extend Functionality of Media_Player

aioesphomeapi/api.proto

@@ -1126,13 +1126,32 @@ enum MediaPlayerState {
   MEDIA_PLAYER_STATE_IDLE = 1;
   MEDIA_PLAYER_STATE_PLAYING = 2;
   MEDIA_PLAYER_STATE_PAUSED = 3;
+  MEDIA_PLAYER_STATE_ANNOUNCING = 4;
+  MEDIA_PLAYER_STATE_OFF = 5;
+  MEDIA_PLAYER_STATE_ON = 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;
 }
 enum MediaPlayerFormatPurpose {
   MEDIA_PLAYER_FORMAT_PURPOSE_DEFAULT = 0;
@@ -1162,8 +1181,10 @@ message ListEntitiesMediaPlayerResponse {
   EntityCategory entity_category = 7;
 
   bool supports_pause = 8;
-
   repeated MediaPlayerSupportedFormat supported_formats = 9;
+  bool supports_turn_off_on = 10;
+  bool supports_grouping = 11;
+  bool supports_next_previous_track = 12;
 }
 message MediaPlayerStateResponse {
   option (id) = 64;
@@ -1174,6 +1195,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;
@@ -1194,6 +1222,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

@@ -1207,6 +1207,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:
@@ -1221,6 +1223,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

@@ -811,6 +811,9 @@ class MediaPlayerState(APIIntEnum):
     IDLE = 1
     PLAYING = 2
     PAUSED = 3
+    ANNOUNCING = 4
+    OFF = 5
+    ON = 6
 
 
 class MediaPlayerCommand(APIIntEnum):
@@ -819,6 +822,22 @@ 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
 
 
 class MediaPlayerFormatPurpose(APIIntEnum):
@@ -851,6 +870,9 @@ def convert_list(cls, value: list[Any]) -> list[MediaPlayerSupportedFormat]:
 @_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
 
     supported_formats: list[MediaPlayerSupportedFormat] = converter_field(
         default_factory=list, converter=MediaPlayerSupportedFormat.convert_list
@@ -866,6 +888,14 @@ class MediaPlayerEntityState(EntityState):
         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

@@ -798,6 +798,16 @@ async def test_select_command(
             dict(key=1, volume=1.0),
             dict(key=1, has_volume=True, volume=1.0),
         ),
+        (
+            dict(key=1, media_url="http://example.com", enqueue="replace"),
+            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"),
             dict(key=1, has_media_url=True, media_url="http://example.com"),
@@ -812,6 +822,20 @@ async def test_select_command(
                 announcement=True,
             ),
         ),
+        (
+            dict(
+                key=1,
+                command=MediaPlayerCommand.JOIN,
+                group_members="media_player.media_player_2,",
+            ),
+            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(