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

InputLegacy: move functions to the input_stream class

Browse Source
This commit is contained in:
Max Kellermann
2013-09-05 00:06:31 +02:00
parent 52ffdb0a55
commit 7d0269d2ce
47 changed files with 461 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/SongUpdate.cxx
View File

@@ -26,7 +26,7 @@
#include "fs/Path.hxx"
#include "fs/FileSystem.hxx"
#include "Tag.hxx"
#include "InputLegacy.hxx"
#include "InputStream.hxx"
#include "DecoderPlugin.hxx"
#include "DecoderList.hxx"
#include "TagHandler.hxx"
@@ -127,12 +127,10 @@ Song::UpdateFile()
if (plugin->scan_stream != NULL) {
/* open the input_stream (if not already
open) */
if (is == NULL) {
Error error;
is = input_stream_open(path_fs.c_str(),
mutex, cond,
error);
}
if (is == NULL)
is = input_stream::Open(path_fs.c_str(),
mutex, cond,
IgnoreError());
/* now try the stream_tag() method */
if (is != NULL) {
@@ -145,8 +143,7 @@ Song::UpdateFile()
delete tag;
tag = nullptr;
Error error;
input_stream_lock_seek(is, 0, SEEK_SET, error);
is->LockSeek(0, SEEK_SET, IgnoreError());
}
}
@@ -154,7 +151,7 @@ Song::UpdateFile()
} while (plugin != NULL);
if (is != NULL)
input_stream_close(is);
is->Close();
if (tag != nullptr && tag->IsEmpty())
tag_scan_fallback(path_fs.c_str(), &full_tag_handler, tag);