Skip to content

Follow changes to netdisco, separating DLNA into DLNA_DMS and DLNA_DMR #15877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabaff merged 2 commits into from
Aug 8, 2018
Merged

Follow changes to netdisco, separating DLNA into DLNA_DMS and DLNA_DMR #15877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e949fa8
Follow changes to netdisco, separating DLNA into DLNA_DMS and DLNA_DMR
StevenLooman Aug 7, 2018
96ce0c0
No uppercase for names of netdisco discoverables
StevenLooman Aug 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion homeassistant/components/discovery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
'volumio': ('media_player', 'volumio'),
'nanoleaf_aurora': ('light', 'nanoleaf_aurora'),
'freebox': ('device_tracker', 'freebox'),
'DLNA': ('media_player', 'dlna_dmr')
'dlna_dmr': ('media_player', 'dlna_dmr'),
}

OPTIONAL_SERVICE_HANDLERS = {
Expand Down
14 changes: 0 additions & 14 deletions homeassistant/components/media_player/dlna_dmr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@
'channel': 'video/*',
'playlist': 'playlist/*',
}
UPNP_DEVICE_MEDIA_RENDERER = [
'urn:schemas-upnp-org:device:MediaRenderer:1',
'urn:schemas-upnp-org:device:MediaRenderer:2',
'urn:schemas-upnp-org:device:MediaRenderer:3',
]

_LOGGER = logging.getLogger(__name__)

Expand Down Expand Up @@ -126,15 +121,6 @@ async def async_setup_platform(hass: HomeAssistant,
async_add_devices,
discovery_info=None):
"""Set up DLNA DMR platform."""
# ensure this is a DLNA DMR device, if found via discovery
if discovery_info and \
'upnp_device_type' in discovery_info and \
discovery_info['upnp_device_type'] not in UPNP_DEVICE_MEDIA_RENDERER:
_LOGGER.debug('Device is not a MediaRenderer: %s, device_type: %s',
discovery_info.get('ssdp_description'),
discovery_info['upnp_device_type'])
return

if config.get(CONF_URL) is not None:
url = config[CONF_URL]
name = config.get(CONF_NAME)
Expand Down