From 18db0b09ac28050e9adc4f17b2e3a90b061fa3fb Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sat, 18 Aug 2012 15:22:07 +0000 Subject: [PATCH] Log audio decoding errors Originally committed to SVN as r6961. --- aegisub/src/audio_provider.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/aegisub/src/audio_provider.cpp b/aegisub/src/audio_provider.cpp index 3cca05e90..72517bc8a 100644 --- a/aegisub/src/audio_provider.cpp +++ b/aegisub/src/audio_provider.cpp @@ -64,9 +64,15 @@ void AudioProvider::GetAudioWithVolume(void *buf, int64_t start, int64_t count, try { GetAudio(buf,start,count); } + catch (AudioDecodeError const& e) { + LOG_E("audio_provider") << e.GetChainedMessage(); + memset(buf, 0, count*bytes_per_sample); + return; + } catch (...) { // FIXME: Poor error handling though better than none, to patch issue #800. // Just return blank audio if real provider fails. + LOG_E("audio_provider") << "Unknown audio decoding error"; memset(buf, 0, count*bytes_per_sample); return; }