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

test/read_tags: use ScanGenericTags(InputStream&) after ScanStream()

Browse Source
This commit is contained in:
Max Kellermann 2016-12-09 23:47:21 +01:00
parent 68c14d1e53
commit 3d897f18cd
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/read_tags.cxx
View File

@ -109,12 +109,12 @@ try {
success = false;
}
if (!success && plugin->scan_stream != NULL) {
Mutex mutex;
Cond cond;
Mutex mutex;
Cond cond;
InputStreamPtr is;
auto is = InputStream::OpenReady(path.c_str(),
mutex, cond);
if (!success && plugin->scan_stream != NULL) {
is = InputStream::OpenReady(path.c_str(), mutex, cond);
success = plugin->ScanStream(*is, print_handler, nullptr);
}
@ -123,8 +123,12 @@ try {
return EXIT_FAILURE;
}
if (empty)
ScanGenericTags(path, print_handler, nullptr);
if (empty) {
if (is)
ScanGenericTags(*is, print_handler, nullptr);
else
ScanGenericTags(path, print_handler, nullptr);
}
return 0;
} catch (const std::exception &e) {