Commit af2c185a authored by David Reid's avatar David Reid

Update example in README.

parent 87d05684
...@@ -60,23 +60,27 @@ Simple Playback Example ...@@ -60,23 +60,27 @@ Simple Playback Example
======================= =======================
```c ```c
#define DR_FLAC_IMPLEMENTATION
#include "../extras/dr_flac.h" // Enables FLAC decoding.
#define DR_MP3_IMPLEMENTATION
#include "../extras/dr_mp3.h" // Enables MP3 decoding.
#define DR_WAV_IMPLEMENTATION
#include "../extras/dr_wav.h" // Enables WAV decoding.
#define MAL_IMPLEMENTATION #define MAL_IMPLEMENTATION
#include "../mini_al.h" #include "../mini_al.h"
#define DR_WAV_IMPLEMENTATION
#include "../extras/dr_wav.h"
#include <stdio.h> #include <stdio.h>
// This is the function that's used for sending more data to the device for playback. // This is the function that's used for sending more data to the device for playback.
mal_uint32 on_send_frames_to_device(mal_device* pDevice, mal_uint32 frameCount, void* pSamples) mal_uint32 on_send_frames_to_device(mal_device* pDevice, mal_uint32 frameCount, void* pSamples)
{ {
drwav* pWav = (drwav*)pDevice->pUserData; mal_decoder* pDecoder = (mal_decoder*)pDevice->pUserData;
if (pWav == NULL) { if (pDecoder == NULL) {
return 0; return 0;
} }
return (mal_uint32)drwav_read_s16(pWav, frameCount * pDevice->channels, (mal_int16*)pSamples) / pDevice->channels; return (mal_uint32)mal_decoder_read(pDecoder, frameCount, pSamples);
} }
int main(int argc, char** argv) int main(int argc, char** argv)
...@@ -86,43 +90,33 @@ int main(int argc, char** argv) ...@@ -86,43 +90,33 @@ int main(int argc, char** argv)
return -1; return -1;
} }
drwav wav; mal_decoder decoder;
if (!drwav_init_file(&wav, argv[1])) { mal_result result = mal_decoder_init_file(argv[1], NULL, &decoder);
printf("Not a valid WAV file.\n"); if (result != MAL_SUCCESS) {
return -2; return -2;
} }
mal_context context; mal_device_config config = mal_device_config_init_playback(decoder.outputFormat, decoder.outputChannels, decoder.outputSampleRate, on_send_frames_to_device);
if (mal_context_init(NULL, 0, NULL, &context) != MAL_SUCCESS) {
printf("Failed to initialize context.\n");
drwav_uninit(&wav);
return -3;
}
mal_device_config config = mal_device_config_init_playback(mal_format_s16, wav.channels, wav.sampleRate, on_send_frames_to_device);
mal_device device; mal_device device;
if (mal_device_init(&context, mal_device_type_playback, NULL, &config, &wav, &device) != MAL_SUCCESS) { if (mal_device_init(NULL, mal_device_type_playback, NULL, &config, &decoder, &device) != MAL_SUCCESS) {
printf("Failed to open playback device.\n"); printf("Failed to open playback device.\n");
mal_context_uninit(&context); mal_decoder_uninit(&decoder);
drwav_uninit(&wav); return -3;
return -4;
} }
if (mal_device_start(&device) != MAL_SUCCESS) { if (mal_device_start(&device) != MAL_SUCCESS) {
printf("Failed to start playback device.\n"); printf("Failed to start playback device.\n");
mal_device_uninit(&device); mal_device_uninit(&device);
mal_context_uninit(&context); mal_decoder_uninit(&decoder);
drwav_uninit(&wav); return -4;
return -5;
} }
printf("Press Enter to quit..."); printf("Press Enter to quit...");
getchar(); getchar();
mal_device_uninit(&device); mal_device_uninit(&device);
mal_context_uninit(&context); mal_decoder_uninit(&decoder);
drwav_uninit(&wav);
return 0; return 0;
} }
......
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