diff --git a/homeassistant/components/dlna_dmr/manifest.json b/homeassistant/components/dlna_dmr/manifest.json index ac7a4b22e58..094a9adc43a 100644 --- a/homeassistant/components/dlna_dmr/manifest.json +++ b/homeassistant/components/dlna_dmr/manifest.json @@ -2,6 +2,6 @@ "domain": "dlna_dmr", "name": "DLNA Digital Media Renderer", "documentation": "https://www.home-assistant.io/integrations/dlna_dmr", - "requirements": ["async-upnp-client==0.14.13"], + "requirements": ["async-upnp-client==0.16.0"], "codeowners": [] } diff --git a/homeassistant/components/dlna_dmr/media_player.py b/homeassistant/components/dlna_dmr/media_player.py index db0f60d14bc..c208e1eb2ff 100644 --- a/homeassistant/components/dlna_dmr/media_player.py +++ b/homeassistant/components/dlna_dmr/media_player.py @@ -14,14 +14,6 @@ import voluptuous as vol from homeassistant.components.media_player import PLATFORM_SCHEMA, MediaPlayerEntity from homeassistant.components.media_player.const import ( - MEDIA_TYPE_CHANNEL, - MEDIA_TYPE_EPISODE, - MEDIA_TYPE_IMAGE, - MEDIA_TYPE_MOVIE, - MEDIA_TYPE_MUSIC, - MEDIA_TYPE_PLAYLIST, - MEDIA_TYPE_TVSHOW, - MEDIA_TYPE_VIDEO, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY, @@ -70,28 +62,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( } ) -HOME_ASSISTANT_UPNP_CLASS_MAPPING = { - MEDIA_TYPE_MUSIC: "object.item.audioItem", - MEDIA_TYPE_TVSHOW: "object.item.videoItem", - MEDIA_TYPE_MOVIE: "object.item.videoItem", - MEDIA_TYPE_VIDEO: "object.item.videoItem", - MEDIA_TYPE_EPISODE: "object.item.videoItem", - MEDIA_TYPE_CHANNEL: "object.item.videoItem", - MEDIA_TYPE_IMAGE: "object.item.imageItem", - MEDIA_TYPE_PLAYLIST: "object.item.playlistItem", -} -UPNP_CLASS_DEFAULT = "object.item" -HOME_ASSISTANT_UPNP_MIME_TYPE_MAPPING = { - MEDIA_TYPE_MUSIC: "audio/*", - MEDIA_TYPE_TVSHOW: "video/*", - MEDIA_TYPE_MOVIE: "video/*", - MEDIA_TYPE_VIDEO: "video/*", - MEDIA_TYPE_EPISODE: "video/*", - MEDIA_TYPE_CHANNEL: "video/*", - MEDIA_TYPE_IMAGE: "image/*", - MEDIA_TYPE_PLAYLIST: "playlist/*", -} - def catch_request_errors(): """Catch asyncio.TimeoutError, aiohttp.ClientError errors.""" @@ -342,20 +312,15 @@ class DlnaDmrDevice(MediaPlayerEntity): @catch_request_errors() async def async_play_media(self, media_type, media_id, **kwargs): """Play a piece of media.""" + _LOGGER.debug("Playing media: %s, %s, %s", media_type, media_id, kwargs) title = "Home Assistant" - mime_type = HOME_ASSISTANT_UPNP_MIME_TYPE_MAPPING.get(media_type, media_type) - upnp_class = HOME_ASSISTANT_UPNP_CLASS_MAPPING.get( - media_type, UPNP_CLASS_DEFAULT - ) # Stop current playing media if self._device.can_stop: await self.async_media_stop() # Queue media - await self._device.async_set_transport_uri( - media_id, title, mime_type, upnp_class - ) + await self._device.async_set_transport_uri(media_id, title) await self._device.async_wait_for_can_play() # If already playing, no need to call Play diff --git a/homeassistant/components/ssdp/manifest.json b/homeassistant/components/ssdp/manifest.json index 931119e2398..938ad979daf 100644 --- a/homeassistant/components/ssdp/manifest.json +++ b/homeassistant/components/ssdp/manifest.json @@ -2,7 +2,7 @@ "domain": "ssdp", "name": "Simple Service Discovery Protocol (SSDP)", "documentation": "https://www.home-assistant.io/integrations/ssdp", - "requirements": ["defusedxml==0.6.0", "netdisco==2.8.2", "async-upnp-client==0.14.13"], + "requirements": ["defusedxml==0.6.0", "netdisco==2.8.2", "async-upnp-client==0.16.0"], "after_dependencies": ["zeroconf"], "codeowners": [] } diff --git a/homeassistant/components/upnp/manifest.json b/homeassistant/components/upnp/manifest.json index fe3a7b169dc..feecdb00b18 100644 --- a/homeassistant/components/upnp/manifest.json +++ b/homeassistant/components/upnp/manifest.json @@ -3,7 +3,7 @@ "name": "UPnP", "config_flow": true, "documentation": "https://www.home-assistant.io/integrations/upnp", - "requirements": ["async-upnp-client==0.14.13"], + "requirements": ["async-upnp-client==0.16.0"], "codeowners": ["@StevenLooman"], "ssdp": [ { diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt index 33ffece8bbe..7b7850c6e68 100644 --- a/homeassistant/package_constraints.txt +++ b/homeassistant/package_constraints.txt @@ -4,7 +4,7 @@ aiodiscover==1.3.2 aiohttp==3.7.4.post0 aiohttp_cors==0.7.0 astral==1.10.1 -async-upnp-client==0.14.13 +async-upnp-client==0.16.0 async_timeout==3.0.1 attrs==20.3.0 awesomeversion==21.2.3 diff --git a/requirements_all.txt b/requirements_all.txt index 7d61db3ff67..787e667e89a 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -289,7 +289,7 @@ asterisk_mbox==0.5.0 # homeassistant.components.dlna_dmr # homeassistant.components.ssdp # homeassistant.components.upnp -async-upnp-client==0.14.13 +async-upnp-client==0.16.0 # homeassistant.components.supla asyncpysupla==0.0.5 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 8508d7a1651..8684d40efbb 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -178,7 +178,7 @@ arcam-fmj==0.5.3 # homeassistant.components.dlna_dmr # homeassistant.components.ssdp # homeassistant.components.upnp -async-upnp-client==0.14.13 +async-upnp-client==0.16.0 # homeassistant.components.aurora auroranoaa==0.0.2