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
b4f490a1
Commit
b4f490a1
authored
Jul 13, 2020
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation errors on Android.
parent
23b792b5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
miniaudio.h
miniaudio.h
+7
-6
No files found.
miniaudio.h
View file @
b4f490a1
...
...
@@ -28842,7 +28842,7 @@ static SLuint32 ma_channel_map_to_channel_mask__opensl(const ma_channel* pChanne
SLuint32 channelMask = 0;
ma_uint32 iChannel;
for (iChannel = 0; iChannel < channels; ++iChannel) {
channelMask |= ma_channel_id_to_opensl(
c
hannelMap[iChannel]);
channelMask |= ma_channel_id_to_opensl(
pC
hannelMap[iChannel]);
}
return channelMask;
...
...
@@ -28852,13 +28852,13 @@ static SLuint32 ma_channel_map_to_channel_mask__opensl(const ma_channel* pChanne
static void ma_channel_mask_to_channel_map__opensl(SLuint32 channelMask, ma_uint32 channels, ma_channel* pChannelMap)
{
if (channels == 1 && channelMask == 0) {
c
hannelMap[0] = MA_CHANNEL_MONO;
pC
hannelMap[0] = MA_CHANNEL_MONO;
} else if (channels == 2 && channelMask == 0) {
c
hannelMap[0] = MA_CHANNEL_FRONT_LEFT;
c
hannelMap[1] = MA_CHANNEL_FRONT_RIGHT;
pC
hannelMap[0] = MA_CHANNEL_FRONT_LEFT;
pC
hannelMap[1] = MA_CHANNEL_FRONT_RIGHT;
} else {
if (channels == 1 && (channelMask & SL_SPEAKER_FRONT_CENTER) != 0) {
c
hannelMap[0] = MA_CHANNEL_MONO;
pC
hannelMap[0] = MA_CHANNEL_MONO;
} else {
/* Just iterate over each bit. */
ma_uint32 iChannel = 0;
...
...
@@ -28867,7 +28867,7 @@ static void ma_channel_mask_to_channel_map__opensl(SLuint32 channelMask, ma_uint
SLuint32 bitValue = (channelMask & (1UL << iBit));
if (bitValue != 0) {
/* The bit is set. */
c
hannelMap[iChannel] = ma_channel_id_to_ma__opensl(bitValue);
pC
hannelMap[iChannel] = ma_channel_id_to_ma__opensl(bitValue);
iChannel += 1;
}
}
...
...
@@ -61967,6 +61967,7 @@ The following miscellaneous changes have also been made.
REVISION HISTORY
================
v0.10.14 - TBD
- Fix compilation errors on Android.
- Updates to the documentation.
v0.10.13 - 2020-07-11
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