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
c530416a
Commit
c530416a
authored
May 25, 2020
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor update to ma_mixer.
parent
f333a5ef
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
research/ma_mixing.c
research/ma_mixing.c
+1
-1
research/ma_mixing.h
research/ma_mixing.h
+3
-2
No files found.
research/ma_mixing.c
View file @
c530416a
...
@@ -107,7 +107,7 @@ int main(int argc, char** argv)
...
@@ -107,7 +107,7 @@ int main(int argc, char** argv)
/* Mixers. */
/* Mixers. */
mixerConfig
=
ma_mixer_config_init
(
device
.
playback
.
format
,
device
.
playback
.
channels
,
4096
,
NULL
);
mixerConfig
=
ma_mixer_config_init
(
device
.
playback
.
format
,
device
.
playback
.
channels
,
4096
,
NULL
,
NULL
);
result
=
ma_mixer_init
(
&
mixerConfig
,
&
g_mixer
);
result
=
ma_mixer_init
(
&
mixerConfig
,
&
g_mixer
);
if
(
result
!=
MA_SUCCESS
)
{
if
(
result
!=
MA_SUCCESS
)
{
return
result
;
return
result
;
...
...
research/ma_mixing.h
View file @
c530416a
...
@@ -340,7 +340,7 @@ typedef struct
...
@@ -340,7 +340,7 @@ typedef struct
float
volume
;
float
volume
;
}
ma_mixer_config
;
}
ma_mixer_config
;
MA_API
ma_mixer_config
ma_mixer_config_init
(
ma_format
format
,
ma_uint32
channels
,
ma_uint64
accumulationBufferSizeInFrames
,
void
*
pPreAllocatedAccumulationBuffer
);
MA_API
ma_mixer_config
ma_mixer_config_init
(
ma_format
format
,
ma_uint32
channels
,
ma_uint64
accumulationBufferSizeInFrames
,
void
*
pPreAllocatedAccumulationBuffer
,
const
ma_allocation_callbacks
*
pAllocationCallbacks
);
typedef
ma_uint32
(
*
ma_mixer_mix_callback_proc
)(
void
*
pUserData
,
void
*
pFramesOut
,
ma_uint32
frameCount
);
typedef
ma_uint32
(
*
ma_mixer_mix_callback_proc
)(
void
*
pUserData
,
void
*
pFramesOut
,
ma_uint32
frameCount
);
...
@@ -2544,7 +2544,7 @@ static void ma_mix_accumulation_buffers_ex(void* pDst, ma_format formatOut, ma_u
...
@@ -2544,7 +2544,7 @@ static void ma_mix_accumulation_buffers_ex(void* pDst, ma_format formatOut, ma_u
MA_API
ma_mixer_config
ma_mixer_config_init
(
ma_format
format
,
ma_uint32
channels
,
ma_uint64
accumulationBufferSizeInFrames
,
void
*
pPreAllocatedAccumulationBuffer
)
MA_API
ma_mixer_config
ma_mixer_config_init
(
ma_format
format
,
ma_uint32
channels
,
ma_uint64
accumulationBufferSizeInFrames
,
void
*
pPreAllocatedAccumulationBuffer
,
const
ma_allocation_callbacks
*
pAllocationCallbacks
)
{
{
ma_mixer_config
config
;
ma_mixer_config
config
;
...
@@ -2554,6 +2554,7 @@ MA_API ma_mixer_config ma_mixer_config_init(ma_format format, ma_uint32 channels
...
@@ -2554,6 +2554,7 @@ MA_API ma_mixer_config ma_mixer_config_init(ma_format format, ma_uint32 channels
config
.
accumulationBufferSizeInFrames
=
accumulationBufferSizeInFrames
;
config
.
accumulationBufferSizeInFrames
=
accumulationBufferSizeInFrames
;
config
.
pPreAllocatedAccumulationBuffer
=
pPreAllocatedAccumulationBuffer
;
config
.
pPreAllocatedAccumulationBuffer
=
pPreAllocatedAccumulationBuffer
;
config
.
volume
=
1
;
config
.
volume
=
1
;
ma_allocation_callbacks_init_copy
(
&
config
.
allocationCallbacks
,
pAllocationCallbacks
);
return
config
;
return
config
;
}
}
...
...
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