From 464767c5fd0671b93f97f79905bdfb987826f6ef Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 26 Jan 2014 11:37:52 +0100 Subject: db/upnp/Util: move caturl() to util/UriUtil.cxx --- src/lib/upnp/ContentDirectoryService.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/lib/upnp/ContentDirectoryService.cxx') diff --git a/src/lib/upnp/ContentDirectoryService.cxx b/src/lib/upnp/ContentDirectoryService.cxx index ef8757ec5..ee7c0d7f5 100644 --- a/src/lib/upnp/ContentDirectoryService.cxx +++ b/src/lib/upnp/ContentDirectoryService.cxx @@ -24,11 +24,12 @@ #include "ixmlwrap.hxx" #include "Util.hxx" #include "Action.hxx" +#include "util/UriUtil.hxx" #include "util/Error.hxx" ContentDirectoryService::ContentDirectoryService(const UPnPDevice &device, const UPnPService &service) - :m_actionURL(caturl(device.URLBase, service.controlURL)), + :m_actionURL(uri_apply_base(device.URLBase, service.controlURL)), m_serviceType(service.serviceType), m_deviceId(device.UDN), m_friendlyName(device.friendlyName), -- cgit v1.2.3