db/upnp/Util: move caturl() to util/UriUtil.cxx

This commit is contained in:
Max Kellermann
2014-01-26 11:37:52 +01:00
parent a9c3ca8606
commit 464767c5fd
6 changed files with 39 additions and 32 deletions

View File

@@ -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),