oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

db/upnp: fix subdirectory paths in "listallinfo"

Browse Source 
Add missing server name prefix.
This commit is contained in:
Max Kellermann 2014-01-23 00:07:35 +01:00
parent b167ce2913
commit 8d5f7160ac
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/db/UpnpDatabasePlugin.cxx
View File

@ -578,7 +578,7 @@ UpnpDatabase::VisitServer(const ContentDirectoryService &server,
case UPnPDirObject::ItemClass::MUSIC: case UPnPDirObject::ItemClass::MUSIC:
if (visit_song) if (visit_song)
return visitSong(std::move(tdirent), return visitSong(std::move(tdirent),
selection.uri.c_str(), base_uri,
selection, visit_song, selection, visit_song,
error); error);
break; break;
@ -615,7 +615,7 @@ UpnpDatabase::VisitServer(const ContentDirectoryService &server,
case UPnPDirObject::Type::CONTAINER: case UPnPDirObject::Type::CONTAINER:
if (visit_directory) { 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()); dirent.name.c_str());
const LightDirectory d(uri.c_str(), 0); const LightDirectory d(uri.c_str(), 0);
if (!visit_directory(d, error)) if (!visit_directory(d, error))
@ -635,7 +635,7 @@ UpnpDatabase::VisitServer(const ContentDirectoryService &server,
std::string p; std::string p;
if (!selection.recursive) if (!selection.recursive)
p = PathTraitsUTF8::Build(selection.uri.c_str(), p = PathTraitsUTF8::Build(base_uri,
dirent.name.c_str()); dirent.name.c_str());
if (!visitSong(std::move(dirent), if (!visitSong(std::move(dirent),