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

Change the default channel mapping to the standard Microsoft mapping.

Browse Source
This commit is contained in:
David Reid
2018-03-11 10:55:31 +10:00
parent 164dbd5b76
commit 4c2e0101b7
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mini_al.h
+13 -13
View File
@@ -626,7 +626,7 @@ typedef enum
mal_standard_channel_map_rfc3551, // Based off AIFF. mal_standard_channel_map_rfc3551, // Based off AIFF.
mal_standard_channel_map_flac, mal_standard_channel_map_flac,
mal_standard_channel_map_vorbis, mal_standard_channel_map_vorbis,
mal_standard_channel_map_default = mal_standard_channel_map_flac mal_standard_channel_map_default = mal_standard_channel_map_microsoft
} mal_standard_channel_map; } mal_standard_channel_map;
typedef union typedef union
@@ -1600,10 +1600,10 @@ mal_device_config mal_device_config_init_default_playback(mal_send_proc onSendCa
// | | 1: MAL_CHANNEL_FRONT_RIGHT | // | | 1: MAL_CHANNEL_FRONT_RIGHT |
// | | 2: MAL_CHANNEL_FRONT_CENTER | // | | 2: MAL_CHANNEL_FRONT_CENTER |
// |---------------|------------------------------| // |---------------|------------------------------|
// | 4 (Quad) | 0: MAL_CHANNEL_FRONT_LEFT | // | 4 (Surround) | 0: MAL_CHANNEL_FRONT_LEFT |
// | | 1: MAL_CHANNEL_FRONT_RIGHT | // | | 1: MAL_CHANNEL_FRONT_RIGHT |
// | | 2: MAL_CHANNEL_BACK_LEFT | // | | 2: MAL_CHANNEL_FRONT_CENTER |
// | | 3: MAL_CHANNEL_BACK_RIGHT | // | | 3: MAL_CHANNEL_BACK_CENTER |
// |---------------|------------------------------| // |---------------|------------------------------|
// | 5 | 0: MAL_CHANNEL_FRONT_LEFT | // | 5 | 0: MAL_CHANNEL_FRONT_LEFT |
// | | 1: MAL_CHANNEL_FRONT_RIGHT | // | | 1: MAL_CHANNEL_FRONT_RIGHT |
@@ -1615,8 +1615,8 @@ mal_device_config mal_device_config_init_default_playback(mal_send_proc onSendCa
// | | 1: MAL_CHANNEL_FRONT_RIGHT | // | | 1: MAL_CHANNEL_FRONT_RIGHT |
// | | 2: MAL_CHANNEL_FRONT_CENTER | // | | 2: MAL_CHANNEL_FRONT_CENTER |
// | | 3: MAL_CHANNEL_LFE | // | | 3: MAL_CHANNEL_LFE |
// | | 4: MAL_CHANNEL_BACK_LEFT | // | | 4: MAL_CHANNEL_SIDE_LEFT |
// | | 5: MAL_CHANNEL_BACK_RIGHT | // | | 5: MAL_CHANNEL_SIDE_RIGHT |
// |---------------|------------------------------| // |---------------|------------------------------|
// | 7 | 0: MAL_CHANNEL_FRONT_LEFT | // | 7 | 0: MAL_CHANNEL_FRONT_LEFT |
// | | 1: MAL_CHANNEL_FRONT_RIGHT | // | | 1: MAL_CHANNEL_FRONT_RIGHT |
@@ -13658,11 +13658,6 @@ void mal_get_standard_channel_map(mal_standard_channel_map standardChannelMap, m
{ {
switch (standardChannelMap) switch (standardChannelMap)
{ {
case mal_standard_channel_map_microsoft:
{
mal_get_standard_channel_map_microsoft(channels, channelMap);
} break;
case mal_standard_channel_map_alsa: case mal_standard_channel_map_alsa:
{ {
mal_get_standard_channel_map_alsa(channels, channelMap); mal_get_standard_channel_map_alsa(channels, channelMap);
@@ -13673,15 +13668,20 @@ void mal_get_standard_channel_map(mal_standard_channel_map standardChannelMap, m
mal_get_standard_channel_map_rfc3551(channels, channelMap); mal_get_standard_channel_map_rfc3551(channels, channelMap);
} break; } break;
case mal_standard_channel_map_flac:
{
mal_get_standard_channel_map_flac(channels, channelMap);
} break;
case mal_standard_channel_map_vorbis: case mal_standard_channel_map_vorbis:
{ {
mal_get_standard_channel_map_vorbis(channels, channelMap); mal_get_standard_channel_map_vorbis(channels, channelMap);
} break; } break;
case mal_standard_channel_map_flac: case mal_standard_channel_map_microsoft:
default: default:
{ {
mal_get_standard_channel_map_flac(channels, channelMap); mal_get_standard_channel_map_microsoft(channels, channelMap);
} break; } break;
} }
} }