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

decoder/sndfile: implement scan_stream() instead of scan_file()

Browse Source
This commit is contained in:
Max Kellermann
2014-07-11 22:09:35 +02:00
parent eaa9a1e33b
commit c4bea3dfe4
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/decoder/plugins/SndfileDecoderPlugin.cxx
View File

@@ -234,21 +234,22 @@ static constexpr struct {
};
static bool
sndfile_scan_file(Path path_fs,
const struct tag_handler *handler, void *handler_ctx)
sndfile_scan_stream(InputStream &is,
const struct tag_handler *handler, void *handler_ctx)
{
SF_INFO info;
info.format = 0;
SNDFILE *const sf = sf_open(path_fs.c_str(), SFM_READ, &info);
SndfileInputStream sis{nullptr, is};
SNDFILE *const sf = sf_open_virtual(&vio, SFM_READ, &info, &sis);
if (sf == nullptr)
return false;
if (!audio_valid_sample_rate(info.samplerate)) {
sf_close(sf);
FormatWarning(sndfile_domain,
"Invalid sample rate in %s", path_fs.c_str());
"Invalid sample rate in %s", is.GetURI());
return false;
}
@@ -299,8 +300,8 @@ const struct DecoderPlugin sndfile_decoder_plugin = {
nullptr,
sndfile_stream_decode,
nullptr,
sndfile_scan_file,
nullptr,
sndfile_scan_stream,
nullptr,
sndfile_suffixes,
sndfile_mime_types,