aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-01-23 00:07:35 +0100
committerMax Kellermann <max@duempel.org>2014-01-23 00:07:35 +0100
commit8d5f7160ac2eedc03c298223a1d32284e4889e91 (patch)
treec4395659176829735bd770768f87901d13a122fa
parentb167ce2913690d57247b960638054a546f19d323 (diff)
downloadmpd-8d5f7160ac2eedc03c298223a1d32284e4889e91.tar.gz
mpd-8d5f7160ac2eedc03c298223a1d32284e4889e91.tar.xz
mpd-8d5f7160ac2eedc03c298223a1d32284e4889e91.zip
db/upnp: fix subdirectory paths in "listallinfo"
Add missing server name prefix.
-rw-r--r--src/db/UpnpDatabasePlugin.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/db/UpnpDatabasePlugin.cxx b/src/db/UpnpDatabasePlugin.cxx
index ed0794f35..b6a1456c3 100644
--- a/src/db/UpnpDatabasePlugin.cxx
+++ b/src/db/UpnpDatabasePlugin.cxx
@@ -578,7 +578,7 @@ UpnpDatabase::VisitServer(const ContentDirectoryService &server,
case UPnPDirObject::ItemClass::MUSIC:
if (visit_song)
return visitSong(std::move(tdirent),
- selection.uri.c_str(),
+ base_uri,
selection, visit_song,
error);
break;
@@ -615,7 +615,7 @@ UpnpDatabase::VisitServer(const ContentDirectoryService &server,
case UPnPDirObject::Type::CONTAINER:
if (visit_directory) {
- const std::string uri = PathTraitsUTF8::Build(selection.uri.c_str(),
+ const std::string uri = PathTraitsUTF8::Build(base_uri,
dirent.name.c_str());
const LightDirectory d(uri.c_str(), 0);
if (!visit_directory(d, error))
@@ -635,7 +635,7 @@ UpnpDatabase::VisitServer(const ContentDirectoryService &server,
std::string p;
if (!selection.recursive)
- p = PathTraitsUTF8::Build(selection.uri.c_str(),
+ p = PathTraitsUTF8::Build(base_uri,
dirent.name.c_str());
if (!visitSong(std::move(dirent),