From 3be8b02cc2c9404b43ad0368563b4d7e7e74de6d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 19 Oct 2018 19:51:17 +0200 Subject: [PATCH] decoder/sndfile: make `vio` constexpr Use `const_cast` to be able to pass it to sf_open_virtual() which has a wrong parameter declaration. --- src/decoder/plugins/SndfileDecoderPlugin.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/decoder/plugins/SndfileDecoderPlugin.cxx b/src/decoder/plugins/SndfileDecoderPlugin.cxx index 58714e4c3..465194f13 100644 --- a/src/decoder/plugins/SndfileDecoderPlugin.cxx +++ b/src/decoder/plugins/SndfileDecoderPlugin.cxx @@ -130,7 +130,7 @@ sndfile_vio_tell(void *user_data) * This SF_VIRTUAL_IO implementation wraps MPD's #InputStream to a * libsndfile stream. */ -static SF_VIRTUAL_IO vio = { +static constexpr SF_VIRTUAL_IO vio = { sndfile_vio_get_filelen, sndfile_vio_seek, sndfile_vio_read, @@ -202,7 +202,8 @@ sndfile_stream_decode(DecoderClient &client, InputStream &is) info.format = 0; SndfileInputStream sis{&client, is}; - SNDFILE *const sf = sf_open_virtual(&vio, SFM_READ, &info, &sis); + SNDFILE *const sf = sf_open_virtual(const_cast(&vio), + SFM_READ, &info, &sis); if (sf == nullptr) { FormatWarning(sndfile_domain, "sf_open_virtual() failed: %s", sf_strerror(nullptr)); @@ -274,7 +275,8 @@ sndfile_scan_stream(InputStream &is, TagHandler &handler) noexcept info.format = 0; SndfileInputStream sis{nullptr, is}; - SNDFILE *const sf = sf_open_virtual(&vio, SFM_READ, &info, &sis); + SNDFILE *const sf = sf_open_virtual(const_cast(&vio), + SFM_READ, &info, &sis); if (sf == nullptr) return false;