mirror/miniaudio
1
0
Fork 0
mirror of https://github.com/mackron/miniaudio.git synced 2026-04-23 00:34:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/dr-soft/mini_al into dev

Browse Source
This commit is contained in:
David Reid
2018-05-09 18:28:21 +10:00
parent 78ecf63af3 b401f7d4d2
commit 12ccfb3a5d
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mini_al.h
+5 -1
View File
@@ -16547,15 +16547,19 @@ mal_device_config mal_device_config_init_ex(mal_format format, mal_uint32 channe
config.onRecvCallback = onRecvCallback; config.onRecvCallback = onRecvCallback;
config.onSendCallback = onSendCallback; config.onSendCallback = onSendCallback;
if (channels > 0) {
if (channelMap == NULL) { if (channelMap == NULL) {
if (channels > 8) { if (channels > 8) {
mal_zero_memory(channelMap, sizeof(mal_channel)*MAL_MAX_CHANNELS); mal_zero_memory(config.channelMap, sizeof(mal_channel)*MAL_MAX_CHANNELS);
} else { } else {
mal_get_standard_channel_map(mal_standard_channel_map_default, channels, config.channelMap); mal_get_standard_channel_map(mal_standard_channel_map_default, channels, config.channelMap);
} }
} else { } else {
mal_copy_memory(config.channelMap, channelMap, sizeof(config.channelMap)); mal_copy_memory(config.channelMap, channelMap, sizeof(config.channelMap));
} }
} else {
mal_zero_memory(config.channelMap, sizeof(mal_channel)*MAL_MAX_CHANNELS);
}
return config; return config;
} }