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

fs/Path: add method ToUTF8Throw()

Browse Source
This commit is contained in:
Max Kellermann
2018-07-18 16:30:46 +02:00
parent f87265a4d5
commit 32290d5eb8
10 changed files with 43 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/playlist/PlaylistStream.cxx
View File

@@ -40,7 +40,7 @@ try {
if (suffix == nullptr)
return nullptr;
const auto suffix_utf8 = Path::FromFS(suffix).ToUTF8();
const auto suffix_utf8 = Path::FromFS(suffix).ToUTF8Throw();
if (!playlist_suffix_supported(suffix_utf8.c_str()))
return nullptr;
@@ -57,10 +57,8 @@ playlist_open_path(Path path, Mutex &mutex)
try {
assert(!path.IsNull());
const std::string uri_utf8 = path.ToUTF8();
auto playlist = !uri_utf8.empty()
? playlist_list_open_uri(uri_utf8.c_str(), mutex)
: nullptr;
const std::string uri_utf8 = path.ToUTF8Throw();
auto playlist = playlist_list_open_uri(uri_utf8.c_str(), mutex);
if (playlist == nullptr)
playlist = playlist_open_path_suffix(path, mutex);