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
ef55f674
Commit
ef55f674
authored
Jul 14, 2021
by
David Reid
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev'
parents
66b5ccb5
0f5cb782
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
276 additions
and
69 deletions
+276
-69
extras/miniaudio_split/miniaudio.c
extras/miniaudio_split/miniaudio.c
+129
-32
extras/miniaudio_split/miniaudio.h
extras/miniaudio_split/miniaudio.h
+4
-2
miniaudio.h
miniaudio.h
+137
-33
research/miniaudio_engine.h
research/miniaudio_engine.h
+6
-2
No files found.
extras/miniaudio_split/miniaudio.c
View file @
ef55f674
This diff is collapsed.
Click to expand it.
extras/miniaudio_split/miniaudio.h
View file @
ef55f674
/*
Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file.
miniaudio - v0.10.3
7 - 2021-07-06
miniaudio - v0.10.3
8 - 2021-07-14
David Reid - mackron@gmail.com
...
...
@@ -20,7 +20,7 @@ extern "C" {
#define MA_VERSION_MAJOR 0
#define MA_VERSION_MINOR 10
#define MA_VERSION_REVISION 3
7
#define MA_VERSION_REVISION 3
8
#define MA_VERSION_STRING MA_XSTRINGIFY(MA_VERSION_MAJOR) "." MA_XSTRINGIFY(MA_VERSION_MINOR) "." MA_XSTRINGIFY(MA_VERSION_REVISION)
#if defined(_MSC_VER) && !defined(__clang__)
...
...
@@ -2384,6 +2384,8 @@ struct ma_context
ma_proc
pa_stream_get_device_name
;
ma_proc
pa_stream_set_write_callback
;
ma_proc
pa_stream_set_read_callback
;
ma_proc
pa_stream_set_suspended_callback
;
ma_proc
pa_stream_is_suspended
;
ma_proc
pa_stream_flush
;
ma_proc
pa_stream_drain
;
ma_proc
pa_stream_is_corked
;
...
...
miniaudio.h
View file @
ef55f674
This diff is collapsed.
Click to expand it.
research/miniaudio_engine.h
View file @
ef55f674
...
...
@@ -13397,7 +13397,7 @@ MA_API ma_result ma_engine_play_sound_ex(ma_engine* pEngine, const char* pFilePa
ma_uint32
soundFlags
=
0
;
for
(
pNextSound
=
pEngine
->
pInlinedSoundHead
;
pNextSound
!=
NULL
;
pNextSound
=
pNextSound
->
pNext
)
{
if
(
c89atomic_load_8
(
&
pNextSound
->
sound
.
atE
nd
))
{
if
(
ma_sound_at_end
(
&
pNextSound
->
sou
nd
))
{
/*
The sound is at the end which means it's available for recycling. All we need to do
is uninitialize it and reinitialize it. All we're doing is recycling memory.
...
...
@@ -13413,6 +13413,10 @@ MA_API ma_result ma_engine_play_sound_ex(ma_engine* pEngine, const char* pFilePa
We actually want to detach the sound from the list here. The reason is because we want the sound
to be in a consistent state at the non-recycled case to simplify the logic below.
*/
if
(
pEngine
->
pInlinedSoundHead
==
pSound
)
{
pEngine
->
pInlinedSoundHead
=
pSound
->
pNext
;
}
if
(
pSound
->
pPrev
!=
NULL
)
{
pSound
->
pPrev
->
pNext
=
pSound
->
pNext
;
}
...
...
@@ -13470,7 +13474,7 @@ MA_API ma_result ma_engine_play_sound_ex(ma_engine* pEngine, const char* pFilePa
result
=
ma_sound_start
(
&
pSound
->
sound
);
if
(
result
!=
MA_SUCCESS
)
{
/* Failed to start the sound. We need to mark it for recycling and return an error. */
pSound
->
sound
.
atEnd
=
MA_TRUE
;
c89atomic_exchange_8
(
&
pSound
->
sound
.
atEnd
,
MA_TRUE
)
;
return
result
;
}
...
...
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