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

TagStream: allow tag_stream_scan() to throw

Browse Source
This commit is contained in:
Max Kellermann 2019-05-21 23:07:49 +02:00
parent 9a78371b5c
commit 6f1d5105ee
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/TagStream.cxx
View File

@ -73,14 +73,12 @@ tag_stream_scan(InputStream &is, TagHandler &handler) noexcept
} }
bool bool
tag_stream_scan(const char *uri, TagHandler &handler) noexcept tag_stream_scan(const char *uri, TagHandler &handler)
try { {
Mutex mutex; Mutex mutex;
auto is = InputStream::OpenReady(uri, mutex); auto is = InputStream::OpenReady(uri, mutex);
return tag_stream_scan(*is, handler); return tag_stream_scan(*is, handler);
} catch (const std::exception &e) {
return false;
} }
bool bool
@ -102,12 +100,10 @@ tag_stream_scan(InputStream &is, TagBuilder &builder,
bool bool
tag_stream_scan(const char *uri, TagBuilder &builder, tag_stream_scan(const char *uri, TagBuilder &builder,
AudioFormat *audio_format) noexcept AudioFormat *audio_format)
try { {
Mutex mutex; Mutex mutex;
auto is = InputStream::OpenReady(uri, mutex); auto is = InputStream::OpenReady(uri, mutex);
return tag_stream_scan(*is, builder, audio_format); return tag_stream_scan(*is, builder, audio_format);
} catch (const std::exception &e) {
return false;
} }

10
src/TagStream.hxx
View File

@ -35,8 +35,11 @@ class TagBuilder;
bool bool
tag_stream_scan(InputStream &is, TagHandler &handler) noexcept; tag_stream_scan(InputStream &is, TagHandler &handler) noexcept;
/**
* Throws on error.
*/
bool bool
tag_stream_scan(const char *uri, TagHandler &handler) noexcept; tag_stream_scan(const char *uri, TagHandler &handler);
/** /**
* Scan the tags of an #InputStream. Invokes matching decoder * Scan the tags of an #InputStream. Invokes matching decoder
@ -50,8 +53,11 @@ bool
tag_stream_scan(InputStream &is, TagBuilder &builder, tag_stream_scan(InputStream &is, TagBuilder &builder,
AudioFormat *audio_format=nullptr) noexcept; AudioFormat *audio_format=nullptr) noexcept;
/**
* Throws on error.
*/
bool bool
tag_stream_scan(const char *uri, TagBuilder &builder, tag_stream_scan(const char *uri, TagBuilder &builder,
AudioFormat *audio_format=nullptr) noexcept; AudioFormat *audio_format=nullptr);
#endif #endif