Skip to content

M
miniaudio
Commit 0a3d077c authored by David Reid's avatar David Reid
Browse files
Options

Fix warnings.

parent 5ba02842
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 23 deletions
mini_al.h
View file @ 0a3d077c
...@@ -16795,7 +16795,7 @@ mal_uint64 mal_format_converter_read_frames(mal_format_converter* pConverter, ma ...@@ -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; totalFramesRead += framesJustRead;
pNextFramesOut += framesJustRead * frameSizeIn; pNextFramesOut += framesJustRead * frameSizeIn;
...@@ -16870,7 +16870,7 @@ mal_uint64 mal_format_converter_read_frames_separated(mal_format_converter* pCon ...@@ -16870,7 +16870,7 @@ mal_uint64 mal_format_converter_read_frames_separated(mal_format_converter* pCon
framesToReadRightNow = 0xFFFFFFFF; 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) { if (framesJustRead == 0) {
break; break;
} }
...@@ -16894,7 +16894,7 @@ mal_uint64 mal_format_converter_read_frames_separated(mal_format_converter* pCon ...@@ -16894,7 +16894,7 @@ mal_uint64 mal_format_converter_read_frames_separated(mal_format_converter* pCon
framesToReadRightNow = maxFramesToReadAtATime; 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) { if (framesJustRead == 0) {
break; break;
} }
......
tests/mal_test_0.c
View file @ 0a3d077c
...@@ -705,16 +705,16 @@ int do_interleaving_test(mal_format format) ...@@ -705,16 +705,16 @@ int do_interleaving_test(mal_format format)
mal_uint32 channelCountForThisIteration = i + 1; mal_uint32 channelCountForThisIteration = i + 1;
// Interleave. // Interleave.
mal_pcm_interleave_u8__reference(dsti, ppSrc, frameCount, channelCountForThisIteration); mal_pcm_interleave_u8__reference(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration);
if (compare_interleaved_and_separated_buffers(dsti, ppSrc, frameCount, channelCountForThisIteration, format) != 0) { if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration, format) != 0) {
printf("FAILED. Separated to Interleaved (Channels = %u)\n", i); printf("FAILED. Separated to Interleaved (Channels = %u)\n", i);
result = -1; result = -1;
break; break;
} }
// Deinterleave. // Deinterleave.
mal_pcm_deinterleave_u8__reference(ppDst, dsti, frameCount, channelCountForThisIteration); mal_pcm_deinterleave_u8__reference((void**)ppDst, dsti, frameCount, channelCountForThisIteration);
if (compare_interleaved_and_separated_buffers(dsti, ppDst, frameCount, channelCountForThisIteration, format) != 0) { if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppDst, frameCount, channelCountForThisIteration, format) != 0) {
printf("FAILED. Interleaved to Separated (Channels = %u)\n", i); printf("FAILED. Interleaved to Separated (Channels = %u)\n", i);
result = -1; result = -1;
break; break;
...@@ -746,16 +746,16 @@ int do_interleaving_test(mal_format format) ...@@ -746,16 +746,16 @@ int do_interleaving_test(mal_format format)
mal_uint32 channelCountForThisIteration = i + 1; mal_uint32 channelCountForThisIteration = i + 1;
// Interleave. // Interleave.
mal_pcm_interleave_s16__reference(dsti, ppSrc, frameCount, channelCountForThisIteration); mal_pcm_interleave_s16__reference(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration);
if (compare_interleaved_and_separated_buffers(dsti, ppSrc, frameCount, channelCountForThisIteration, format) != 0) { if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration, format) != 0) {
printf("FAILED. Separated to Interleaved (Channels = %u)\n", i); printf("FAILED. Separated to Interleaved (Channels = %u)\n", i);
result = -1; result = -1;
break; break;
} }
// Deinterleave. // Deinterleave.
mal_pcm_deinterleave_s16__reference(ppDst, dsti, frameCount, channelCountForThisIteration); mal_pcm_deinterleave_s16__reference((void**)ppDst, dsti, frameCount, channelCountForThisIteration);
if (compare_interleaved_and_separated_buffers(dsti, ppDst, frameCount, channelCountForThisIteration, format) != 0) { if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppDst, frameCount, channelCountForThisIteration, format) != 0) {
printf("FAILED. Interleaved to Separated (Channels = %u)\n", i); printf("FAILED. Interleaved to Separated (Channels = %u)\n", i);
result = -1; result = -1;
break; break;
...@@ -789,16 +789,16 @@ int do_interleaving_test(mal_format format) ...@@ -789,16 +789,16 @@ int do_interleaving_test(mal_format format)
mal_uint32 channelCountForThisIteration = i + 1; mal_uint32 channelCountForThisIteration = i + 1;
// Interleave. // Interleave.
mal_pcm_interleave_s24__reference(dsti, ppSrc, frameCount, channelCountForThisIteration); mal_pcm_interleave_s24__reference(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration);
if (compare_interleaved_and_separated_buffers(dsti, ppSrc, frameCount, channelCountForThisIteration, format) != 0) { if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration, format) != 0) {
printf("FAILED. Separated to Interleaved (Channels = %u)\n", channelCountForThisIteration); printf("FAILED. Separated to Interleaved (Channels = %u)\n", channelCountForThisIteration);
result = -1; result = -1;
break; break;
} }
// Deinterleave. // Deinterleave.
mal_pcm_deinterleave_s24__reference(ppDst, dsti, frameCount, channelCountForThisIteration); mal_pcm_deinterleave_s24__reference((void**)ppDst, dsti, frameCount, channelCountForThisIteration);
if (compare_interleaved_and_separated_buffers(dsti, ppDst, frameCount, channelCountForThisIteration, format) != 0) { if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppDst, frameCount, channelCountForThisIteration, format) != 0) {
printf("FAILED. Interleaved to Separated (Channels = %u)\n", channelCountForThisIteration); printf("FAILED. Interleaved to Separated (Channels = %u)\n", channelCountForThisIteration);
result = -1; result = -1;
break; break;
...@@ -830,16 +830,16 @@ int do_interleaving_test(mal_format format) ...@@ -830,16 +830,16 @@ int do_interleaving_test(mal_format format)
mal_uint32 channelCountForThisIteration = i + 1; mal_uint32 channelCountForThisIteration = i + 1;
// Interleave. // Interleave.
mal_pcm_interleave_s32__reference(dsti, ppSrc, frameCount, channelCountForThisIteration); mal_pcm_interleave_s32__reference(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration);
if (compare_interleaved_and_separated_buffers(dsti, ppSrc, frameCount, channelCountForThisIteration, format) != 0) { if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration, format) != 0) {
printf("FAILED. Separated to Interleaved (Channels = %u)\n", i); printf("FAILED. Separated to Interleaved (Channels = %u)\n", i);
result = -1; result = -1;
break; break;
} }
// Deinterleave. // Deinterleave.
mal_pcm_deinterleave_s32__reference(ppDst, dsti, frameCount, channelCountForThisIteration); mal_pcm_deinterleave_s32__reference((void**)ppDst, dsti, frameCount, channelCountForThisIteration);
if (compare_interleaved_and_separated_buffers(dsti, ppDst, frameCount, channelCountForThisIteration, format) != 0) { if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppDst, frameCount, channelCountForThisIteration, format) != 0) {
printf("FAILED. Interleaved to Separated (Channels = %u)\n", i); printf("FAILED. Interleaved to Separated (Channels = %u)\n", i);
result = -1; result = -1;
break; break;
...@@ -871,16 +871,16 @@ int do_interleaving_test(mal_format format) ...@@ -871,16 +871,16 @@ int do_interleaving_test(mal_format format)
mal_uint32 channelCountForThisIteration = i + 1; mal_uint32 channelCountForThisIteration = i + 1;
// Interleave. // Interleave.
mal_pcm_interleave_f32__reference(dsti, ppSrc, frameCount, channelCountForThisIteration); mal_pcm_interleave_f32__reference(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration);
if (compare_interleaved_and_separated_buffers(dsti, ppSrc, frameCount, channelCountForThisIteration, format) != 0) { if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppSrc, frameCount, channelCountForThisIteration, format) != 0) {
printf("FAILED. Separated to Interleaved (Channels = %u)\n", i); printf("FAILED. Separated to Interleaved (Channels = %u)\n", i);
result = -1; result = -1;
break; break;
} }
// Deinterleave. // Deinterleave.
mal_pcm_deinterleave_f32__reference(ppDst, dsti, frameCount, channelCountForThisIteration); mal_pcm_deinterleave_f32__reference((void**)ppDst, dsti, frameCount, channelCountForThisIteration);
if (compare_interleaved_and_separated_buffers(dsti, ppDst, frameCount, channelCountForThisIteration, format) != 0) { if (compare_interleaved_and_separated_buffers(dsti, (const void**)ppDst, frameCount, channelCountForThisIteration, format) != 0) {
printf("FAILED. Interleaved to Separated (Channels = %u)\n", i); printf("FAILED. Interleaved to Separated (Channels = %u)\n", i);
result = -1; result = -1;
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment