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
87d05684
Commit
87d05684
authored
Feb 25, 2018
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add some device config initialization helpers.
parent
0c50484b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
5 deletions
+16
-5
mini_al.h
mini_al.h
+16
-5
No files found.
mini_al.h
View file @
87d05684
...
@@ -1418,13 +1418,18 @@ mal_context_config mal_context_config_init(mal_log_proc onLog);
...
@@ -1418,13 +1418,18 @@ mal_context_config mal_context_config_init(mal_log_proc onLog);
//
//
// Efficiency: HIGH
// Efficiency: HIGH
// This just returns a stack allocated object and consists of just a few assignments.
// This just returns a stack allocated object and consists of just a few assignments.
mal_device_config
mal_device_config_init
(
mal_format
format
,
mal_uint32
channels
,
mal_uint32
sampleRate
,
mal_recv_proc
onRecvCallback
,
mal_send_proc
onSendCallback
);
mal_device_config
mal_device_config_init_ex
(
mal_format
format
,
mal_uint32
channels
,
mal_uint32
sampleRate
,
mal_uint8
channelMap
[
MAL_MAX_CHANNELS
],
mal_recv_proc
onRecvCallback
,
mal_send_proc
onSendCallback
);
// A simplified version of mal_device_config_init_ex().
static
inline
mal_device_config
mal_device_config_init
(
mal_format
format
,
mal_uint32
channels
,
mal_uint32
sampleRate
,
mal_recv_proc
onRecvCallback
,
mal_send_proc
onSendCallback
)
{
return
mal_device_config_init_ex
(
format
,
channels
,
sampleRate
,
NULL
,
onRecvCallback
,
onSendCallback
);
}
// A simplified version of mal_device_config_init() for capture devices.
// A simplified version of mal_device_config_init() for capture devices.
static
inline
mal_device_config
mal_device_config_init_capture
(
mal_format
format
,
mal_uint32
channels
,
mal_uint32
sampleRate
,
mal_recv_proc
onRecvCallback
)
{
return
mal_device_config_init
(
format
,
channels
,
sampleRate
,
onRecvCallback
,
NULL
);
}
static
inline
mal_device_config
mal_device_config_init_capture_ex
(
mal_format
format
,
mal_uint32
channels
,
mal_uint32
sampleRate
,
mal_uint8
channelMap
[
MAL_MAX_CHANNELS
],
mal_recv_proc
onRecvCallback
)
{
return
mal_device_config_init_ex
(
format
,
channels
,
sampleRate
,
channelMap
,
onRecvCallback
,
NULL
);
}
static
inline
mal_device_config
mal_device_config_init_capture
(
mal_format
format
,
mal_uint32
channels
,
mal_uint32
sampleRate
,
mal_recv_proc
onRecvCallback
)
{
return
mal_device_config_init_capture_ex
(
format
,
channels
,
sampleRate
,
NULL
,
onRecvCallback
);
}
// A simplified version of mal_device_config_init() for playback devices.
// A simplified version of mal_device_config_init() for playback devices.
static
inline
mal_device_config
mal_device_config_init_playback
(
mal_format
format
,
mal_uint32
channels
,
mal_uint32
sampleRate
,
mal_send_proc
onSendCallback
)
{
return
mal_device_config_init
(
format
,
channels
,
sampleRate
,
NULL
,
onSendCallback
);
}
static
inline
mal_device_config
mal_device_config_init_playback_ex
(
mal_format
format
,
mal_uint32
channels
,
mal_uint32
sampleRate
,
mal_uint8
channelMap
[
MAL_MAX_CHANNELS
],
mal_send_proc
onSendCallback
)
{
return
mal_device_config_init_ex
(
format
,
channels
,
sampleRate
,
channelMap
,
NULL
,
onSendCallback
);
}
static
inline
mal_device_config
mal_device_config_init_playback
(
mal_format
format
,
mal_uint32
channels
,
mal_uint32
sampleRate
,
mal_send_proc
onSendCallback
)
{
return
mal_device_config_init_playback_ex
(
format
,
channels
,
sampleRate
,
NULL
,
onSendCallback
);
}
...
@@ -10348,7 +10353,7 @@ static void mal_get_default_device_config_channel_map(mal_uint32 channels, mal_u
...
@@ -10348,7 +10353,7 @@ static void mal_get_default_device_config_channel_map(mal_uint32 channels, mal_u
}
}
}
}
mal_device_config
mal_device_config_init
(
mal_format
format
,
mal_uint32
channels
,
mal_uint32
sampleRate
,
mal_recv_proc
onRecvCallback
,
mal_send_proc
onSendCallback
)
mal_device_config
mal_device_config_init
_ex
(
mal_format
format
,
mal_uint32
channels
,
mal_uint32
sampleRate
,
mal_uint8
channelMap
[
MAL_MAX_CHANNELS
]
,
mal_recv_proc
onRecvCallback
,
mal_send_proc
onSendCallback
)
{
{
mal_device_config
config
;
mal_device_config
config
;
mal_zero_object
(
&
config
);
mal_zero_object
(
&
config
);
...
@@ -10358,7 +10363,13 @@ mal_device_config mal_device_config_init(mal_format format, mal_uint32 channels,
...
@@ -10358,7 +10363,13 @@ mal_device_config mal_device_config_init(mal_format format, mal_uint32 channels,
config
.
sampleRate
=
sampleRate
;
config
.
sampleRate
=
sampleRate
;
config
.
onRecvCallback
=
onRecvCallback
;
config
.
onRecvCallback
=
onRecvCallback
;
config
.
onSendCallback
=
onSendCallback
;
config
.
onSendCallback
=
onSendCallback
;
if
(
channelMap
==
NULL
)
{
mal_get_default_device_config_channel_map
(
channels
,
config
.
channelMap
);
mal_get_default_device_config_channel_map
(
channels
,
config
.
channelMap
);
}
else
{
mal_copy_memory
(
config
.
channelMap
,
channelMap
,
sizeof
(
config
.
channelMap
));
}
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