diff --git a/mini_al.h b/mini_al.h index 95cea8fd..b3c349dd 100644 --- a/mini_al.h +++ b/mini_al.h @@ -16795,7 +16795,7 @@ mal_uint64 mal_format_converter_read_frames(mal_format_converter* pConverter, ma } } - pConverter->onInterleavePCM(pNextFramesOut, ppTempSampleOfOutFormat, framesJustRead, pConverter->config.channels); + pConverter->onInterleavePCM(pNextFramesOut, (const void**)ppTempSampleOfOutFormat, framesJustRead, pConverter->config.channels); totalFramesRead += framesJustRead; pNextFramesOut += framesJustRead * frameSizeIn; @@ -16870,7 +16870,7 @@ mal_uint64 mal_format_converter_read_frames_separated(mal_format_converter* pCon framesToReadRightNow = 0xFFFFFFFF; } - mal_uint32 framesJustRead = (mal_uint32)pConverter->onReadSeparated(pConverter, (mal_uint32)framesToReadRightNow, ppNextSamplesOut, pConverter->pUserData); + mal_uint32 framesJustRead = (mal_uint32)pConverter->onReadSeparated(pConverter, (mal_uint32)framesToReadRightNow, (void**)ppNextSamplesOut, pConverter->pUserData); if (framesJustRead == 0) { break; } @@ -16894,7 +16894,7 @@ mal_uint64 mal_format_converter_read_frames_separated(mal_format_converter* pCon framesToReadRightNow = maxFramesToReadAtATime; } - mal_uint32 framesJustRead = (mal_uint32)pConverter->onReadSeparated(pConverter, (mal_uint32)framesToReadRightNow, ppNextSamplesOut, pConverter->pUserData); + mal_uint32 framesJustRead = (mal_uint32)pConverter->onReadSeparated(pConverter, (mal_uint32)framesToReadRightNow, (void**)ppNextSamplesOut, pConverter->pUserData); if (framesJustRead == 0) { break; } diff --git a/tests/mal_test_0.c b/tests/mal_test_0.c index ff8e0326..7e2a77f6 100644 --- a/tests/mal_test_0.c +++ b/tests/mal_test_0.c @@ -705,16 +705,16 @@ int do_interleaving_test(mal_format format) mal_uint32 channelCountForThisIteration = i + 1; // Interleave. - mal_pcm_interleave_u8__reference(dsti, ppSrc, frameCount, channelCountForThisIteration); - if (compare_interleaved_and_separated_buffers(dsti, ppSrc, frameCount, channelCountForThisIteration, format) != 0) { + mal_pcm_interleave_u8__reference(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration); + if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration, format) != 0) { printf("FAILED. Separated to Interleaved (Channels = %u)\n", i); result = -1; break; } // Deinterleave. - mal_pcm_deinterleave_u8__reference(ppDst, dsti, frameCount, channelCountForThisIteration); - if (compare_interleaved_and_separated_buffers(dsti, ppDst, frameCount, channelCountForThisIteration, format) != 0) { + mal_pcm_deinterleave_u8__reference((void**)ppDst, dsti, frameCount, channelCountForThisIteration); + if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppDst, frameCount, channelCountForThisIteration, format) != 0) { printf("FAILED. Interleaved to Separated (Channels = %u)\n", i); result = -1; break; @@ -746,16 +746,16 @@ int do_interleaving_test(mal_format format) mal_uint32 channelCountForThisIteration = i + 1; // Interleave. - mal_pcm_interleave_s16__reference(dsti, ppSrc, frameCount, channelCountForThisIteration); - if (compare_interleaved_and_separated_buffers(dsti, ppSrc, frameCount, channelCountForThisIteration, format) != 0) { + mal_pcm_interleave_s16__reference(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration); + if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration, format) != 0) { printf("FAILED. Separated to Interleaved (Channels = %u)\n", i); result = -1; break; } // Deinterleave. - mal_pcm_deinterleave_s16__reference(ppDst, dsti, frameCount, channelCountForThisIteration); - if (compare_interleaved_and_separated_buffers(dsti, ppDst, frameCount, channelCountForThisIteration, format) != 0) { + mal_pcm_deinterleave_s16__reference((void**)ppDst, dsti, frameCount, channelCountForThisIteration); + if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppDst, frameCount, channelCountForThisIteration, format) != 0) { printf("FAILED. Interleaved to Separated (Channels = %u)\n", i); result = -1; break; @@ -789,16 +789,16 @@ int do_interleaving_test(mal_format format) mal_uint32 channelCountForThisIteration = i + 1; // Interleave. - mal_pcm_interleave_s24__reference(dsti, ppSrc, frameCount, channelCountForThisIteration); - if (compare_interleaved_and_separated_buffers(dsti, ppSrc, frameCount, channelCountForThisIteration, format) != 0) { + mal_pcm_interleave_s24__reference(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration); + if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration, format) != 0) { printf("FAILED. Separated to Interleaved (Channels = %u)\n", channelCountForThisIteration); result = -1; break; } // Deinterleave. - mal_pcm_deinterleave_s24__reference(ppDst, dsti, frameCount, channelCountForThisIteration); - if (compare_interleaved_and_separated_buffers(dsti, ppDst, frameCount, channelCountForThisIteration, format) != 0) { + mal_pcm_deinterleave_s24__reference((void**)ppDst, dsti, frameCount, channelCountForThisIteration); + if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppDst, frameCount, channelCountForThisIteration, format) != 0) { printf("FAILED. Interleaved to Separated (Channels = %u)\n", channelCountForThisIteration); result = -1; break; @@ -830,16 +830,16 @@ int do_interleaving_test(mal_format format) mal_uint32 channelCountForThisIteration = i + 1; // Interleave. - mal_pcm_interleave_s32__reference(dsti, ppSrc, frameCount, channelCountForThisIteration); - if (compare_interleaved_and_separated_buffers(dsti, ppSrc, frameCount, channelCountForThisIteration, format) != 0) { + mal_pcm_interleave_s32__reference(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration); + if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration, format) != 0) { printf("FAILED. Separated to Interleaved (Channels = %u)\n", i); result = -1; break; } // Deinterleave. - mal_pcm_deinterleave_s32__reference(ppDst, dsti, frameCount, channelCountForThisIteration); - if (compare_interleaved_and_separated_buffers(dsti, ppDst, frameCount, channelCountForThisIteration, format) != 0) { + mal_pcm_deinterleave_s32__reference((void**)ppDst, dsti, frameCount, channelCountForThisIteration); + if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppDst, frameCount, channelCountForThisIteration, format) != 0) { printf("FAILED. Interleaved to Separated (Channels = %u)\n", i); result = -1; break; @@ -871,16 +871,16 @@ int do_interleaving_test(mal_format format) mal_uint32 channelCountForThisIteration = i + 1; // Interleave. - mal_pcm_interleave_f32__reference(dsti, ppSrc, frameCount, channelCountForThisIteration); - if (compare_interleaved_and_separated_buffers(dsti, ppSrc, frameCount, channelCountForThisIteration, format) != 0) { + mal_pcm_interleave_f32__reference(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration); + if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration, format) != 0) { printf("FAILED. Separated to Interleaved (Channels = %u)\n", i); result = -1; break; } // Deinterleave. - mal_pcm_deinterleave_f32__reference(ppDst, dsti, frameCount, channelCountForThisIteration); - if (compare_interleaved_and_separated_buffers(dsti, ppDst, frameCount, channelCountForThisIteration, format) != 0) { + mal_pcm_deinterleave_f32__reference((void**)ppDst, dsti, frameCount, channelCountForThisIteration); + if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppDst, frameCount, channelCountForThisIteration, format) != 0) { printf("FAILED. Interleaved to Separated (Channels = %u)\n", i); result = -1; break;