Commit 3348fc0a authored by David Reid's avatar David Reid

Update examples.

parent 47cc9319
This diff is collapsed.
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
mal_uint32 capturedSampleCount = 0; mal_uint32 capturedSampleCount = 0;
float* pCapturedSamples = NULL; mal_int16* pCapturedSamples = NULL;
mal_uint32 playbackSample = 0; mal_uint32 playbackSample = 0;
void on_recv_frames(mal_device* pDevice, mal_uint32 frameCount, const void* pSamples) void on_recv_frames(mal_device* pDevice, mal_uint32 frameCount, const void* pSamples)
...@@ -17,12 +17,12 @@ void on_recv_frames(mal_device* pDevice, mal_uint32 frameCount, const void* pSam ...@@ -17,12 +17,12 @@ void on_recv_frames(mal_device* pDevice, mal_uint32 frameCount, const void* pSam
mal_uint32 sampleCount = frameCount * pDevice->channels; mal_uint32 sampleCount = frameCount * pDevice->channels;
mal_uint32 newCapturedSampleCount = capturedSampleCount + sampleCount; mal_uint32 newCapturedSampleCount = capturedSampleCount + sampleCount;
float* pNewCapturedSamples = (float*)realloc(pCapturedSamples, newCapturedSampleCount * sizeof(float)); mal_int16* pNewCapturedSamples = (mal_int16*)realloc(pCapturedSamples, newCapturedSampleCount * sizeof(mal_int16));
if (pNewCapturedSamples == NULL) { if (pNewCapturedSamples == NULL) {
return; return;
} }
memcpy(pNewCapturedSamples + capturedSampleCount, pSamples, sampleCount * sizeof(float)); memcpy(pNewCapturedSamples + capturedSampleCount, pSamples, sampleCount * sizeof(mal_int16));
pCapturedSamples = pNewCapturedSamples; pCapturedSamples = pNewCapturedSamples;
capturedSampleCount = newCapturedSampleCount; capturedSampleCount = newCapturedSampleCount;
...@@ -39,7 +39,7 @@ mal_uint32 on_send_frames(mal_device* pDevice, mal_uint32 frameCount, void* pSam ...@@ -39,7 +39,7 @@ mal_uint32 on_send_frames(mal_device* pDevice, mal_uint32 frameCount, void* pSam
return 0; return 0;
} }
memcpy(pSamples, pCapturedSamples + playbackSample, samplesToRead * sizeof(float)); memcpy(pSamples, pCapturedSamples + playbackSample, samplesToRead * sizeof(mal_int16));
playbackSample += samplesToRead; playbackSample += samplesToRead;
return samplesToRead / pDevice->channels; return samplesToRead / pDevice->channels;
...@@ -54,7 +54,7 @@ int main() ...@@ -54,7 +54,7 @@ int main()
} }
mal_device_config config; mal_device_config config;
config.format = mal_format_f32; config.format = mal_format_s16;
config.channels = 2; config.channels = 2;
config.sampleRate = 48000; config.sampleRate = 48000;
config.bufferSizeInFrames = 0; // Use default. config.bufferSizeInFrames = 0; // Use default.
......
...@@ -14,7 +14,7 @@ mal_uint32 on_send_frames_to_device(mal_device* pDevice, mal_uint32 frameCount, ...@@ -14,7 +14,7 @@ mal_uint32 on_send_frames_to_device(mal_device* pDevice, mal_uint32 frameCount,
return 0; return 0;
} }
return (mal_uint32)drwav_read_f32(pWav, frameCount * pDevice->channels, (float*)pSamples) / pDevice->channels; return (mal_uint32)drwav_read_s16(pWav, frameCount * pDevice->channels, (mal_int16*)pSamples) / pDevice->channels;
} }
int main(int argc, char** argv) int main(int argc, char** argv)
...@@ -38,7 +38,7 @@ int main(int argc, char** argv) ...@@ -38,7 +38,7 @@ int main(int argc, char** argv)
// In this example we use the default playback device with a default buffer size and period count. // In this example we use the default playback device with a default buffer size and period count.
mal_device_config config; mal_device_config config;
config.format = mal_format_f32; config.format = mal_format_s16;
config.channels = wav.channels; config.channels = wav.channels;
config.sampleRate = wav.sampleRate; config.sampleRate = wav.sampleRate;
config.bufferSizeInFrames = 0; // Use default. config.bufferSizeInFrames = 0; // Use default.
......
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