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

18
src/decoder/plugins/MadDecoderPlugin.cxx
View File

@@ -29,7 +29,6 @@
#include "tag/MixRamp.hxx"
#include "CheckAudioFormat.hxx"
#include "util/StringCompare.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include "Log.hxx"
@@ -1051,19 +1050,10 @@ mp3_decode(Decoder &decoder, InputStream &input_stream)
data.AllocateBuffers();
Error error;
AudioFormat audio_format;
if (!audio_format_init_checked(audio_format,
data.frame.header.samplerate,
SampleFormat::S24_P32,
MAD_NCHANNELS(&data.frame.header),
error)) {
LogError(error);
delete tag;
return;
}
decoder_initialized(decoder, audio_format,
decoder_initialized(decoder,
CheckAudioFormat(data.frame.header.samplerate,
SampleFormat::S24_P32,
MAD_NCHANNELS(&data.frame.header)),
input_stream.IsSeekable(),
data.total_time);