mirror/miniaudio
1
0
Fork 0
mirror of https://github.com/mackron/miniaudio.git synced 2026-04-23 16:54:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove an unnecessary global array.

Browse Source
This commit is contained in:
David Reid
2018-12-30 13:22:15 +10:00
parent 6a60208c6a
commit f17428de47
1 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mini_al.h
+18 -27
View File
@@ -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)
#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)
#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)
#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)
#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
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_malDefaultBackends; pBackendsToIterate = (mal_backend*)defaultBackends;
backendsToIterateCount = mal_countof(g_malDefaultBackends); backendsToIterateCount = mal_countof(defaultBackends);
} }
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
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_malDefaultBackends; pBackendsToIterate = (mal_backend*)defaultBackends;
backendsToIterateCount = mal_countof(g_malDefaultBackends); backendsToIterateCount = mal_countof(defaultBackends);
} }
mal_result result = MAL_NO_BACKEND; mal_result result = MAL_NO_BACKEND;