From 412a8244b66a8431639baf69a2387ad477dace07 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Mon, 9 Sep 2024 13:21:45 -0400
Subject: [PATCH] audio: Make system-specific audio format types part of
SDL_AudioFormat.
This keeps them all in the same place, and merges them into the documentation.
---
include/SDL3/SDL_audio.h | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/include/SDL3/SDL_audio.h b/include/SDL3/SDL_audio.h
index 3ea393a844f04..d7af95bc71992 100644
--- a/include/SDL3/SDL_audio.h
+++ b/include/SDL3/SDL_audio.h
@@ -141,19 +141,20 @@ typedef enum SDL_AudioFormat
/* SDL_DEFINE_AUDIO_FORMAT(1, 1, 0, 32), */
SDL_AUDIO_F32LE = 0x8120u, /**< 32-bit floating point samples */
/* SDL_DEFINE_AUDIO_FORMAT(1, 0, 1, 32), */
- SDL_AUDIO_F32BE = 0x9120u /**< As above, but big-endian byte order */
+ SDL_AUDIO_F32BE = 0x9120u, /**< As above, but big-endian byte order */
/* SDL_DEFINE_AUDIO_FORMAT(1, 1, 1, 32), */
-} SDL_AudioFormat;
-#if SDL_BYTEORDER == SDL_LIL_ENDIAN
-#define SDL_AUDIO_S16 SDL_AUDIO_S16LE
-#define SDL_AUDIO_S32 SDL_AUDIO_S32LE
-#define SDL_AUDIO_F32 SDL_AUDIO_F32LE
-#else
-#define SDL_AUDIO_S16 SDL_AUDIO_S16BE
-#define SDL_AUDIO_S32 SDL_AUDIO_S32BE
-#define SDL_AUDIO_F32 SDL_AUDIO_F32BE
-#endif
+ /* These represent the current system's byteorder. */
+ #if SDL_BYTEORDER == SDL_LIL_ENDIAN
+ SDL_AUDIO_S16 = SDL_AUDIO_S16LE,
+ SDL_AUDIO_S32 = SDL_AUDIO_S32LE,
+ SDL_AUDIO_F32 = SDL_AUDIO_F32LE
+ #else
+ SDL_AUDIO_S16 = SDL_AUDIO_S16BE,
+ SDL_AUDIO_S32 = SDL_AUDIO_S32BE,
+ SDL_AUDIO_F32 = SDL_AUDIO_F32BE
+ #endif
+} SDL_AudioFormat;
/**