From acb5ce1595d16bd16fd06c537c087af8dffdbf15 Mon Sep 17 00:00:00 2001 From: David Reid Date: Sun, 18 Jun 2017 20:08:56 +1000 Subject: [PATCH] Tabs to spaces. --- examples/simple_capture.c | 26 ++++++++++++++------------ examples/simple_playback.c | 22 ++++++++++++---------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/examples/simple_capture.c b/examples/simple_capture.c index 44017473..e293157a 100644 --- a/examples/simple_capture.c +++ b/examples/simple_capture.c @@ -15,7 +15,7 @@ mal_uint32 playbackSample = 0; void on_recv_frames(mal_device* pDevice, mal_uint32 frameCount, const void* pSamples) { mal_uint32 sampleCount = frameCount * pDevice->channels; - + mal_uint32 newCapturedSampleCount = capturedSampleCount + sampleCount; mal_int16* pNewCapturedSamples = (mal_int16*)realloc(pCapturedSamples, newCapturedSampleCount * sizeof(mal_int16)); if (pNewCapturedSamples == NULL) { @@ -53,15 +53,17 @@ int main() return -1; } - mal_device_config config; - config.format = mal_format_s16; - config.channels = 2; - config.sampleRate = 48000; - config.bufferSizeInFrames = 0; // Use default. - config.periods = 0; // Use default. - config.onRecvCallback = on_recv_frames; - config.onSendCallback = on_send_frames; - config.onStopCallback = NULL; + mal_device_config config; + config.format = mal_format_s16; + config.channels = 2; + config.sampleRate = 48000; + config.channelMap[0] = MAL_CHANNEL_FRONT_LEFT; + config.channelMap[1] = MAL_CHANNEL_FRONT_RIGHT; + config.bufferSizeInFrames = 0; // Use default. + config.periods = 0; // Use default. + config.onRecvCallback = on_recv_frames; + config.onSendCallback = on_send_frames; + config.onStopCallback = NULL; config.onLogCallback = NULL; printf("Recording...\n"); @@ -89,9 +91,9 @@ int main() mal_device_start(&playbackDevice); printf("Press Enter to quit...\n"); - getchar(); + getchar(); mal_device_uninit(&playbackDevice); mal_context_uninit(&context); - return 0; + return 0; } \ No newline at end of file diff --git a/examples/simple_playback.c b/examples/simple_playback.c index b0df49b9..6a7113eb 100644 --- a/examples/simple_playback.c +++ b/examples/simple_playback.c @@ -37,17 +37,19 @@ int main(int argc, char** argv) } // In this example we use the default playback device with a default buffer size and period count. - mal_device_config config; - config.format = mal_format_s16; - config.channels = wav.channels; - config.sampleRate = wav.sampleRate; - config.bufferSizeInFrames = 0; // Use default. - config.periods = 0; // Use default. - config.onRecvCallback = NULL; // Not used for playback. - config.onSendCallback = on_send_frames_to_device; - config.onStopCallback = NULL; + mal_device_config config; + config.format = mal_format_s16; + config.channels = wav.channels; + config.sampleRate = wav.sampleRate; + config.channelMap[0] = MAL_CHANNEL_FRONT_LEFT; + config.channelMap[1] = MAL_CHANNEL_FRONT_RIGHT; + config.bufferSizeInFrames = 0; // Use default. + config.periods = 0; // Use default. + config.onRecvCallback = NULL; // Not used for playback. + config.onSendCallback = on_send_frames_to_device; + config.onStopCallback = NULL; config.onLogCallback = NULL; - + mal_device device; if (mal_device_init(&context, mal_device_type_playback, NULL, &config, &wav, &device) != MAL_SUCCESS) { printf("Failed to open playback device.");