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

OutputThread: handle failing ReplayGainFilter::Open()

Browse Source 
Since opening the PcmVolume object can now fail, this case must be
handled.
This commit is contained in:
Max Kellermann 2013-12-24 10:52:30 +01:00
parent 8edde7a4b3
commit 1732166328
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/OutputThread.cxx
View File

@ -96,10 +96,16 @@ ao_filter_open(struct audio_output *ao, AudioFormat &format,
assert(format.IsValid());
/* the replay_gain filter cannot fail here */
if (ao->replay_gain_filter != nullptr)
ao->replay_gain_filter->Open(format, error_r);
if (ao->other_replay_gain_filter != nullptr)
ao->other_replay_gain_filter->Open(format, error_r);
if (ao->replay_gain_filter != nullptr &&
!ao->replay_gain_filter->Open(format, error_r).IsDefined())
return AudioFormat::Undefined();
if (ao->other_replay_gain_filter != nullptr &&
!ao->other_replay_gain_filter->Open(format, error_r).IsDefined()) {
if (ao->replay_gain_filter != nullptr)
ao->replay_gain_filter->Close();
return AudioFormat::Undefined();
}
const AudioFormat af = ao->filter->Open(format, error_r);
if (!af.IsDefined()) {