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

CheckAudioFormat: migrate from class Error to C++ exceptions

Browse Source
This commit is contained in:
Max Kellermann
2016-11-10 11:45:17 +01:00
parent 12f11c97ae
commit cfd51db229
22 changed files with 98 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,6 @@
#include "input/InputStream.hxx"
#include "CheckAudioFormat.hxx"
#include "tag/TagHandler.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include "Log.hxx"
@@ -201,14 +200,10 @@ sndfile_stream_decode(Decoder &decoder, InputStream &is)
return;
}
Error error;
AudioFormat audio_format;
if (!audio_format_init_checked(audio_format, info.samplerate,
sndfile_sample_format(info),
info.channels, error)) {
LogError(error);
return;
}
const auto audio_format =
CheckAudioFormat(info.samplerate,
sndfile_sample_format(info),
info.channels);
decoder_initialized(decoder, audio_format, info.seekable,
sndfile_duration(info));