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
994cda44
Commit
994cda44
authored
Apr 26, 2021
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Version 0.10.34
parent
16a605ee
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
298 additions
and
69 deletions
+298
-69
extras/miniaudio_split/miniaudio.c
extras/miniaudio_split/miniaudio.c
+280
-62
extras/miniaudio_split/miniaudio.h
extras/miniaudio_split/miniaudio.h
+16
-5
miniaudio.h
miniaudio.h
+2
-2
No files found.
extras/miniaudio_split/miniaudio.c
View file @
994cda44
This diff is collapsed.
Click to expand it.
extras/miniaudio_split/miniaudio.h
View file @
994cda44
/*
/*
Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file.
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
3 - 2021-04-04
miniaudio - v0.10.3
4 - 2021-04-26
David Reid - mackron@gmail.com
David Reid - mackron@gmail.com
...
@@ -20,7 +20,7 @@ extern "C" {
...
@@ -20,7 +20,7 @@ extern "C" {
#define MA_VERSION_MAJOR 0
#define MA_VERSION_MAJOR 0
#define MA_VERSION_MINOR 10
#define MA_VERSION_MINOR 10
#define MA_VERSION_REVISION 3
3
#define MA_VERSION_REVISION 3
4
#define MA_VERSION_STRING MA_XSTRINGIFY(MA_VERSION_MAJOR) "." MA_XSTRINGIFY(MA_VERSION_MINOR) "." MA_XSTRINGIFY(MA_VERSION_REVISION)
#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__)
#if defined(_MSC_VER) && !defined(__clang__)
...
@@ -411,7 +411,7 @@ typedef enum
...
@@ -411,7 +411,7 @@ typedef enum
ma_standard_sample_rate_32000
=
32000
,
/* Lows */
ma_standard_sample_rate_32000
=
32000
,
/* Lows */
ma_standard_sample_rate_24000
=
24000
,
ma_standard_sample_rate_24000
=
24000
,
ma_standard_sample_rate_22050
=
22050
,
ma_standard_sample_rate_22050
=
22050
,
ma_standard_sample_rate_88200
=
88200
,
/* Highs */
ma_standard_sample_rate_88200
=
88200
,
/* Highs */
ma_standard_sample_rate_96000
=
96000
,
ma_standard_sample_rate_96000
=
96000
,
ma_standard_sample_rate_176400
=
176400
,
ma_standard_sample_rate_176400
=
176400
,
...
@@ -2039,7 +2039,7 @@ easier, some helper callbacks are available. If the backend uses a blocking read
...
@@ -2039,7 +2039,7 @@ easier, some helper callbacks are available. If the backend uses a blocking read
backend uses a callback for data delivery, that callback must call `ma_device_handle_backend_data_callback()` from within it's callback.
backend uses a callback for data delivery, that callback must call `ma_device_handle_backend_data_callback()` from within it's callback.
This allows miniaudio to then process any necessary data conversion and then pass it to the miniaudio data callback.
This allows miniaudio to then process any necessary data conversion and then pass it to the miniaudio data callback.
If the backend requires absolute flexibility with it's data delivery, it can optionally implement the `onDevice
WorkerThread
()` callback
If the backend requires absolute flexibility with it's data delivery, it can optionally implement the `onDevice
DataLoop
()` callback
which will allow it to implement the logic that will run on the audio thread. This is much more advanced and is completely optional.
which will allow it to implement the logic that will run on the audio thread. This is much more advanced and is completely optional.
The audio thread should run data delivery logic in a loop while `ma_device_get_state() == MA_STATE_STARTED` and no errors have been
The audio thread should run data delivery logic in a loop while `ma_device_get_state() == MA_STATE_STARTED` and no errors have been
...
@@ -2115,7 +2115,7 @@ typedef struct
...
@@ -2115,7 +2115,7 @@ typedef struct
ma_device_type
deviceType
;
ma_device_type
deviceType
;
void
*
pAudioClient
;
void
*
pAudioClient
;
void
**
ppAudioClientService
;
void
**
ppAudioClientService
;
ma_result
result
;
/* The result from creating the audio client service. */
ma_result
*
pResult
;
/* The result from creating the audio client service. */
}
createAudioClient
;
}
createAudioClient
;
struct
struct
{
{
...
@@ -2236,6 +2236,7 @@ struct ma_context
...
@@ -2236,6 +2236,7 @@ struct ma_context
ma_proc
snd_pcm_start
;
ma_proc
snd_pcm_start
;
ma_proc
snd_pcm_drop
;
ma_proc
snd_pcm_drop
;
ma_proc
snd_pcm_drain
;
ma_proc
snd_pcm_drain
;
ma_proc
snd_pcm_reset
;
ma_proc
snd_device_name_hint
;
ma_proc
snd_device_name_hint
;
ma_proc
snd_device_name_get_hint
;
ma_proc
snd_device_name_get_hint
;
ma_proc
snd_card_get_index
;
ma_proc
snd_card_get_index
;
...
@@ -2248,9 +2249,13 @@ struct ma_context
...
@@ -2248,9 +2249,13 @@ struct ma_context
ma_proc
snd_pcm_avail
;
ma_proc
snd_pcm_avail
;
ma_proc
snd_pcm_avail_update
;
ma_proc
snd_pcm_avail_update
;
ma_proc
snd_pcm_wait
;
ma_proc
snd_pcm_wait
;
ma_proc
snd_pcm_nonblock
;
ma_proc
snd_pcm_info
;
ma_proc
snd_pcm_info
;
ma_proc
snd_pcm_info_sizeof
;
ma_proc
snd_pcm_info_sizeof
;
ma_proc
snd_pcm_info_get_name
;
ma_proc
snd_pcm_info_get_name
;
ma_proc
snd_pcm_poll_descriptors
;
ma_proc
snd_pcm_poll_descriptors_count
;
ma_proc
snd_pcm_poll_descriptors_revents
;
ma_proc
snd_config_update_free_global
;
ma_proc
snd_config_update_free_global
;
ma_mutex
internalDeviceEnumLock
;
ma_mutex
internalDeviceEnumLock
;
...
@@ -2659,6 +2664,12 @@ struct ma_device
...
@@ -2659,6 +2664,12 @@ struct ma_device
{
{
/*snd_pcm_t**/
ma_ptr
pPCMPlayback
;
/*snd_pcm_t**/
ma_ptr
pPCMPlayback
;
/*snd_pcm_t**/
ma_ptr
pPCMCapture
;
/*snd_pcm_t**/
ma_ptr
pPCMCapture
;
/*struct pollfd**/
void
*
pPollDescriptorsPlayback
;
/*struct pollfd**/
void
*
pPollDescriptorsCapture
;
int
pollDescriptorCountPlayback
;
int
pollDescriptorCountCapture
;
int
wakeupfdPlayback
;
/* eventfd for waking up from poll() when the playback device is stopped. */
int
wakeupfdCapture
;
/* eventfd for waking up from poll() when the capture device is stopped. */
ma_bool8
isUsingMMapPlayback
;
ma_bool8
isUsingMMapPlayback
;
ma_bool8
isUsingMMapCapture
;
ma_bool8
isUsingMMapCapture
;
}
alsa
;
}
alsa
;
...
...
miniaudio.h
View file @
994cda44
/*
/*
Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file.
Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file.
miniaudio - v0.10.34 -
TBD
miniaudio - v0.10.34 -
2021-04-26
David Reid - mackron@gmail.com
David Reid - mackron@gmail.com
...
@@ -64800,7 +64800,7 @@ The following miscellaneous changes have also been made.
...
@@ -64800,7 +64800,7 @@ The following miscellaneous changes have also been made.
/*
/*
REVISION HISTORY
REVISION HISTORY
================
================
v0.10.34 -
TBD
v0.10.34 -
2021-04-26
- WASAPI: Fix a bug where a result code is not getting checked at initialization time.
- WASAPI: Fix a bug where a result code is not getting checked at initialization time.
- WASAPI: Bug fixes for loopback mode.
- WASAPI: Bug fixes for loopback mode.
- ALSA: Fix a possible deadlock when stopping devices.
- ALSA: Fix a possible deadlock when stopping devices.
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