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

decoder/wavpack: add "constexpr" and "const_cast"

Browse Source
This commit is contained in:
Max Kellermann
2022-07-11 22:09:00 +02:00
parent 24ce5da2b8
commit a6619e9a13
1 changed files with 7 additions and 3 deletions

10
src/decoder/plugins/WavpackDecoderPlugin.cxx

@ -61,11 +61,15 @@ WavpackOpenInput(Path path, int flags, int norm_offset)
} }
static WavpackContext * static WavpackContext *
WavpackOpenInput(WavpackStreamReader64 &reader, void *wv_id, void *wvc_id, WavpackOpenInput(const WavpackStreamReader64 &reader, void *wv_id, void *wvc_id,
int flags, int norm_offset) int flags, int norm_offset)
{ {
char error[ERRORLEN]; char error[ERRORLEN];
auto *wpc = WavpackOpenFileInputEx64(&reader, wv_id, wvc_id, error,
/* unfortunately, WavpackOpenFileInputEx64() wants a non-const
pointer, so we fake it with a const_cast */
auto *wpc = WavpackOpenFileInputEx64(const_cast<WavpackStreamReader64 *>(&reader),
wv_id, wvc_id, error,
flags, norm_offset); flags, norm_offset);
if (wpc == nullptr) if (wpc == nullptr)
throw FormatRuntimeError("failed to open WavPack stream: %s", throw FormatRuntimeError("failed to open WavPack stream: %s",
@ -399,7 +403,7 @@ wavpack_input_can_seek(void *id) noexcept
return wpi.CanSeek(); return wpi.CanSeek();
} }
static WavpackStreamReader64 mpd_is_reader = { static constexpr WavpackStreamReader64 mpd_is_reader = {
wavpack_input_read_bytes, wavpack_input_read_bytes,
nullptr, /* write_bytes */ nullptr, /* write_bytes */
wavpack_input_get_pos, wavpack_input_get_pos,