Merge pull request #102 from h4de5/feature/add-media_player-again

Add media_player in a 2025.11 compatible way.

Author: h4de5

custom_components/vimar/const.py

@@ -77,7 +77,7 @@
     DEVICE_TYPE_COVERS: "cover",
     DEVICE_TYPE_SWITCHES: "switch",
     DEVICE_TYPE_CLIMATES: "climate",
-    # DEVICE_TYPE_MEDIA_PLAYERS: "media_player",
+    DEVICE_TYPE_MEDIA_PLAYERS: "media_player",
     DEVICE_TYPE_SCENES: "scene",
     # DEVICE_TYPE_FANS: 'fan',
     DEVICE_TYPE_SENSORS: "sensor",
@@ -90,7 +90,7 @@
     DEVICE_TYPE_COVERS,
     DEVICE_TYPE_SWITCHES,
     DEVICE_TYPE_CLIMATES,
-    # DEVICE_TYPE_MEDIA_PLAYERS,
+    DEVICE_TYPE_MEDIA_PLAYERS,
     DEVICE_TYPE_SCENES,
     DEVICE_TYPE_SENSORS,
 ]

custom_components/vimar/manifest.json

@@ -7,5 +7,5 @@
   "documentation": "https://github.com/h4de5/home-assistant-vimar",
   "iot_class": "local_polling",
   "issue_tracker": "https://github.com/h4de5/home-assistant-vimar/issues",
-  "version": "2025.11.2"
+  "version": "2025.11.3"
 }

custom_components/vimar/media_player.py

@@ -2,26 +2,12 @@
 
 import logging
 
-from homeassistant.components.media_player.const import (
-    MEDIA_TYPE_CHANNEL,
-    MEDIA_TYPE_MUSIC,
-    SUPPORT_NEXT_TRACK,
-    SUPPORT_SELECT_SOURCE,
-    SUPPORT_TURN_OFF,
-    SUPPORT_TURN_ON,
-    SUPPORT_VOLUME_MUTE,
-    SUPPORT_VOLUME_SET,
-    SUPPORT_VOLUME_STEP,
-)
 from homeassistant.const import STATE_OFF, STATE_PLAYING  # STATE_IDLE,
-
+from homeassistant.components.media_player import (
+    MediaPlayerEntityFeature,
+    MediaPlayerEntity,
+    MediaType)
 from .vimar_entity import VimarEntity, vimar_setup_entry
-
-try:
-    from homeassistant.components.media_player import MediaPlayerEntity
-except ImportError:
-    from homeassistant.components.media_player import MediaPlayerDevice as MediaPlayerEntity
-
 from .const import DEVICE_TYPE_MEDIA_PLAYERS as CURR_PLATFORM
 
 _LOGGER = logging.getLogger(__name__)
@@ -128,9 +114,9 @@ def media_content_type(self):
         """Content type of current playing media."""
         # if self.has_state('source') and self.get_state('source') == self._channel_source_id:
         if self.has_state("channel") and self.get_state("channel") == self._channel_source_id:
-            return MEDIA_TYPE_CHANNEL
+            return MediaType.CHANNEL
         else:
-            return MEDIA_TYPE_MUSIC
+            return MediaType.MUSIC
 
     @property
     def media_title(self):
@@ -158,12 +144,12 @@ def supported_features(self):
         """Flag supported features."""
         flags = 0
         if self.has_state("on/off"):
-            flags |= SUPPORT_TURN_ON | SUPPORT_TURN_OFF
+            flags |= MediaPlayerEntityFeature.TURN_ON | MediaPlayerEntityFeature.TURN_OFF
         if self.has_state("volume"):
-            flags |= SUPPORT_VOLUME_SET | SUPPORT_VOLUME_MUTE | SUPPORT_VOLUME_STEP
+            flags |= MediaPlayerEntityFeature.VOLUME_SET | MediaPlayerEntityFeature.VOLUME_MUTE | MediaPlayerEntityFeature.VOLUME_STEP 
         # if self.has_state('source'):
         if self.has_state("channel"):
-            flags |= SUPPORT_SELECT_SOURCE
+            flags |= MediaPlayerEntityFeature.SELECT_SOURCE 
             # channel only available on source == 0 /
             # if self.get_state('source') == 0 and self.has_state('channel'):
             # if self.get_state('channel') == self._channel_source_id and self.has_state('source'):
@@ -172,7 +158,7 @@ def supported_features(self):
         if self.has_state("source"):
             # we can only do next track
             # flags |= SUPPORT_NEXT_TRACK | SUPPORT_PREVIOUS_TRACK
-            flags |= SUPPORT_NEXT_TRACK
+            flags |= MediaPlayerEntityFeature.NEXT_TRACK
 
         # FIXED FIX ME - remove me in live
         # flags |= SUPPORT_VOLUME_SET | SUPPORT_VOLUME_MUTE | SUPPORT_SELECT_SOURCE | SUPPORT_NEXT_TRACK | SUPPORT_PREVIOUS_TRACK

custom_components/vimar/vimar_device_customizer.py

@@ -318,8 +318,8 @@ def device_type_singolarize(self, device_type):
             return DEVICE_TYPE_COVERS
         if device_type == "lights":
             return DEVICE_TYPE_LIGHTS
-        # if device_type == "media_players":
-        #     return DEVICE_TYPE_MEDIA_PLAYERS
+        if device_type == "media_players":
+            return DEVICE_TYPE_MEDIA_PLAYERS
         if device_type == "others":
             return DEVICE_TYPE_OTHERS
         if device_type == "scenes":

custom_components/vimar/vimarlink/vimarlink.py

@@ -18,7 +18,7 @@
 from ..const import (
     DEVICE_TYPE_COVERS,
     DEVICE_TYPE_LIGHTS,
-    # DEVICE_TYPE_MEDIA_PLAYERS,
+    DEVICE_TYPE_MEDIA_PLAYERS,
     DEVICE_TYPE_OTHERS,
     DEVICE_TYPE_SCENES,
     DEVICE_TYPE_SENSORS,
@@ -977,9 +977,6 @@ def parse_device_type(self, device):
                 device_class = DEVICE_CLASS_SWITCH
                 icon = ["mdi:fan", "mdi:fan-off"]
 
-                # device_type = DEVICE_TYPE_MEDIA_PLAYERS
-                # icon = ["mdi:radio", "mdi:radio-off"]
-
             # elif device["object_name"].find("LAMPE") != -1:
             elif any(x in device["object_name"].upper() for x in ["LAMPE"]):
                 device_type = DEVICE_TYPE_LIGHTS
@@ -1145,17 +1142,17 @@ def parse_device_type(self, device):
             device_type = DEVICE_TYPE_SENSORS
             icon = "mdi:weather-partly-snowy-rainy"
 
-        # elif device["object_type"] in ["CH_Audio"]:
-        #     device_type = DEVICE_TYPE_MEDIA_PLAYERS
-        #     icon = ["mdi:radio", "mdi:radio-off"]
-
-        #     _LOGGER.debug(
-        #         "Audio object returned from web server: "
-        #         + device["object_type"]
-        #         + " / "
-        #         + device["object_name"]
-        #     )
-        #     _LOGGER.debug("Audio object has states: " + str(device["status"]))
+        elif device["object_type"] in ["CH_Audio"]:
+            device_type = DEVICE_TYPE_MEDIA_PLAYERS
+            icon = ["mdi:radio", "mdi:radio-off"]
+
+            _LOGGER.debug(
+                "Audio object returned from web server: "
+                + device["object_type"]
+                + " / "
+                + device["object_name"]
+            )
+            _LOGGER.debug("Audio object has states: " + str(device["status"]))
 
         elif device["object_type"] in [
             "CH_SAI",