Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
miniaudio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
miniaudio
Commits
4c2e0101
Commit
4c2e0101
authored
Mar 11, 2018
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change the default channel mapping to the standard Microsoft mapping.
parent
164dbd5b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
13 deletions
+13
-13
mini_al.h
mini_al.h
+13
-13
No files found.
mini_al.h
View file @
4c2e0101
...
@@ -626,7 +626,7 @@ typedef enum
...
@@ -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
...
@@ -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
...
@@ -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
...
@@ -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
...
@@ -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
;
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment