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
f17428de
Commit
f17428de
authored
Dec 30, 2018
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove an unnecessary global array.
parent
6a60208c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
27 deletions
+18
-27
mini_al.h
mini_al.h
+18
-27
No files found.
mini_al.h
View file @
f17428de
...
@@ -1303,7 +1303,7 @@ typedef struct
...
@@ -1303,7 +1303,7 @@ typedef struct
} mal_IMMNotificationClient;
} mal_IMMNotificationClient;
#endif
#endif
/* Backend enums must be in priority order. */
typedef enum
typedef enum
{
{
mal_backend_wasapi,
mal_backend_wasapi,
...
@@ -3777,7 +3777,7 @@ mal_uint32 mal_get_standard_sample_rate_priority_index(mal_uint32 sampleRate)
...
@@ -3777,7 +3777,7 @@ mal_uint32 mal_get_standard_sample_rate_priority_index(mal_uint32 sampleRate)
#endif
#endif
#endif
#endif
#ifdef MAL_ENABLE_PULSEAUDIO
#ifdef MAL_ENABLE_PULSEAUDIO
#define MAL_HAS_PULSEAUDIO
// Development packages are unnecessary for PulseAudio.
#define MAL_HAS_PULSEAUDIO
#ifdef MAL_NO_RUNTIME_LINKING
#ifdef MAL_NO_RUNTIME_LINKING
#ifdef __has_include
#ifdef __has_include
#if !__has_include(<pulse/pulseaudio.h>)
#if !__has_include(<pulse/pulseaudio.h>)
...
@@ -3803,7 +3803,7 @@ mal_uint32 mal_get_standard_sample_rate_priority_index(mal_uint32 sampleRate)
...
@@ -3803,7 +3803,7 @@ mal_uint32 mal_get_standard_sample_rate_priority_index(mal_uint32 sampleRate)
#define MAL_HAS_SNDIO
#define MAL_HAS_SNDIO
#endif
#endif
#ifdef MAL_ENABLE_AUDIO4
#ifdef MAL_ENABLE_AUDIO4
#define MAL_HAS_AUDIO4
// When enabled, always assume audio(4) is available.
#define MAL_HAS_AUDIO4
#endif
#endif
#ifdef MAL_ENABLE_OSS
#ifdef MAL_ENABLE_OSS
#define MAL_HAS_OSS
#define MAL_HAS_OSS
...
@@ -3812,7 +3812,7 @@ mal_uint32 mal_get_standard_sample_rate_priority_index(mal_uint32 sampleRate)
...
@@ -3812,7 +3812,7 @@ mal_uint32 mal_get_standard_sample_rate_priority_index(mal_uint32 sampleRate)
#define MAL_HAS_AAUDIO
#define MAL_HAS_AAUDIO
#endif
#endif
#ifdef MAL_ENABLE_OPENSL
#ifdef MAL_ENABLE_OPENSL
#define MAL_HAS_OPENSL
// OpenSL is the only supported backend for Android. It must be present.
#define MAL_HAS_OPENSL
#endif
#endif
#ifdef MAL_ENABLE_WEBAUDIO
#ifdef MAL_ENABLE_WEBAUDIO
#define MAL_HAS_WEBAUDIO
#define MAL_HAS_WEBAUDIO
...
@@ -3849,25 +3849,6 @@ mal_uint32 mal_get_standard_sample_rate_priority_index(mal_uint32 sampleRate)
...
@@ -3849,25 +3849,6 @@ mal_uint32 mal_get_standard_sample_rate_priority_index(mal_uint32 sampleRate)
#define MAL_HAS_NULL // Everything supports the null backend.
#define MAL_HAS_NULL // Everything supports the null backend.
#endif
#endif
const mal_backend g_malDefaultBackends[] = {
mal_backend_wasapi,
mal_backend_dsound,
mal_backend_winmm,
mal_backend_coreaudio,
mal_backend_sndio,
mal_backend_audio4,
mal_backend_oss,
mal_backend_pulseaudio,
mal_backend_alsa,
mal_backend_jack,
mal_backend_aaudio,
mal_backend_opensl,
mal_backend_webaudio,
mal_backend_openal,
mal_backend_sdl,
mal_backend_null
};
const char* mal_get_backend_name(mal_backend backend)
const char* mal_get_backend_name(mal_backend backend)
{
{
switch (backend)
switch (backend)
...
@@ -21454,11 +21435,16 @@ mal_result mal_context_init(const mal_backend backends[], mal_uint32 backendCoun
...
@@ -21454,11 +21435,16 @@ mal_result mal_context_init(const mal_backend backends[], mal_uint32 backendCoun
return result;
return result;
}
}
mal_backend defaultBackends[mal_backend_null+1];
for (int i = 0; i <= mal_backend_null; ++i) {
defaultBackends[i] = (mal_backend)i;
}
mal_backend* pBackendsToIterate = (mal_backend*)backends;
mal_backend* pBackendsToIterate = (mal_backend*)backends;
mal_uint32 backendsToIterateCount = backendCount;
mal_uint32 backendsToIterateCount = backendCount;
if (pBackendsToIterate == NULL) {
if (pBackendsToIterate == NULL) {
pBackendsToIterate = (mal_backend*)
g_malD
efaultBackends;
pBackendsToIterate = (mal_backend*)
d
efaultBackends;
backendsToIterateCount = mal_countof(
g_malD
efaultBackends);
backendsToIterateCount = mal_countof(
d
efaultBackends);
}
}
mal_assert(pBackendsToIterate != NULL);
mal_assert(pBackendsToIterate != NULL);
...
@@ -21949,11 +21935,16 @@ mal_result mal_device_init_ex(const mal_backend backends[], mal_uint32 backendCo
...
@@ -21949,11 +21935,16 @@ mal_result mal_device_init_ex(const mal_backend backends[], mal_uint32 backendCo
return MAL_OUT_OF_MEMORY;
return MAL_OUT_OF_MEMORY;
}
}
mal_backend defaultBackends[mal_backend_null+1];
for (int i = 0; i <= mal_backend_null; ++i) {
defaultBackends[i] = (mal_backend)i;
}
mal_backend* pBackendsToIterate = (mal_backend*)backends;
mal_backend* pBackendsToIterate = (mal_backend*)backends;
mal_uint32 backendsToIterateCount = backendCount;
mal_uint32 backendsToIterateCount = backendCount;
if (pBackendsToIterate == NULL) {
if (pBackendsToIterate == NULL) {
pBackendsToIterate = (mal_backend*)
g_malD
efaultBackends;
pBackendsToIterate = (mal_backend*)
d
efaultBackends;
backendsToIterateCount = mal_countof(
g_malD
efaultBackends);
backendsToIterateCount = mal_countof(
d
efaultBackends);
}
}
mal_result result = MAL_NO_BACKEND;
mal_result result = MAL_NO_BACKEND;
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