Commit 01d6297b authored by David Reid's avatar David Reid

Fix some warnings with some more examples.

parent de5f370d
...@@ -101,4 +101,4 @@ int main(int argc, char** argv) ...@@ -101,4 +101,4 @@ int main(int argc, char** argv)
ma_engine_uninit(&g_engine); ma_engine_uninit(&g_engine);
return 0; return 0;
} }
\ No newline at end of file
...@@ -13,7 +13,7 @@ head. ...@@ -13,7 +13,7 @@ head.
#include "../miniaudio.h" #include "../miniaudio.h"
#define SDL_MAIN_HANDLED #define SDL_MAIN_HANDLED
#include <SDL.h> /* Change this to your include location. Might be <SDL2/SDL.h>. */ #include <SDL2/SDL.h> /* Change this to your include location. Might be <SDL.h>. */
#define CHANNELS 2 /* Must be stereo for this example. */ #define CHANNELS 2 /* Must be stereo for this example. */
#define SAMPLE_RATE 48000 #define SAMPLE_RATE 48000
...@@ -23,6 +23,8 @@ static ma_sound g_sound; /* This example will play only a single soun ...@@ -23,6 +23,8 @@ static ma_sound g_sound; /* This example will play only a single soun
void data_callback(void* pUserData, ma_uint8* pBuffer, int bufferSizeInBytes) void data_callback(void* pUserData, ma_uint8* pBuffer, int bufferSizeInBytes)
{ {
(void)pUserData;
/* Reading is just a matter of reading straight from the engine. */ /* Reading is just a matter of reading straight from the engine. */
ma_uint32 bufferSizeInFrames = (ma_uint32)bufferSizeInBytes / ma_get_bytes_per_frame(ma_format_f32, ma_engine_get_channels(&g_engine)); ma_uint32 bufferSizeInFrames = (ma_uint32)bufferSizeInBytes / ma_get_bytes_per_frame(ma_format_f32, ma_engine_get_channels(&g_engine));
ma_engine_read_pcm_frames(&g_engine, pBuffer, bufferSizeInFrames, NULL); ma_engine_read_pcm_frames(&g_engine, pBuffer, bufferSizeInFrames, NULL);
......
...@@ -118,7 +118,7 @@ static void ma_steamaudio_binaural_node_process_pcm_frames(ma_node* pNode, const ...@@ -118,7 +118,7 @@ static void ma_steamaudio_binaural_node_process_pcm_frames(ma_node* pNode, const
pBinauralNode->ppBuffersIn[0] = (float*)ma_offset_pcm_frames_const_ptr_f32(ppFramesIn[0], totalFramesProcessed, 1); pBinauralNode->ppBuffersIn[0] = (float*)ma_offset_pcm_frames_const_ptr_f32(ppFramesIn[0], totalFramesProcessed, 1);
} else { } else {
/* Slow path. Need to deinterleave the input data. */ /* Slow path. Need to deinterleave the input data. */
ma_deinterleave_pcm_frames(ma_format_f32, inputBufferDesc.numChannels, framesToProcessThisIteration, ma_offset_pcm_frames_const_ptr_f32(ppFramesIn[0], totalFramesProcessed, inputBufferDesc.numChannels), pBinauralNode->ppBuffersIn); ma_deinterleave_pcm_frames(ma_format_f32, inputBufferDesc.numChannels, framesToProcessThisIteration, ma_offset_pcm_frames_const_ptr_f32(ppFramesIn[0], totalFramesProcessed, inputBufferDesc.numChannels), (void**)&pBinauralNode->ppBuffersIn[0]);
} }
inputBufferDesc.data = pBinauralNode->ppBuffersIn; inputBufferDesc.data = pBinauralNode->ppBuffersIn;
...@@ -128,7 +128,7 @@ static void ma_steamaudio_binaural_node_process_pcm_frames(ma_node* pNode, const ...@@ -128,7 +128,7 @@ static void ma_steamaudio_binaural_node_process_pcm_frames(ma_node* pNode, const
iplBinauralEffectApply(pBinauralNode->iplEffect, &binauralParams, &inputBufferDesc, &outputBufferDesc); iplBinauralEffectApply(pBinauralNode->iplEffect, &binauralParams, &inputBufferDesc, &outputBufferDesc);
/* Interleave straight into the output buffer. */ /* Interleave straight into the output buffer. */
ma_interleave_pcm_frames(ma_format_f32, 2, framesToProcessThisIteration, pBinauralNode->ppBuffersOut, ma_offset_pcm_frames_ptr_f32(ppFramesOut[0], totalFramesProcessed, 2)); ma_interleave_pcm_frames(ma_format_f32, 2, framesToProcessThisIteration, (const void**)&pBinauralNode->ppBuffersOut[0], ma_offset_pcm_frames_ptr_f32(ppFramesOut[0], totalFramesProcessed, 2));
/* Advance. */ /* Advance. */
totalFramesProcessed += framesToProcessThisIteration; totalFramesProcessed += framesToProcessThisIteration;
...@@ -436,4 +436,4 @@ int main(int argc, char** argv) ...@@ -436,4 +436,4 @@ int main(int argc, char** argv)
ma_engine_uninit(&g_engine); ma_engine_uninit(&g_engine);
return 0; return 0;
} }
\ No newline at end of file
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