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

decoder/wavpack: use AtScopeExit()

Browse Source
This commit is contained in:
Max Kellermann 2016-12-09 20:53:04 +01:00
parent ae7e25ea65
commit 0be5fbdc35
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/decoder/plugins/WavpackDecoderPlugin.cxx
View File

@ -279,6 +279,10 @@ wavpack_scan_file(Path path_fs,
return false; return false;
} }
AtScopeExit(wpc) {
WavpackCloseFile(wpc);
};
const auto duration = const auto duration =
SongTime::FromScale<uint64_t>(WavpackGetNumSamples(wpc), SongTime::FromScale<uint64_t>(WavpackGetNumSamples(wpc),
WavpackGetSampleRate(wpc)); WavpackGetSampleRate(wpc));
@ -312,8 +316,6 @@ wavpack_scan_file(Path path_fs,
} }
} }
WavpackCloseFile(wpc);
return true; return true;
} }
@ -561,13 +563,15 @@ wavpack_filedecode(DecoderClient &client, Path path_fs)
return; return;
} }
AtScopeExit(wpc) {
WavpackCloseFile(wpc);
};
ReplayGainInfo rgi; ReplayGainInfo rgi;
if (wavpack_replaygain(rgi, wpc)) if (wavpack_replaygain(rgi, wpc))
client.SubmitReplayGain(&rgi); client.SubmitReplayGain(&rgi);
wavpack_decode(client, wpc, true); wavpack_decode(client, wpc, true);
WavpackCloseFile(wpc);
} }
static char const *const wavpack_suffixes[] = { static char const *const wavpack_suffixes[] = {