Update for SDL3 coding style (#6717)

I updated .clang-format and ran clang-format 14 over the src and test directories to standardize the code base.

In general I let clang-format have it's way, and added markup to prevent formatting of code that would break or be completely unreadable if formatted.

The script I ran for the src directory is added as build-scripts/clang-format-src.sh

This fixes:
#6592
#6593
#6594

.clang-format

@@ -16,8 +16,8 @@ AllowShortFunctionsOnASingleLine: All
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLoopsOnASingleLine: false
 
-AlwaysBreakAfterDefinitionReturnType: All
-AlwaysBreakAfterReturnType: AllDefinitions
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: MultiLine
 
@@ -35,7 +35,7 @@ BraceWrapping:
   AfterUnion: true
   AfterExternBlock: false
   BeforeElse: false
-  BeforeWhile: true
+  BeforeWhile: false
   IndentBraces: false
   SplitEmptyFunction: true
   SplitEmptyRecord: true
@@ -48,7 +48,7 @@ IncludeBlocks: Preserve
 # clang-format version 4.0 through 12.0:
 #SortIncludes: false
 # clang-format version 13.0+:
-#SortIncludes: Never
+SortIncludes: Never
 
 # No length limit, in case it breaks macros, you can
 # disable it with /* clang-format off/on */ comments
@@ -62,7 +62,8 @@ IndentGotoLabels: true
 IndentPPDirectives: None
 IndentExternBlock: NoIndent
 
-SpaceAfterCStyleCast: true
+PointerAlignment: Right
+SpaceAfterCStyleCast: false
 SpacesInCStyleCastParentheses: false
 SpacesInConditionalStatement: false
 SpacesInContainerLiterals: true

build-scripts/clang-format-src.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+cd "$(dirname $0)/../src"
+
+echo "Running clang-format in $(pwd)"
+
+find . -regex '.*\.[chm]p*' -exec clang-format -i {} \;
+
+# Revert third-party code
+git checkout \
+    events/imKStoUCS.* \
+    hidapi \
+    joystick/controller_type.c \
+    joystick/controller_type.h \
+    joystick/hidapi/steam/controller_constants.h \
+    joystick/hidapi/steam/controller_structs.h \
+    libm \
+    stdlib/SDL_malloc.c \
+    stdlib/SDL_qsort.c \
+    stdlib/SDL_strtokr.c \
+    video/arm \
+    video/khronos \
+    video/x11/edid-parse.c \
+    video/yuv2rgb
+clang-format -i hidapi/SDL_hidapi.c
+
+# Revert generated code
+git checkout dynapi/SDL_dynapi_overrides.h
+git checkout dynapi/SDL_dynapi_procs.h
+git checkout render/metal/SDL_shaders_metal_*.h
+
+echo "clang-format complete!"

src/SDL.c

@@ -44,7 +44,7 @@
 
 /* Initialization/Cleanup routines */
 #if !SDL_TIMERS_DISABLED
-# include "timer/SDL_timer_c.h"
+#include "timer/SDL_timer_c.h"
 #endif
 #if SDL_VIDEO_DRIVER_WINDOWS
 extern int SDL_HelperWindowCreate(void);
@@ -87,8 +87,8 @@ SDL_NORETURN void SDL_ExitProcess(int exitcode)
        ExitProcess here that will never be reached but make MingW happy. */
     ExitProcess(exitcode);
 #elif defined(__EMSCRIPTEN__)
-    emscripten_cancel_main_loop();  /* this should "kill" the app. */
-    emscripten_force_exit(exitcode);  /* this should "kill" the app. */
+    emscripten_cancel_main_loop();   /* this should "kill" the app. */
+    emscripten_force_exit(exitcode); /* this should "kill" the app. */
     exit(exitcode);
 #elif defined(__HAIKU__)  /* Haiku has _Exit, but it's not marked noreturn. */
     _exit(exitcode);
@@ -99,7 +99,6 @@ SDL_NORETURN void SDL_ExitProcess(int exitcode)
 #endif
 }
 
-
 /* The initialized subsystems */
 #ifdef SDL_MAIN_NEEDED
 static SDL_bool SDL_MainIsReady = SDL_FALSE;
@@ -107,11 +106,10 @@ static SDL_bool SDL_MainIsReady = SDL_FALSE;
 static SDL_bool SDL_MainIsReady = SDL_TRUE;
 #endif
 static SDL_bool SDL_bInMainQuit = SDL_FALSE;
-static Uint8 SDL_SubsystemRefCount[ 32 ];
+static Uint8 SDL_SubsystemRefCount[32];
 
 /* Private helper to increment a subsystem's ref counter. */
-static void
-SDL_PrivateSubsystemRefCountIncr(Uint32 subsystem)
+static void SDL_PrivateSubsystemRefCountIncr(Uint32 subsystem)
 {
     const int subsystem_index = SDL_MostSignificantBitIndex32(subsystem);
     SDL_assert((subsystem_index < 0) || (SDL_SubsystemRefCount[subsystem_index] < 255));
@@ -121,8 +119,7 @@ SDL_PrivateSubsystemRefCountIncr(Uint32 subsystem)
 }
 
 /* Private helper to decrement a subsystem's ref counter. */
-static void
-SDL_PrivateSubsystemRefCountDecr(Uint32 subsystem)
+static void SDL_PrivateSubsystemRefCountDecr(Uint32 subsystem)
 {
     const int subsystem_index = SDL_MostSignificantBitIndex32(subsystem);
     if ((subsystem_index >= 0) && (SDL_SubsystemRefCount[subsystem_index] > 0)) {
@@ -131,8 +128,7 @@ SDL_PrivateSubsystemRefCountDecr(Uint32 subsystem)
 }
 
 /* Private helper to check if a system needs init. */
-static SDL_bool
-SDL_PrivateShouldInitSubsystem(Uint32 subsystem)
+static SDL_bool SDL_PrivateShouldInitSubsystem(Uint32 subsystem)
 {
     const int subsystem_index = SDL_MostSignificantBitIndex32(subsystem);
     SDL_assert((subsystem_index < 0) || (SDL_SubsystemRefCount[subsystem_index] < 255));
@@ -140,8 +136,8 @@ SDL_PrivateShouldInitSubsystem(Uint32 subsystem)
 }
 
 /* Private helper to check if a system needs to be quit. */
-static SDL_bool
-SDL_PrivateShouldQuitSubsystem(Uint32 subsystem) {
+static SDL_bool SDL_PrivateShouldQuitSubsystem(Uint32 subsystem)
+{
     const int subsystem_index = SDL_MostSignificantBitIndex32(subsystem);
     if ((subsystem_index >= 0) && (SDL_SubsystemRefCount[subsystem_index] == 0)) {
         return SDL_FALSE;
@@ -153,14 +149,12 @@ SDL_PrivateShouldQuitSubsystem(Uint32 subsystem) {
     return (((subsystem_index >= 0) && (SDL_SubsystemRefCount[subsystem_index] == 1)) || SDL_bInMainQuit) ? SDL_TRUE : SDL_FALSE;
 }
 
-void
-SDL_SetMainReady(void)
+void SDL_SetMainReady(void)
 {
     SDL_MainIsReady = SDL_TRUE;
 }
 
-int
-SDL_InitSubSystem(Uint32 flags)
+int SDL_InitSubSystem(Uint32 flags)
 {
     Uint32 flags_initialized = 0;
 
@@ -182,13 +176,13 @@ SDL_InitSubSystem(Uint32 flags)
         flags |= SDL_INIT_JOYSTICK;
     }
 
-    if ((flags & (SDL_INIT_VIDEO|SDL_INIT_JOYSTICK|SDL_INIT_AUDIO))) {
+    if ((flags & (SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO))) {
         /* video or joystick or audio implies events */
         flags |= SDL_INIT_EVENTS;
     }
 
 #if SDL_VIDEO_DRIVER_WINDOWS
-    if ((flags & (SDL_INIT_HAPTIC|SDL_INIT_JOYSTICK))) {
+    if ((flags & (SDL_INIT_HAPTIC | SDL_INIT_JOYSTICK))) {
         if (SDL_HelperWindowCreate() < 0) {
             goto quit_and_error;
         }
@@ -267,9 +261,9 @@ SDL_InitSubSystem(Uint32 flags)
     if ((flags & SDL_INIT_JOYSTICK)) {
 #if !SDL_JOYSTICK_DISABLED
         if (SDL_PrivateShouldInitSubsystem(SDL_INIT_JOYSTICK)) {
-           if (SDL_JoystickInit() < 0) {
-               goto quit_and_error;
-           }
+            if (SDL_JoystickInit() < 0) {
+                goto quit_and_error;
+            }
         }
         SDL_PrivateSubsystemRefCountIncr(SDL_INIT_JOYSTICK);
         flags_initialized |= SDL_INIT_JOYSTICK;
@@ -326,7 +320,7 @@ SDL_InitSubSystem(Uint32 flags)
 #endif
     }
 
-    (void) flags_initialized;  /* make static analysis happy, since this only gets used in error cases. */
+    (void)flags_initialized; /* make static analysis happy, since this only gets used in error cases. */
 
     return 0;
 
@@ -335,14 +329,12 @@ quit_and_error:
     return -1;
 }
 
-int
-SDL_Init(Uint32 flags)
+int SDL_Init(Uint32 flags)
 {
     return SDL_InitSubSystem(flags);
 }
 
-void
-SDL_QuitSubSystem(Uint32 flags)
+void SDL_QuitSubSystem(Uint32 flags)
 {
     /* Shut down requested initialized subsystems */
 #if !SDL_SENSOR_DISABLED
@@ -459,8 +451,7 @@ SDL_WasInit(Uint32 flags)
     return initialized;
 }
 
-void
-SDL_Quit(void)
+void SDL_Quit(void)
 {
     SDL_bInMainQuit = SDL_TRUE;
 
@@ -486,7 +477,7 @@ SDL_Quit(void)
     /* Now that every subsystem has been quit, we reset the subsystem refcount
      * and the list of initialized subsystems.
      */
-    SDL_memset( SDL_SubsystemRefCount, 0x0, sizeof(SDL_SubsystemRefCount) );
+    SDL_memset(SDL_SubsystemRefCount, 0x0, sizeof(SDL_SubsystemRefCount));
 
     SDL_TLSCleanup();
 
@@ -494,13 +485,13 @@ SDL_Quit(void)
 }
 
 /* Get the library version number */
-void
-SDL_GetVersion(SDL_version * ver)
+void SDL_GetVersion(SDL_version *ver)
 {
     static SDL_bool check_hint = SDL_TRUE;
     static SDL_bool legacy_version = SDL_FALSE;
 
-    if (ver == NULL) {        return;
+    if (ver == NULL) {
+        return;
     }
 
     SDL_VERSION(ver);

src/SDL_assert.c

@@ -40,8 +40,7 @@
 /* The size of the stack buffer to use for rendering assert messages. */
 #define SDL_MAX_ASSERT_MESSAGE_STACK 256
 
-static SDL_assert_state SDLCALL
-SDL_PromptAssertion(const SDL_assert_data *data, void *userdata);
+static SDL_assert_state SDLCALL SDL_PromptAssertion(const SDL_assert_data *data, void *userdata);
 
 /*
  * We keep all triggered assertions in a singly-linked list so we can
@@ -57,12 +56,10 @@ static SDL_AssertionHandler assertion_handler = SDL_PromptAssertion;
 static void *assertion_userdata = NULL;
 
 #ifdef __GNUC__
-static void
-debug_print(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
+static void debug_print(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
 #endif
 
-static void
-debug_print(const char *fmt, ...)
+static void debug_print(const char *fmt, ...)
 {
     va_list ap;
     va_start(ap, fmt);
@@ -70,31 +67,30 @@ debug_print(const char *fmt, ...)
     va_end(ap);
 }
 
-
 static void SDL_AddAssertionToReport(SDL_assert_data *data)
 {
     /* (data) is always a static struct defined with the assert macros, so
        we don't have to worry about copying or allocating them. */
     data->trigger_count++;
-    if (data->trigger_count == 1) {  /* not yet added? */
+    if (data->trigger_count == 1) { /* not yet added? */
         data->next = triggered_assertions;
         triggered_assertions = data;
     }
 }
 
 #if defined(__WIN32__) || defined(__GDK__)
-    #define ENDLINE "\r\n"
+#define ENDLINE "\r\n"
 #else
-    #define ENDLINE "\n"
+#define ENDLINE "\n"
 #endif
 
-static int SDL_RenderAssertMessage(char *buf, size_t buf_len, const SDL_assert_data *data) {
+static int SDL_RenderAssertMessage(char *buf, size_t buf_len, const SDL_assert_data *data)
+{
     return SDL_snprintf(buf, buf_len,
-        "Assertion failure at %s (%s:%d), triggered %u %s:" ENDLINE "  '%s'",
-        data->function, data->filename, data->linenum,
-        data->trigger_count, (data->trigger_count == 1) ? "time" : "times",
-        data->condition
-    );
+                        "Assertion failure at %s (%s:%d), triggered %u %s:" ENDLINE "  '%s'",
+                        data->function, data->filename, data->linenum,
+                        data->trigger_count, (data->trigger_count == 1) ? "time" : "times",
+                        data->condition);
 }
 
 static void SDL_GenerateAssertionReport(void)
@@ -124,7 +120,6 @@ static void SDL_GenerateAssertionReport(void)
     }
 }
 
-
 /* This is not declared in any header, although it is shared between some
     parts of SDL, because we don't want anything calling it without an
     extremely good reason. */
@@ -134,9 +129,8 @@ extern void SDL_ExitProcess(int exitcode);
 #endif
 extern SDL_NORETURN void SDL_ExitProcess(int exitcode);
 
-
 #if defined(__WATCOMC__)
-static void SDL_AbortAssertion (void);
+static void SDL_AbortAssertion(void);
 #pragma aux SDL_AbortAssertion aborts;
 #endif
 static SDL_NORETURN void SDL_AbortAssertion(void)
@@ -145,21 +139,20 @@ static SDL_NORETURN void SDL_AbortAssertion(void)
     SDL_ExitProcess(42);
 }
 
-static SDL_assert_state SDLCALL
-SDL_PromptAssertion(const SDL_assert_data *data, void *userdata)
+static SDL_assert_state SDLCALL SDL_PromptAssertion(const SDL_assert_data *data, void *userdata)
 {
     const char *envr;
     SDL_assert_state state = SDL_ASSERTION_ABORT;
     SDL_Window *window;
     SDL_MessageBoxData messagebox;
     SDL_MessageBoxButtonData buttons[] = {
-        {   0,  SDL_ASSERTION_RETRY,            "Retry" },
-        {   0,  SDL_ASSERTION_BREAK,            "Break" },
-        {   0,  SDL_ASSERTION_ABORT,            "Abort" },
-        {   SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT,
-                SDL_ASSERTION_IGNORE,           "Ignore" },
-        {   SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT,
-                SDL_ASSERTION_ALWAYS_IGNORE,    "Always Ignore" }
+        { 0, SDL_ASSERTION_RETRY, "Retry" },
+        { 0, SDL_ASSERTION_BREAK, "Break" },
+        { 0, SDL_ASSERTION_ABORT, "Abort" },
+        { SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT,
+          SDL_ASSERTION_IGNORE, "Ignore" },
+        { SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT,
+          SDL_ASSERTION_ALWAYS_IGNORE, "Always Ignore" }
     };
     int selected;
 
@@ -168,7 +161,7 @@ SDL_PromptAssertion(const SDL_assert_data *data, void *userdata)
     size_t buf_len = sizeof(stack_buf);
     int len;
 
-    (void) userdata;  /* unused in default handler. */
+    (void)userdata; /* unused in default handler. */
 
     /* Assume the output will fit... */
     len = SDL_RenderAssertMessage(message, buf_len, data);
@@ -213,7 +206,7 @@ SDL_PromptAssertion(const SDL_assert_data *data, void *userdata)
         } else if (SDL_strcmp(envr, "always_ignore") == 0) {
             return SDL_ASSERTION_ALWAYS_IGNORE;
         } else {
-            return SDL_ASSERTION_ABORT;  /* oh well. */
+            return SDL_ASSERTION_ABORT; /* oh well. */
         }
     }
 
@@ -247,8 +240,9 @@ SDL_PromptAssertion(const SDL_assert_data *data, void *userdata)
     } else {
 #if defined(__EMSCRIPTEN__)
         /* This is nasty, but we can't block on a custom UI. */
-        for ( ; ; ) {
+        for (;;) {
             SDL_bool okay = SDL_TRUE;
+            /* *INDENT-OFF* */ /* clang-format off */
             char *buf = (char *) EM_ASM_INT({
                 var str =
                     UTF8ToString($0) + '\n\n' +
@@ -259,12 +253,14 @@ SDL_PromptAssertion(const SDL_assert_data *data, void *userdata)
                 }
                 return allocate(intArrayFromString(reply), 'i8', ALLOC_NORMAL);
             }, message);
+            /* *INDENT-ON* */ /* clang-format on */
 
             if (SDL_strcmp(buf, "a") == 0) {
                 state = SDL_ASSERTION_ABORT;
-            /* (currently) no break functionality on Emscripten
+#if 0 /* (currently) no break functionality on Emscripten */
             } else if (SDL_strcmp(buf, "b") == 0) {
-                state = SDL_ASSERTION_BREAK; */
+                state = SDL_ASSERTION_BREAK;
+#endif
             } else if (SDL_strcmp(buf, "r") == 0) {
                 state = SDL_ASSERTION_RETRY;
             } else if (SDL_strcmp(buf, "i") == 0) {
@@ -282,11 +278,11 @@ SDL_PromptAssertion(const SDL_assert_data *data, void *userdata)
         }
 #elif defined(HAVE_STDIO_H)
         /* this is a little hacky. */
-        for ( ; ; ) {
+        for (;;) {
             char buf[32];
             fprintf(stderr, "Abort/Break/Retry/Ignore/AlwaysIgnore? [abriA] : ");
             fflush(stderr);
-            if (fgets(buf, sizeof (buf), stdin) == NULL) {
+            if (fgets(buf, sizeof(buf), stdin) == NULL) {
                 break;
             }
 
@@ -322,7 +318,6 @@ SDL_PromptAssertion(const SDL_assert_data *data, void *userdata)
     return state;
 }
 
-
 SDL_assert_state
 SDL_ReportAssertion(SDL_assert_data *data, const char *func, const char *file,
                     int line)
@@ -337,13 +332,13 @@ SDL_ReportAssertion(SDL_assert_data *data, const char *func, const char *file,
         assertion_mutex = SDL_CreateMutex();
         if (assertion_mutex == NULL) {
             SDL_AtomicUnlock(&spinlock);
-            return SDL_ASSERTION_IGNORE;   /* oh well, I guess. */
+            return SDL_ASSERTION_IGNORE; /* oh well, I guess. */
         }
     }
     SDL_AtomicUnlock(&spinlock);
 
     if (SDL_LockMutex(assertion_mutex) < 0) {
-        return SDL_ASSERTION_IGNORE;   /* oh well, I guess. */
+        return SDL_ASSERTION_IGNORE; /* oh well, I guess. */
     }
 #endif
 
@@ -357,13 +352,14 @@ SDL_ReportAssertion(SDL_assert_data *data, const char *func, const char *file,
     SDL_AddAssertionToReport(data);
 
     assertion_running++;
-    if (assertion_running > 1) {   /* assert during assert! Abort. */
+    if (assertion_running > 1) { /* assert during assert! Abort. */
         if (assertion_running == 2) {
             SDL_AbortAssertion();
-        } else if (assertion_running == 3) {  /* Abort asserted! */
+        } else if (assertion_running == 3) { /* Abort asserted! */
             SDL_ExitProcess(42);
         } else {
-            while (1) { /* do nothing but spin; what else can you do?! */ }
+            while (1) { /* do nothing but spin; what else can you do?! */
+            }
         }
     }
 
@@ -371,21 +367,20 @@ SDL_ReportAssertion(SDL_assert_data *data, const char *func, const char *file,
         state = assertion_handler(data, assertion_userdata);
     }
 
-    switch (state)
-    {
-        case SDL_ASSERTION_ALWAYS_IGNORE:
-            state = SDL_ASSERTION_IGNORE;
-            data->always_ignore = 1;
-            break;
+    switch (state) {
+    case SDL_ASSERTION_ALWAYS_IGNORE:
+        state = SDL_ASSERTION_IGNORE;
+        data->always_ignore = 1;
+        break;
 
-        case SDL_ASSERTION_IGNORE:
-        case SDL_ASSERTION_RETRY:
-        case SDL_ASSERTION_BREAK:
-            break;  /* macro handles these. */
+    case SDL_ASSERTION_IGNORE:
+    case SDL_ASSERTION_RETRY:
+    case SDL_ASSERTION_BREAK:
+        break; /* macro handles these. */
 
-        case SDL_ASSERTION_ABORT:
-            SDL_AbortAssertion();
-            /*break;  ...shouldn't return, but oh well. */
+    case SDL_ASSERTION_ABORT:
+        SDL_AbortAssertion();
+        /*break;  ...shouldn't return, but oh well. */
     }
 
     assertion_running--;
@@ -397,7 +392,6 @@ SDL_ReportAssertion(SDL_assert_data *data, const char *func, const char *file,
     return state;
 }
 
-
 void SDL_AssertionsQuit(void)
 {
 #if SDL_ASSERT_LEVEL > 0
@@ -432,7 +426,7 @@ void SDL_ResetAssertionReport(void)
     SDL_assert_data *next = NULL;
     SDL_assert_data *item;
     for (item = triggered_assertions; item != NULL; item = next) {
-        next = (SDL_assert_data *) item->next;
+        next = (SDL_assert_data *)item->next;
         item->always_ignore = SDL_FALSE;
         item->trigger_count = 0;
         item->next = NULL;

src/SDL_dataqueue.c

@@ -24,10 +24,10 @@
 
 typedef struct SDL_DataQueuePacket
 {
-    size_t datalen;  /* bytes currently in use in this packet. */
-    size_t startpos;  /* bytes currently consumed in this packet. */
-    struct SDL_DataQueuePacket *next;  /* next item in linked list. */
-    Uint8 data[SDL_VARIABLE_LENGTH_ARRAY];  /* packet data */
+    size_t datalen;                        /* bytes currently in use in this packet. */
+    size_t startpos;                       /* bytes currently consumed in this packet. */
+    struct SDL_DataQueuePacket *next;      /* next item in linked list. */
+    Uint8 data[SDL_VARIABLE_LENGTH_ARRAY]; /* packet data */
 } SDL_DataQueuePacket;
 
 struct SDL_DataQueue
@@ -35,12 +35,11 @@ struct SDL_DataQueue
     SDL_DataQueuePacket *head; /* device fed from here. */
     SDL_DataQueuePacket *tail; /* queue fills to here. */
     SDL_DataQueuePacket *pool; /* these are unused packets. */
-    size_t packet_size;   /* size of new packets */
-    size_t queued_bytes;  /* number of bytes of data in the queue. */
+    size_t packet_size;        /* size of new packets */
+    size_t queued_bytes;       /* number of bytes of data in the queue. */
 };
 
-static void
-SDL_FreeDataQueueList(SDL_DataQueuePacket *packet)
+static void SDL_FreeDataQueueList(SDL_DataQueuePacket *packet)
 {
     while (packet) {
         SDL_DataQueuePacket *next = packet->next;
@@ -49,13 +48,12 @@ SDL_FreeDataQueueList(SDL_DataQueuePacket *packet)
     }
 }
 
-
 /* this all expects that you managed thread safety elsewhere. */
 
 SDL_DataQueue *
 SDL_NewDataQueue(const size_t _packetlen, const size_t initialslack)
 {
-    SDL_DataQueue *queue = (SDL_DataQueue *) SDL_malloc(sizeof (SDL_DataQueue));
+    SDL_DataQueue *queue = (SDL_DataQueue *)SDL_malloc(sizeof(SDL_DataQueue));
 
     if (queue == NULL) {
         SDL_OutOfMemory();
@@ -69,7 +67,7 @@ SDL_NewDataQueue(const size_t _packetlen, const size_t initialslack)
         queue->packet_size = packetlen;
 
         for (i = 0; i < wantpackets; i++) {
-            SDL_DataQueuePacket *packet = (SDL_DataQueuePacket *) SDL_malloc(sizeof (SDL_DataQueuePacket) + packetlen);
+            SDL_DataQueuePacket *packet = (SDL_DataQueuePacket *)SDL_malloc(sizeof(SDL_DataQueuePacket) + packetlen);
             if (packet) { /* don't care if this fails, we'll deal later. */
                 packet->datalen = 0;
                 packet->startpos = 0;
@@ -82,8 +80,7 @@ SDL_NewDataQueue(const size_t _packetlen, const size_t initialslack)
     return queue;
 }
 
-void
-SDL_FreeDataQueue(SDL_DataQueue *queue)
+void SDL_FreeDataQueue(SDL_DataQueue *queue)
 {
     if (queue) {
         SDL_FreeDataQueueList(queue->head);
@@ -92,11 +89,10 @@ SDL_FreeDataQueue(SDL_DataQueue *queue)
     }
 }
 
-void
-SDL_ClearDataQueue(SDL_DataQueue *queue, const size_t slack)
+void SDL_ClearDataQueue(SDL_DataQueue *queue, const size_t slack)
 {
     const size_t packet_size = queue ? queue->packet_size : 1;
-    const size_t slackpackets = (slack + (packet_size-1)) / packet_size;
+    const size_t slackpackets = (slack + (packet_size - 1)) / packet_size;
     SDL_DataQueuePacket *packet;
     SDL_DataQueuePacket *prev = NULL;
     size_t i;
@@ -132,11 +128,10 @@ SDL_ClearDataQueue(SDL_DataQueue *queue, const size_t slack)
         queue->pool = NULL;
     }
 
-    SDL_FreeDataQueueList(packet);  /* free extra packets */
+    SDL_FreeDataQueueList(packet); /* free extra packets */
 }
 
-static SDL_DataQueuePacket *
-AllocateDataQueuePacket(SDL_DataQueue *queue)
+static SDL_DataQueuePacket *AllocateDataQueuePacket(SDL_DataQueue *queue)
 {
     SDL_DataQueuePacket *packet;
 
@@ -148,7 +143,7 @@ AllocateDataQueuePacket(SDL_DataQueue *queue)
         queue->pool = packet->next;
     } else {
         /* Have to allocate a new one! */
-        packet = (SDL_DataQueuePacket *) SDL_malloc(sizeof (SDL_DataQueuePacket) + queue->packet_size);
+        packet = (SDL_DataQueuePacket *)SDL_malloc(sizeof(SDL_DataQueuePacket) + queue->packet_size);
         if (packet == NULL) {
             return NULL;
         }
@@ -157,7 +152,7 @@ AllocateDataQueuePacket(SDL_DataQueue *queue)
     packet->datalen = 0;
     packet->startpos = 0;
     packet->next = NULL;
-                
+
     SDL_assert((queue->head != NULL) == (queue->queued_bytes != 0));
     if (queue->tail == NULL) {
         queue->head = packet;
@@ -168,12 +163,10 @@ AllocateDataQueuePacket(SDL_DataQueue *queue)
     return packet;
 }
 
-
-int
-SDL_WriteToDataQueue(SDL_DataQueue *queue, const void *_data, const size_t _len)
+int SDL_WriteToDataQueue(SDL_DataQueue *queue, const void *_data, const size_t _len)
 {
     size_t len = _len;
-    const Uint8 *data = (const Uint8 *) _data;
+    const Uint8 *data = (const Uint8 *)_data;
     const size_t packet_size = queue ? queue->packet_size : 0;
     SDL_DataQueuePacket *orighead;
     SDL_DataQueuePacket *origtail;
@@ -197,9 +190,9 @@ SDL_WriteToDataQueue(SDL_DataQueue *queue, const void *_data, const size_t _len)
             if (packet == NULL) {
                 /* uhoh, reset so we've queued nothing new, free what we can. */
                 if (origtail == NULL) {
-                    packet = queue->head;  /* whole queue. */
+                    packet = queue->head; /* whole queue. */
                 } else {
-                    packet = origtail->next;  /* what we added to existing queue. */
+                    packet = origtail->next; /* what we added to existing queue. */
                     origtail->next = NULL;
                     origtail->datalen = origlen;
                 }
@@ -207,7 +200,7 @@ SDL_WriteToDataQueue(SDL_DataQueue *queue, const void *_data, const size_t _len)
                 queue->tail = origtail;
                 queue->pool = NULL;
 
-                SDL_FreeDataQueueList(packet);  /* give back what we can. */
+                SDL_FreeDataQueueList(packet); /* give back what we can. */
                 return SDL_OutOfMemory();
             }
         }
@@ -227,7 +220,7 @@ size_t
 SDL_PeekIntoDataQueue(SDL_DataQueue *queue, void *_buf, const size_t _len)
 {
     size_t len = _len;
-    Uint8 *buf = (Uint8 *) _buf;
+    Uint8 *buf = (Uint8 *)_buf;
     Uint8 *ptr = buf;
     SDL_DataQueuePacket *packet;
 
@@ -245,14 +238,14 @@ SDL_PeekIntoDataQueue(SDL_DataQueue *queue, void *_buf, const size_t _len)
         len -= cpy;
     }
 
-    return (size_t) (ptr - buf);
+    return (size_t)(ptr - buf);
 }
 
 size_t
 SDL_ReadFromDataQueue(SDL_DataQueue *queue, void *_buf, const size_t _len)
 {
     size_t len = _len;
-    Uint8 *buf = (Uint8 *) _buf;
+    Uint8 *buf = (Uint8 *)_buf;
     Uint8 *ptr = buf;
     SDL_DataQueuePacket *packet;
 
@@ -271,7 +264,7 @@ SDL_ReadFromDataQueue(SDL_DataQueue *queue, void *_buf, const size_t _len)
         queue->queued_bytes -= cpy;
         len -= cpy;
 
-        if (packet->startpos == packet->datalen) {  /* packet is done, put it in the pool. */
+        if (packet->startpos == packet->datalen) { /* packet is done, put it in the pool. */
             queue->head = packet->next;
             SDL_assert((packet->next != NULL) || (packet == queue->tail));
             packet->next = queue->pool;
@@ -282,10 +275,10 @@ SDL_ReadFromDataQueue(SDL_DataQueue *queue, void *_buf, const size_t _len)
     SDL_assert((queue->head != NULL) == (queue->queued_bytes != 0));
 
     if (queue->head == NULL) {
-        queue->tail = NULL;  /* in case we drained the queue entirely. */
+        queue->tail = NULL; /* in case we drained the queue entirely. */
     }
 
-    return (size_t) (ptr - buf);
+    return (size_t)(ptr - buf);
 }
 
 size_t
@@ -313,7 +306,7 @@ SDL_ReserveSpaceInDataQueue(SDL_DataQueue *queue, const size_t len)
     packet = queue->head;
     if (packet) {
         const size_t avail = queue->packet_size - packet->datalen;
-        if (len <= avail) {  /* we can use the space at end of this packet. */
+        if (len <= avail) { /* we can use the space at end of this packet. */
             void *retval = packet->data + packet->datalen;
             packet->datalen += len;
             queue->queued_bytes += len;
@@ -334,4 +327,3 @@ SDL_ReserveSpaceInDataQueue(SDL_DataQueue *queue, const size_t len)
 }
 
 /* vi: set ts=4 sw=4 expandtab: */
-

src/SDL_dataqueue.h

@@ -52,4 +52,3 @@ void *SDL_ReserveSpaceInDataQueue(SDL_DataQueue *queue, const size_t len);
 #endif /* SDL_dataqueue_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
-

src/SDL_error.c

@@ -24,8 +24,7 @@
 
 #include "SDL_error_c.h"
 
-int
-SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
+int SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
 {
     /* Ignore call if invalid format pointer was passed */
     if (fmt != NULL) {
@@ -33,7 +32,7 @@ SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
         int result;
         SDL_error *error = SDL_GetErrBuf();
 
-        error->error = 1;  /* mark error as valid */
+        error->error = 1; /* mark error as valid */
 
         va_start(ap, fmt);
         result = SDL_vsnprintf(error->str, error->len, fmt, ap);
@@ -51,7 +50,6 @@ SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
             }
         }
 
-
         if (SDL_LogGetPriority(SDL_LOG_CATEGORY_ERROR) <= SDL_LOG_PRIORITY_DEBUG) {
             /* If we are in debug mode, print out the error message */
             SDL_LogDebug(SDL_LOG_CATEGORY_ERROR, "%s", error->str);
@@ -69,15 +67,13 @@ SDL_GetError(void)
     return error->error ? error->str : "";
 }
 
-void
-SDL_ClearError(void)
+void SDL_ClearError(void)
 {
     SDL_GetErrBuf()->error = 0;
 }
 
 /* Very common errors go here */
-int
-SDL_Error(SDL_errorcode code)
+int SDL_Error(SDL_errorcode code)
 {
     switch (code) {
     case SDL_ENOMEM:
@@ -96,8 +92,7 @@ SDL_Error(SDL_errorcode code)
 }
 
 #ifdef TEST_ERROR
-int
-main(int argc, char *argv[])
+int main(int argc, char *argv[])
 {
     char buffer[BUFSIZ + 1];
 
@@ -112,7 +107,6 @@ main(int argc, char *argv[])
 }
 #endif
 
-
 char *
 SDL_GetErrorMsg(char *errstr, int maxlen)
 {

src/SDL_guid.c

@@ -20,8 +20,6 @@
 */
 #include "SDL_internal.h"
 
-
-
 /* convert the guid to a printable string */
 void SDL_GUIDToString(SDL_GUID guid, char *pszGUID, int cbGUID)
 {
@@ -32,7 +30,7 @@ void SDL_GUIDToString(SDL_GUID guid, char *pszGUID, int cbGUID)
         return;
     }
 
-    for (i = 0; i < sizeof(guid.data) && i < (cbGUID-1)/2; i++) {
+    for (i = 0; i < sizeof(guid.data) && i < (cbGUID - 1) / 2; i++) {
         /* each input byte writes 2 ascii chars, and might write a null byte. */
         /* If we don't have room for next input byte, stop */
         unsigned char c = guid.data[i];
@@ -71,7 +69,7 @@ static unsigned char nibble(unsigned char c)
 SDL_GUID SDL_GUIDFromString(const char *pchGUID)
 {
     SDL_GUID guid;
-    int maxoutputbytes= sizeof(guid);
+    int maxoutputbytes = sizeof(guid);
     size_t len = SDL_strlen(pchGUID);
     Uint8 *p;
     size_t i;
@@ -82,8 +80,8 @@ SDL_GUID SDL_GUIDFromString(const char *pchGUID)
     SDL_memset(&guid, 0x00, sizeof(guid));
 
     p = (Uint8 *)&guid;
-    for (i = 0; (i < len) && ((p - (Uint8 *)&guid) < maxoutputbytes); i+=2, p++) {
-        *p = (nibble((unsigned char)pchGUID[i]) << 4) | nibble((unsigned char)pchGUID[i+1]);
+    for (i = 0; (i < len) && ((p - (Uint8 *)&guid) < maxoutputbytes); i += 2, p++) {
+        *p = (nibble((unsigned char)pchGUID[i]) << 4) | nibble((unsigned char)pchGUID[i + 1]);
     }
 
     return guid;

src/SDL_hints.c

@@ -22,17 +22,18 @@
 
 #include "SDL_hints_c.h"
 
-
 /* Assuming there aren't many hints set and they aren't being queried in
    critical performance paths, we'll just use linked lists here.
  */
-typedef struct SDL_HintWatch {
+typedef struct SDL_HintWatch
+{
     SDL_HintCallback callback;
     void *userdata;
     struct SDL_HintWatch *next;
 } SDL_HintWatch;
 
-typedef struct SDL_Hint {
+typedef struct SDL_Hint
+{
     char *name;
     char *value;
     SDL_HintPriority priority;
@@ -66,7 +67,7 @@ SDL_SetHintWithPriority(const char *name, const char *value,
             }
             if (hint->value != value &&
                 (value == NULL || !hint->value || SDL_strcmp(hint->value, value) != 0)) {
-                for (entry = hint->callbacks; entry; ) {
+                for (entry = hint->callbacks; entry;) {
                     /* Save the next entry in case this one is deleted */
                     SDL_HintWatch *next = entry->next;
                     entry->callback(entry->userdata, name, hint->value, value);
@@ -111,7 +112,7 @@ SDL_ResetHint(const char *name)
             if ((env == NULL && hint->value != NULL) ||
                 (env != NULL && hint->value == NULL) ||
                 (env != NULL && SDL_strcmp(env, hint->value) != 0)) {
-                for (entry = hint->callbacks; entry; ) {
+                for (entry = hint->callbacks; entry;) {
                     /* Save the next entry in case this one is deleted */
                     SDL_HintWatch *next = entry->next;
                     entry->callback(entry->userdata, name, hint->value, env);
@@ -127,8 +128,7 @@ SDL_ResetHint(const char *name)
     return SDL_FALSE;
 }
 
-void
-SDL_ResetHints(void)
+void SDL_ResetHints(void)
 {
     const char *env;
     SDL_Hint *hint;
@@ -139,7 +139,7 @@ SDL_ResetHints(void)
         if ((env == NULL && hint->value != NULL) ||
             (env != NULL && hint->value == NULL) ||
             (env != NULL && SDL_strcmp(env, hint->value) != 0)) {
-            for (entry = hint->callbacks; entry; ) {
+            for (entry = hint->callbacks; entry;) {
                 /* Save the next entry in case this one is deleted */
                 SDL_HintWatch *next = entry->next;
                 entry->callback(entry->userdata, hint->name, hint->value, env);
@@ -195,8 +195,7 @@ SDL_GetHintBoolean(const char *name, SDL_bool default_value)
     return SDL_GetStringBoolean(hint, default_value);
 }
 
-void
-SDL_AddHintCallback(const char *name, SDL_HintCallback callback, void *userdata)
+void SDL_AddHintCallback(const char *name, SDL_HintCallback callback, void *userdata)
 {
     SDL_Hint *hint;
     SDL_HintWatch *entry;
@@ -257,8 +256,7 @@ SDL_AddHintCallback(const char *name, SDL_HintCallback callback, void *userdata)
     callback(userdata, name, value, value);
 }
 
-void
-SDL_DelHintCallback(const char *name, SDL_HintCallback callback, void *userdata)
+void SDL_DelHintCallback(const char *name, SDL_HintCallback callback, void *userdata)
 {
     SDL_Hint *hint;
     SDL_HintWatch *entry, *prev;
@@ -294,7 +292,7 @@ void SDL_ClearHints(void)
 
         SDL_free(hint->name);
         SDL_free(hint->value);
-        for (entry = hint->callbacks; entry; ) {
+        for (entry = hint->callbacks; entry;) {
             SDL_HintWatch *freeable = entry;
             entry = entry->next;
             SDL_free(freeable);

src/SDL_internal.h

@@ -40,9 +40,14 @@
 #define SDL_VARIABLE_LENGTH_ARRAY
 #endif
 
-#define SDL_MAX_SMALL_ALLOC_STACKSIZE 128
-#define SDL_small_alloc(type, count, pisstack) ( (*(pisstack) = ((sizeof(type)*(count)) < SDL_MAX_SMALL_ALLOC_STACKSIZE)), (*(pisstack) ? SDL_stack_alloc(type, count) : (type*)SDL_malloc(sizeof(type)*(count))) )
-#define SDL_small_free(ptr, isstack) if ((isstack)) { SDL_stack_free(ptr); } else { SDL_free(ptr); }
+#define SDL_MAX_SMALL_ALLOC_STACKSIZE          128
+#define SDL_small_alloc(type, count, pisstack) ((*(pisstack) = ((sizeof(type) * (count)) < SDL_MAX_SMALL_ALLOC_STACKSIZE)), (*(pisstack) ? SDL_stack_alloc(type, count) : (type *)SDL_malloc(sizeof(type) * (count))))
+#define SDL_small_free(ptr, isstack) \
+    if ((isstack)) {                 \
+        SDL_stack_free(ptr);         \
+    } else {                         \
+        SDL_free(ptr);               \
+    }
 
 #include "dynapi/SDL_dynapi.h"
 
@@ -68,97 +73,96 @@
 #include <stdio.h>
 #endif
 #if defined(HAVE_STDLIB_H)
-# include <stdlib.h>
+#include <stdlib.h>
 #elif defined(HAVE_MALLOC_H)
-# include <malloc.h>
+#include <malloc.h>
 #endif
 #if defined(HAVE_STDDEF_H)
-# include <stddef.h>
+#include <stddef.h>
 #endif
 #if defined(HAVE_STDARG_H)
-# include <stdarg.h>
+#include <stdarg.h>
 #endif
 #ifdef HAVE_STRING_H
-# ifdef HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
+#ifdef HAVE_MEMORY_H
+#include <memory.h>
+#endif
+#include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
-# include <strings.h>
+#include <strings.h>
 #endif
 #ifdef HAVE_WCHAR_H
-# include <wchar.h>
+#include <wchar.h>
 #endif
 #if defined(HAVE_INTTYPES_H)
-# include <inttypes.h>
+#include <inttypes.h>
 #elif defined(HAVE_STDINT_H)
-# include <stdint.h>
+#include <stdint.h>
 #endif
 #ifdef HAVE_CTYPE_H
-# include <ctype.h>
+#include <ctype.h>
 #endif
 #ifdef HAVE_MATH_H
-# include <math.h>
+#include <math.h>
 #endif
 #ifdef HAVE_FLOAT_H
-# include <float.h>
+#include <float.h>
 #endif
 
-
 /* If you run into a warning that O_CLOEXEC is redefined, update the SDL configuration header for your platform to add HAVE_O_CLOEXEC */
 #ifndef HAVE_O_CLOEXEC
-#define O_CLOEXEC                       0
+#define O_CLOEXEC 0
 #endif
 
 /* A few #defines to reduce SDL footprint.
    Only effective when library is statically linked.
    You have to manually edit this file. */
 #ifndef SDL_LEAN_AND_MEAN
-#define SDL_LEAN_AND_MEAN               0
+#define SDL_LEAN_AND_MEAN 0
 #endif
 
 /* Optimized functions from 'SDL_blit_0.c'
    - blit with source BitsPerPixel < 8, palette */
 #ifndef SDL_HAVE_BLIT_0
-#define SDL_HAVE_BLIT_0                 !SDL_LEAN_AND_MEAN
+#define SDL_HAVE_BLIT_0 !SDL_LEAN_AND_MEAN
 #endif
 
 /* Optimized functions from 'SDL_blit_1.c'
    - blit with source BytesPerPixel == 1, palette */
 #ifndef SDL_HAVE_BLIT_1
-#define SDL_HAVE_BLIT_1                 !SDL_LEAN_AND_MEAN
+#define SDL_HAVE_BLIT_1 !SDL_LEAN_AND_MEAN
 #endif
 
 /* Optimized functions from 'SDL_blit_A.c'
    - blit with 'SDL_BLENDMODE_BLEND' blending mode */
 #ifndef SDL_HAVE_BLIT_A
-#define SDL_HAVE_BLIT_A                 !SDL_LEAN_AND_MEAN
+#define SDL_HAVE_BLIT_A !SDL_LEAN_AND_MEAN
 #endif
 
 /* Optimized functions from 'SDL_blit_N.c'
    - blit with COLORKEY mode, or nothing */
 #ifndef SDL_HAVE_BLIT_N
-#define SDL_HAVE_BLIT_N                 !SDL_LEAN_AND_MEAN
+#define SDL_HAVE_BLIT_N !SDL_LEAN_AND_MEAN
 #endif
 
 /* Optimized functions from 'SDL_blit_N.c'
    - RGB565 conversion with Lookup tables */
 #ifndef SDL_HAVE_BLIT_N_RGB565
-#define SDL_HAVE_BLIT_N_RGB565          !SDL_LEAN_AND_MEAN
+#define SDL_HAVE_BLIT_N_RGB565 !SDL_LEAN_AND_MEAN
 #endif
 
 /* Optimized functions from 'SDL_blit_AUTO.c'
    - blit with modulate color, modulate alpha, any blending mode
    - scaling or not */
 #ifndef SDL_HAVE_BLIT_AUTO
-#define SDL_HAVE_BLIT_AUTO              !SDL_LEAN_AND_MEAN
+#define SDL_HAVE_BLIT_AUTO !SDL_LEAN_AND_MEAN
 #endif
 
 /* Run-Length-Encoding
    - SDL_SetColorKey() called with SDL_RLEACCEL flag */
 #ifndef SDL_HAVE_RLE
-#define SDL_HAVE_RLE                    !SDL_LEAN_AND_MEAN
+#define SDL_HAVE_RLE !SDL_LEAN_AND_MEAN
 #endif
 
 /* Software SDL_Renderer
@@ -166,14 +170,14 @@
    - *not* general blitting functions
    - {blend,draw}{fillrect,line,point} internal functions */
 #ifndef SDL_VIDEO_RENDER_SW
-#define SDL_VIDEO_RENDER_SW             !SDL_LEAN_AND_MEAN
+#define SDL_VIDEO_RENDER_SW !SDL_LEAN_AND_MEAN
 #endif
 
 /* YUV formats
    - handling of YUV surfaces
    - blitting and conversion functions */
 #ifndef SDL_HAVE_YUV
-#define SDL_HAVE_YUV                    !SDL_LEAN_AND_MEAN
+#define SDL_HAVE_YUV !SDL_LEAN_AND_MEAN
 #endif
 
 #include <SDL3/SDL.h>

src/SDL_list.c

@@ -23,10 +23,9 @@
 #include "./SDL_list.h"
 
 /* Push */
-int
-SDL_ListAdd(SDL_ListNode **head, void *ent)
+int SDL_ListAdd(SDL_ListNode **head, void *ent)
 {
-    SDL_ListNode *node = SDL_malloc(sizeof (*node));
+    SDL_ListNode *node = SDL_malloc(sizeof(*node));
 
     if (node == NULL) {
         return SDL_OutOfMemory();
@@ -39,8 +38,7 @@ SDL_ListAdd(SDL_ListNode **head, void *ent)
 }
 
 /* Pop from end as a FIFO (if add with SDL_ListAdd) */
-void
-SDL_ListPop(SDL_ListNode **head, void **ent)
+void SDL_ListPop(SDL_ListNode **head, void **ent)
 {
     SDL_ListNode **ptr = head;
 
@@ -54,15 +52,14 @@ SDL_ListPop(SDL_ListNode **head, void **ent)
     }
 
     if (ent) {
-       *ent = (*ptr)->entry;
+        *ent = (*ptr)->entry;
     }
 
     SDL_free(*ptr);
     *ptr = NULL;
 }
 
-void
-SDL_ListRemove(SDL_ListNode **head, void *ent)
+void SDL_ListRemove(SDL_ListNode **head, void *ent)
 {
     SDL_ListNode **ptr = head;
 
@@ -77,8 +74,7 @@ SDL_ListRemove(SDL_ListNode **head, void *ent)
     }
 }
 
-void
-SDL_ListClear(SDL_ListNode **head)
+void SDL_ListClear(SDL_ListNode **head)
 {
     SDL_ListNode *l = *head;
     *head = NULL;

src/SDL_list.h

@@ -28,7 +28,6 @@ typedef struct SDL_ListNode
     struct SDL_ListNode *next;
 } SDL_ListNode;
 
-
 int SDL_ListAdd(SDL_ListNode **head, void *ent);
 void SDL_ListPop(SDL_ListNode **head, void **ent);
 void SDL_ListRemove(SDL_ListNode **head, void *ent);

src/SDL_log.c

@@ -38,14 +38,13 @@
 
 #include "stdlib/SDL_vacopy.h"
 
-
 /* The size of the stack buffer to use for rendering log messages. */
 #define SDL_MAX_LOG_MESSAGE_STACK 256
 
-#define DEFAULT_PRIORITY                SDL_LOG_PRIORITY_CRITICAL
-#define DEFAULT_ASSERT_PRIORITY         SDL_LOG_PRIORITY_WARN
-#define DEFAULT_APPLICATION_PRIORITY    SDL_LOG_PRIORITY_INFO
-#define DEFAULT_TEST_PRIORITY           SDL_LOG_PRIORITY_VERBOSE
+#define DEFAULT_PRIORITY             SDL_LOG_PRIORITY_CRITICAL
+#define DEFAULT_ASSERT_PRIORITY      SDL_LOG_PRIORITY_WARN
+#define DEFAULT_APPLICATION_PRIORITY SDL_LOG_PRIORITY_INFO
+#define DEFAULT_TEST_PRIORITY        SDL_LOG_PRIORITY_VERBOSE
 
 typedef struct SDL_LogLevel
 {
@@ -102,8 +101,7 @@ static int SDL_android_priority[SDL_NUM_LOG_PRIORITIES] = {
 };
 #endif /* __ANDROID__ */
 
-void
-SDL_LogInit(void)
+void SDL_LogInit(void)
 {
     if (log_function_mutex == NULL) {
         /* if this fails we'll try to continue without it. */
@@ -111,8 +109,7 @@ SDL_LogInit(void)
     }
 }
 
-void
-SDL_LogQuit(void)
+void SDL_LogQuit(void)
 {
     SDL_LogResetPriorities();
     if (log_function_mutex) {
@@ -121,8 +118,7 @@ SDL_LogQuit(void)
     }
 }
 
-void
-SDL_LogSetAllPriority(SDL_LogPriority priority)
+void SDL_LogSetAllPriority(SDL_LogPriority priority)
 {
     SDL_LogLevel *entry;
 
@@ -134,8 +130,7 @@ SDL_LogSetAllPriority(SDL_LogPriority priority)
     SDL_application_priority = priority;
 }
 
-void
-SDL_LogSetPriority(int category, SDL_LogPriority priority)
+void SDL_LogSetPriority(int category, SDL_LogPriority priority)
 {
     SDL_LogLevel *entry;
 
@@ -178,8 +173,7 @@ SDL_LogGetPriority(int category)
     }
 }
 
-void
-SDL_LogResetPriorities(void)
+void SDL_LogResetPriorities(void)
 {
     SDL_LogLevel *entry;
 
@@ -195,8 +189,7 @@ SDL_LogResetPriorities(void)
     SDL_test_priority = DEFAULT_TEST_PRIORITY;
 }
 
-void
-SDL_Log(SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
+void SDL_Log(SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
 {
     va_list ap;
 
@@ -205,8 +198,7 @@ SDL_Log(SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
     va_end(ap);
 }
 
-void
-SDL_LogVerbose(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
+void SDL_LogVerbose(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
 {
     va_list ap;
 
@@ -215,8 +207,7 @@ SDL_LogVerbose(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
     va_end(ap);
 }
 
-void
-SDL_LogDebug(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
+void SDL_LogDebug(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
 {
     va_list ap;
 
@@ -225,8 +216,7 @@ SDL_LogDebug(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
     va_end(ap);
 }
 
-void
-SDL_LogInfo(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
+void SDL_LogInfo(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
 {
     va_list ap;
 
@@ -235,8 +225,7 @@ SDL_LogInfo(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
     va_end(ap);
 }
 
-void
-SDL_LogWarn(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
+void SDL_LogWarn(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
 {
     va_list ap;
 
@@ -245,8 +234,7 @@ SDL_LogWarn(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
     va_end(ap);
 }
 
-void
-SDL_LogError(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
+void SDL_LogError(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
 {
     va_list ap;
 
@@ -255,8 +243,7 @@ SDL_LogError(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
     va_end(ap);
 }
 
-void
-SDL_LogCritical(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
+void SDL_LogCritical(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
 {
     va_list ap;
 
@@ -265,8 +252,7 @@ SDL_LogCritical(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
     va_end(ap);
 }
 
-void
-SDL_LogMessage(int category, SDL_LogPriority priority, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
+void SDL_LogMessage(int category, SDL_LogPriority priority, SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
 {
     va_list ap;
 
@@ -276,8 +262,7 @@ SDL_LogMessage(int category, SDL_LogPriority priority, SDL_PRINTF_FORMAT_STRING
 }
 
 #ifdef __ANDROID__
-static const char *
-GetCategoryPrefix(int category)
+static const char *GetCategoryPrefix(int category)
 {
     if (category < SDL_LOG_CATEGORY_RESERVED1) {
         return SDL_category_prefixes[category];
@@ -289,8 +274,7 @@ GetCategoryPrefix(int category)
 }
 #endif /* __ANDROID__ */
 
-void
-SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list ap)
+void SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list ap)
 {
     char *message = NULL;
     char stack_buf[SDL_MAX_LOG_MESSAGE_STACK];
@@ -342,9 +326,9 @@ SDL_LogMessageV(int category, SDL_LogPriority priority, const char *fmt, va_list
     }
 
     /* Chop off final endline. */
-    if ((len > 0) && (message[len-1] == '\n')) {
+    if ((len > 0) && (message[len - 1] == '\n')) {
         message[--len] = '\0';
-        if ((len > 0) && (message[len-1] == '\r')) {  /* catch "\r\n", too. */
+        if ((len > 0) && (message[len - 1] == '\r')) { /* catch "\r\n", too. */
             message[--len] = '\0';
         }
     }
@@ -373,9 +357,8 @@ static int consoleAttached = 0;
 static HANDLE stderrHandle = NULL;
 #endif
 
-static void SDLCALL
-SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
-              const char *message)
+static void SDLCALL SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
+                                  const char *message)
 {
 #if defined(__WIN32__) || defined(__WINRT__) || defined(__GDK__)
     /* Way too many allocations here, urgh */
@@ -396,34 +379,34 @@ SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
         if (consoleAttached == 0) {
             attachResult = AttachConsole(ATTACH_PARENT_PROCESS);
             if (!attachResult) {
-                    attachError = GetLastError();
-                    if (attachError == ERROR_INVALID_HANDLE) {
-                        /* This is expected when running from Visual Studio */
-                        /*OutputDebugString(TEXT("Parent process has no console\r\n"));*/
-                        consoleAttached = -1;
-                    } else if (attachError == ERROR_GEN_FAILURE) {
-                         OutputDebugString(TEXT("Could not attach to console of parent process\r\n"));
-                         consoleAttached = -1;
-                    } else if (attachError == ERROR_ACCESS_DENIED) {  
-                         /* Already attached */
-                        consoleAttached = 1;
-                    } else {
-                        OutputDebugString(TEXT("Error attaching console\r\n"));
-                        consoleAttached = -1;
-                    }
-                } else {
-                    /* Newly attached */
+                attachError = GetLastError();
+                if (attachError == ERROR_INVALID_HANDLE) {
+                    /* This is expected when running from Visual Studio */
+                    /*OutputDebugString(TEXT("Parent process has no console\r\n"));*/
+                    consoleAttached = -1;
+                } else if (attachError == ERROR_GEN_FAILURE) {
+                    OutputDebugString(TEXT("Could not attach to console of parent process\r\n"));
+                    consoleAttached = -1;
+                } else if (attachError == ERROR_ACCESS_DENIED) {
+                    /* Already attached */
                     consoleAttached = 1;
+                } else {
+                    OutputDebugString(TEXT("Error attaching console\r\n"));
+                    consoleAttached = -1;
                 }
+            } else {
+                /* Newly attached */
+                consoleAttached = 1;
+            }
 
-                if (consoleAttached == 1) {
-                        stderrHandle = GetStdHandle(STD_ERROR_HANDLE);
+            if (consoleAttached == 1) {
+                stderrHandle = GetStdHandle(STD_ERROR_HANDLE);
 
-                        if (GetConsoleMode(stderrHandle, &consoleMode) == 0) {
-                            /* WriteConsole fails if the output is redirected to a file. Must use WriteFile instead. */
-                            consoleAttached = 2;
-                        }
+                if (GetConsoleMode(stderrHandle, &consoleMode) == 0) {
+                    /* WriteConsole fails if the output is redirected to a file. Must use WriteFile instead. */
+                    consoleAttached = 2;
                 }
+            }
         }
 #endif /* !defined(HAVE_STDIO_H) && !defined(__WINRT__) && !defined(__GDK__) */
 
@@ -431,22 +414,22 @@ SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
         output = SDL_small_alloc(char, length, &isstack);
         SDL_snprintf(output, length, "%s: %s\r\n", SDL_priority_prefixes[priority], message);
         tstr = WIN_UTF8ToString(output);
-        
+
         /* Output to debugger */
         OutputDebugString(tstr);
-       
+
 #if !defined(HAVE_STDIO_H) && !defined(__WINRT__) && !defined(__GDK__)
         /* Screen output to stderr, if console was attached. */
         if (consoleAttached == 1) {
-                if (!WriteConsole(stderrHandle, tstr, (DWORD) SDL_tcslen(tstr), &charsWritten, NULL)) {
-                    OutputDebugString(TEXT("Error calling WriteConsole\r\n"));
-                    if (GetLastError() == ERROR_NOT_ENOUGH_MEMORY) {
-                        OutputDebugString(TEXT("Insufficient heap memory to write message\r\n"));
-                    }
+            if (!WriteConsole(stderrHandle, tstr, (DWORD)SDL_tcslen(tstr), &charsWritten, NULL)) {
+                OutputDebugString(TEXT("Error calling WriteConsole\r\n"));
+                if (GetLastError() == ERROR_NOT_ENOUGH_MEMORY) {
+                    OutputDebugString(TEXT("Insufficient heap memory to write message\r\n"));
                 }
+            }
 
         } else if (consoleAttached == 2) {
-            if (!WriteFile(stderrHandle, output, (DWORD) SDL_strlen(output), &charsWritten, NULL)) {
+            if (!WriteFile(stderrHandle, output, (DWORD)SDL_strlen(output), &charsWritten, NULL)) {
                 OutputDebugString(TEXT("Error calling WriteFile\r\n"));
             }
         }
@@ -464,7 +447,7 @@ SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
     }
 #elif defined(__APPLE__) && (defined(SDL_VIDEO_DRIVER_COCOA) || defined(SDL_VIDEO_DRIVER_UIKIT))
     /* Technically we don't need Cocoa/UIKit, but that's where this function is defined for now.
-    */
+     */
     extern void SDL_NSLog(const char *prefix, const char *text);
     {
         SDL_NSLog(SDL_priority_prefixes[priority], message);
@@ -472,17 +455,17 @@ SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
     }
 #elif defined(__PSP__) || defined(__PS2__)
     {
-        FILE*        pFile;
-        pFile = fopen ("SDL_Log.txt", "a");
+        FILE *pFile;
+        pFile = fopen("SDL_Log.txt", "a");
         fprintf(pFile, "%s: %s\n", SDL_priority_prefixes[priority], message);
-        fclose (pFile);
+        fclose(pFile);
     }
 #elif defined(__VITA__)
     {
-        FILE*        pFile;
-        pFile = fopen ("ux0:/data/SDL_Log.txt", "a");
+        FILE *pFile;
+        pFile = fopen("ux0:/data/SDL_Log.txt", "a");
         fprintf(pFile, "%s: %s\n", SDL_priority_prefixes[priority], message);
-        fclose (pFile);
+        fclose(pFile);
     }
 #elif defined(__3DS__)
     {
@@ -503,8 +486,7 @@ SDL_LogOutput(void *userdata, int category, SDL_LogPriority priority,
 #endif
 }
 
-void
-SDL_LogGetOutputFunction(SDL_LogOutputFunction *callback, void **userdata)
+void SDL_LogGetOutputFunction(SDL_LogOutputFunction *callback, void **userdata)
 {
     if (callback) {
         *callback = SDL_log_function;
@@ -514,8 +496,7 @@ SDL_LogGetOutputFunction(SDL_LogOutputFunction *callback, void **userdata)
     }
 }
 
-void
-SDL_LogSetOutputFunction(SDL_LogOutputFunction callback, void *userdata)
+void SDL_LogSetOutputFunction(SDL_LogOutputFunction callback, void *userdata)
 {
     SDL_log_function = callback;
     SDL_log_userdata = userdata;

src/atomic/SDL_atomic.c

@@ -20,13 +20,12 @@
 */
 #include "SDL_internal.h"
 
-
 #if defined(_MSC_VER) && (_MSC_VER >= 1500)
 #include <intrin.h>
 #define HAVE_MSC_ATOMICS 1
 #endif
 
-#if defined(__MACOS__)  /* !!! FIXME: should we favor gcc atomics? */
+#if defined(__MACOS__) /* !!! FIXME: should we favor gcc atomics? */
 #include <libkern/OSAtomic.h>
 #endif
 
@@ -36,19 +35,20 @@
 
 /* The __atomic_load_n() intrinsic showed up in different times for different compilers. */
 #if defined(__clang__)
-#  if __has_builtin(__atomic_load_n) || defined(HAVE_GCC_ATOMICS)
-     /* !!! FIXME: this advertises as available in the NDK but uses an external symbol we don't have.
-        It might be in a later NDK or we might need an extra library? --ryan. */
-#    if !defined(__ANDROID__)
-#      define HAVE_ATOMIC_LOAD_N 1
-#    endif
-#  endif
+#if __has_builtin(__atomic_load_n) || defined(HAVE_GCC_ATOMICS)
+/* !!! FIXME: this advertises as available in the NDK but uses an external symbol we don't have.
+   It might be in a later NDK or we might need an extra library? --ryan. */
+#if !defined(__ANDROID__)
+#define HAVE_ATOMIC_LOAD_N 1
+#endif
+#endif
 #elif defined(__GNUC__)
-#   if (__GNUC__ >= 5)
-#     define HAVE_ATOMIC_LOAD_N 1
-#   endif
+#if (__GNUC__ >= 5)
+#define HAVE_ATOMIC_LOAD_N 1
+#endif
 #endif
 
+/* *INDENT-OFF* */ /* clang-format off */
 #if defined(__WATCOMC__) && defined(__386__)
 SDL_COMPILE_TIME_ASSERT(intsize, 4==sizeof(int));
 #define HAVE_WATCOM_ATOMICS
@@ -73,7 +73,9 @@ extern __inline int _SDL_xadd_watcom(volatile int *a, int v);
   parm [ecx] [eax] \
   value [eax] \
   modify exact [eax];
+
 #endif /* __WATCOMC__ && __386__ */
+/* *INDENT-ON* */ /* clang-format on */
 
 /*
   If any of the operations are not provided then we must emulate some
@@ -105,16 +107,14 @@ extern __inline int _SDL_xadd_watcom(volatile int *a, int v);
 #if EMULATE_CAS
 static SDL_SpinLock locks[32];
 
-static SDL_INLINE void
-enterLock(void *a)
+static SDL_INLINE void enterLock(void *a)
 {
     uintptr_t index = ((((uintptr_t)a) >> 3) & 0x1f);
 
     SDL_AtomicLock(&locks[index]);
 }
 
-static SDL_INLINE void
-leaveLock(void *a)
+static SDL_INLINE void leaveLock(void *a)
 {
     uintptr_t index = ((((uintptr_t)a) >> 3) & 0x1f);
 
@@ -122,7 +122,6 @@ leaveLock(void *a)
 }
 #endif
 
-
 SDL_bool
 SDL_AtomicCAS(SDL_atomic_t *a, int oldval, int newval)
 {
@@ -132,9 +131,9 @@ SDL_AtomicCAS(SDL_atomic_t *a, int oldval, int newval)
 #elif defined(HAVE_WATCOM_ATOMICS)
     return (SDL_bool)_SDL_cmpxchg_watcom(&a->value, newval, oldval);
 #elif defined(HAVE_GCC_ATOMICS)
-    return (SDL_bool) __sync_bool_compare_and_swap(&a->value, oldval, newval);
+    return (SDL_bool)__sync_bool_compare_and_swap(&a->value, oldval, newval);
 #elif defined(__MACOS__) /* this is deprecated in 10.12 sdk; favor gcc atomics. */
-    return (SDL_bool) OSAtomicCompareAndSwap32Barrier(oldval, newval, &a->value);
+    return (SDL_bool)OSAtomicCompareAndSwap32Barrier(oldval, newval, &a->value);
 #elif defined(__SOLARIS__)
     return (SDL_bool)((int)atomic_cas_uint((volatile uint_t *)&a->value, (uint_t)oldval, (uint_t)newval) == oldval);
 #elif EMULATE_CAS
@@ -149,7 +148,7 @@ SDL_AtomicCAS(SDL_atomic_t *a, int oldval, int newval)
 
     return retval;
 #else
-    #error Please define your platform.
+#error Please define your platform.
 #endif
 }
 
@@ -162,10 +161,10 @@ SDL_AtomicCASPtr(void **a, void *oldval, void *newval)
     return (SDL_bool)_SDL_cmpxchg_watcom((int *)a, (long)newval, (long)oldval);
 #elif defined(HAVE_GCC_ATOMICS)
     return __sync_bool_compare_and_swap(a, oldval, newval);
-#elif defined(__MACOS__) && defined(__LP64__) /* this is deprecated in 10.12 sdk; favor gcc atomics. */
-    return (SDL_bool) OSAtomicCompareAndSwap64Barrier((int64_t)oldval, (int64_t)newval, (int64_t*) a);
+#elif defined(__MACOS__) && defined(__LP64__)  /* this is deprecated in 10.12 sdk; favor gcc atomics. */
+    return (SDL_bool)OSAtomicCompareAndSwap64Barrier((int64_t)oldval, (int64_t)newval, (int64_t *)a);
 #elif defined(__MACOS__) && !defined(__LP64__) /* this is deprecated in 10.12 sdk; favor gcc atomics. */
-    return (SDL_bool) OSAtomicCompareAndSwap32Barrier((int32_t)oldval, (int32_t)newval, (int32_t*) a);
+    return (SDL_bool)OSAtomicCompareAndSwap32Barrier((int32_t)oldval, (int32_t)newval, (int32_t *)a);
 #elif defined(__SOLARIS__)
     return (SDL_bool)(atomic_cas_ptr(a, oldval, newval) == oldval);
 #elif EMULATE_CAS
@@ -180,12 +179,11 @@ SDL_AtomicCASPtr(void **a, void *oldval, void *newval)
 
     return retval;
 #else
-    #error Please define your platform.
+#error Please define your platform.
 #endif
 }
 
-int
-SDL_AtomicSet(SDL_atomic_t *a, int v)
+int SDL_AtomicSet(SDL_atomic_t *a, int v)
 {
 #ifdef HAVE_MSC_ATOMICS
     SDL_COMPILE_TIME_ASSERT(atomic_set, sizeof(long) == sizeof(a->value));
@@ -205,7 +203,7 @@ SDL_AtomicSet(SDL_atomic_t *a, int v)
 #endif
 }
 
-void*
+void *
 SDL_AtomicSetPtr(void **a, void *v)
 {
 #if defined(HAVE_MSC_ATOMICS)
@@ -225,8 +223,7 @@ SDL_AtomicSetPtr(void **a, void *v)
 #endif
 }
 
-int
-SDL_AtomicAdd(SDL_atomic_t *a, int v)
+int SDL_AtomicAdd(SDL_atomic_t *a, int v)
 {
 #ifdef HAVE_MSC_ATOMICS
     SDL_COMPILE_TIME_ASSERT(atomic_add, sizeof(long) == sizeof(a->value));
@@ -236,9 +233,9 @@ SDL_AtomicAdd(SDL_atomic_t *a, int v)
 #elif defined(HAVE_GCC_ATOMICS)
     return __sync_fetch_and_add(&a->value, v);
 #elif defined(__SOLARIS__)
-    int pv = a->value;
-    membar_consumer();
-    atomic_add_int((volatile uint_t*)&a->value, v);
+    int pv = a->value;
+    membar_consumer();
+    atomic_add_int((volatile uint_t *)&a->value, v);
     return pv;
 #else
     int value;
@@ -249,8 +246,7 @@ SDL_AtomicAdd(SDL_atomic_t *a, int v)
 #endif
 }
 
-int
-SDL_AtomicGet(SDL_atomic_t *a)
+int SDL_AtomicGet(SDL_atomic_t *a)
 {
 #ifdef HAVE_ATOMIC_LOAD_N
     return __atomic_load_n(&a->value, __ATOMIC_SEQ_CST);
@@ -298,14 +294,12 @@ SDL_AtomicGetPtr(void **a)
 #error This file should be built in arm mode so the mcr instruction is available for memory barriers
 #endif
 
-void
-SDL_MemoryBarrierReleaseFunction(void)
+void SDL_MemoryBarrierReleaseFunction(void)
 {
     SDL_MemoryBarrierRelease();
 }
 
-void
-SDL_MemoryBarrierAcquireFunction(void)
+void SDL_MemoryBarrierAcquireFunction(void)
 {
     SDL_MemoryBarrierAcquire();
 }

src/atomic/SDL_spinlock.c

@@ -24,7 +24,6 @@
 #include "../core/windows/SDL_windows.h"
 #endif
 
-
 #if !defined(HAVE_GCC_ATOMICS) && defined(__SOLARIS__)
 #include <atomic.h>
 #endif
@@ -45,6 +44,7 @@
 #include <libkern/OSAtomic.h>
 #endif
 
+/* *INDENT-OFF* */ /* clang-format off */
 #if defined(__WATCOMC__) && defined(__386__)
 SDL_COMPILE_TIME_ASSERT(locksize, 4==sizeof(SDL_SpinLock));
 extern __inline int _SDL_xchg_watcom(volatile int *a, int v);
@@ -54,6 +54,7 @@ extern __inline int _SDL_xchg_watcom(volatile int *a, int v);
   value [eax] \
   modify exact [eax];
 #endif /* __WATCOMC__ && __386__ */
+/* *INDENT-ON* */ /* clang-format on */
 
 /* This function is where all the magic happens... */
 SDL_bool
@@ -90,39 +91,47 @@ SDL_AtomicTryLock(SDL_SpinLock *lock)
 #elif defined(__WATCOMC__) && defined(__386__)
     return _SDL_xchg_watcom(lock, 1) == 0;
 
-#elif defined(__GNUC__) && defined(__arm__) && \
-        (defined(__ARM_ARCH_3__) || defined(__ARM_ARCH_3M__) || \
-         defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) || \
-         defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5TE__) || \
-         defined(__ARM_ARCH_5TEJ__))
+#elif defined(__GNUC__) && defined(__arm__) &&               \
+    (defined(__ARM_ARCH_3__) || defined(__ARM_ARCH_3M__) ||  \
+     defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) ||  \
+     defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5TE__) || \
+     defined(__ARM_ARCH_5TEJ__))
     int result;
 
 #if defined(__RISCOS__)
     if (__cpucap_have_rex()) {
-        __asm__ __volatile__ (
+        __asm__ __volatile__(
             "ldrex %0, [%2]\nteq   %0, #0\nstrexeq %0, %1, [%2]"
-            : "=&r" (result) : "r" (1), "r" (lock) : "cc", "memory");
+            : "=&r"(result)
+            : "r"(1), "r"(lock)
+            : "cc", "memory");
         return result == 0;
     }
 #endif
 
-    __asm__ __volatile__ (
+    __asm__ __volatile__(
         "swp %0, %1, [%2]\n"
-        : "=&r,&r" (result) : "r,0" (1), "r,r" (lock) : "memory");
+        : "=&r,&r"(result)
+        : "r,0"(1), "r,r"(lock)
+        : "memory");
     return result == 0;
 
 #elif defined(__GNUC__) && defined(__arm__)
     int result;
-    __asm__ __volatile__ (
+    __asm__ __volatile__(
         "ldrex %0, [%2]\nteq   %0, #0\nstrexeq %0, %1, [%2]"
-        : "=&r" (result) : "r" (1), "r" (lock) : "cc", "memory");
+        : "=&r"(result)
+        : "r"(1), "r"(lock)
+        : "cc", "memory");
     return result == 0;
 
 #elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
     int result;
     __asm__ __volatile__(
         "lock ; xchgl %0, (%1)\n"
-        : "=r" (result) : "r" (lock), "0" (1) : "cc", "memory");
+        : "=r"(result)
+        : "r"(lock), "0"(1)
+        : "cc", "memory");
     return result == 0;
 
 #elif defined(__MACOS__) || defined(__IOS__) || defined(__TVOS__)
@@ -147,7 +156,9 @@ SDL_AtomicTryLock(SDL_SpinLock *lock)
         res = SDL_TRUE;
     }
     // enable interuption
-    if (oldintr) { EIntr(); }
+    if (oldintr) {
+        EIntr();
+    }
     return res;
 #else
 #error Please implement for your platform.
@@ -155,8 +166,7 @@ SDL_AtomicTryLock(SDL_SpinLock *lock)
 #endif
 }
 
-void
-SDL_AtomicLock(SDL_SpinLock *lock)
+void SDL_AtomicLock(SDL_SpinLock *lock)
 {
     int iterations = 0;
     /* FIXME: Should we have an eventual timeout? */
@@ -171,8 +181,7 @@ SDL_AtomicLock(SDL_SpinLock *lock)
     }
 }
 
-void
-SDL_AtomicUnlock(SDL_SpinLock *lock)
+void SDL_AtomicUnlock(SDL_SpinLock *lock)
 {
 #if HAVE_GCC_ATOMICS || HAVE_GCC_SYNC_LOCK_TEST_AND_SET
     __sync_lock_release(lock);
@@ -185,7 +194,7 @@ SDL_AtomicUnlock(SDL_SpinLock *lock)
     *lock = 0;
 
 #elif defined(__WATCOMC__) && defined(__386__)
-    SDL_CompilerBarrier ();
+    SDL_CompilerBarrier();
     *lock = 0;
 
 #elif defined(__SOLARIS__)

src/audio/SDL_audio.c

@@ -100,22 +100,20 @@ static const AudioBootStrap *const bootstrap[] = {
     NULL
 };
 
-
 #ifdef HAVE_LIBSAMPLERATE_H
 #ifdef SDL_LIBSAMPLERATE_DYNAMIC
 static void *SRC_lib = NULL;
 #endif
 SDL_bool SRC_available = SDL_FALSE;
 int SRC_converter = 0;
-SRC_STATE* (*SRC_src_new)(int converter_type, int channels, int *error) = NULL;
+SRC_STATE *(*SRC_src_new)(int converter_type, int channels, int *error) = NULL;
 int (*SRC_src_process)(SRC_STATE *state, SRC_DATA *data) = NULL;
 int (*SRC_src_reset)(SRC_STATE *state) = NULL;
-SRC_STATE* (*SRC_src_delete)(SRC_STATE *state) = NULL;
-const char* (*SRC_src_strerror)(int error) = NULL;
+SRC_STATE *(*SRC_src_delete)(SRC_STATE *state) = NULL;
+const char *(*SRC_src_strerror)(int error) = NULL;
 int (*SRC_src_simple)(SRC_DATA *data, int converter_type, int channels) = NULL;
 
-static SDL_bool
-LoadLibSampleRate(void)
+static SDL_bool LoadLibSampleRate(void)
 {
     const char *hint = SDL_GetHint(SDL_HINT_AUDIO_RESAMPLING_MODE);
 
@@ -123,7 +121,7 @@ LoadLibSampleRate(void)
     SRC_converter = 0;
 
     if (!hint || *hint == '0' || SDL_strcasecmp(hint, "default") == 0) {
-        return SDL_FALSE;  /* don't load anything. */
+        return SDL_FALSE; /* don't load anything. */
     } else if (*hint == '1' || SDL_strcasecmp(hint, "fast") == 0) {
         SRC_converter = SRC_SINC_FASTEST;
     } else if (*hint == '2' || SDL_strcasecmp(hint, "medium") == 0) {
@@ -131,7 +129,7 @@ LoadLibSampleRate(void)
     } else if (*hint == '3' || SDL_strcasecmp(hint, "best") == 0) {
         SRC_converter = SRC_SINC_BEST_QUALITY;
     } else {
-        return SDL_FALSE;  /* treat it like "default", don't load anything. */
+        return SDL_FALSE; /* treat it like "default", don't load anything. */
     }
 
 #ifdef SDL_LIBSAMPLERATE_DYNAMIC
@@ -142,12 +140,14 @@ LoadLibSampleRate(void)
         return SDL_FALSE;
     }
 
+    /* *INDENT-OFF* */ /* clang-format off */
     SRC_src_new = (SRC_STATE* (*)(int converter_type, int channels, int *error))SDL_LoadFunction(SRC_lib, "src_new");
     SRC_src_process = (int (*)(SRC_STATE *state, SRC_DATA *data))SDL_LoadFunction(SRC_lib, "src_process");
     SRC_src_reset = (int(*)(SRC_STATE *state))SDL_LoadFunction(SRC_lib, "src_reset");
     SRC_src_delete = (SRC_STATE* (*)(SRC_STATE *state))SDL_LoadFunction(SRC_lib, "src_delete");
     SRC_src_strerror = (const char* (*)(int error))SDL_LoadFunction(SRC_lib, "src_strerror");
     SRC_src_simple = (int(*)(SRC_DATA *data, int converter_type, int channels))SDL_LoadFunction(SRC_lib, "src_simple");
+/* *INDENT-ON* */ /* clang-format on */
 
     if (!SRC_src_new || !SRC_src_process || !SRC_src_reset || !SRC_src_delete || !SRC_src_strerror || !SRC_src_simple) {
         SDL_UnloadObject(SRC_lib);
@@ -167,8 +167,7 @@ LoadLibSampleRate(void)
     return SDL_TRUE;
 }
 
-static void
-UnloadLibSampleRate(void)
+static void UnloadLibSampleRate(void)
 {
 #ifdef SDL_LIBSAMPLERATE_DYNAMIC
     if (SRC_lib != NULL) {
@@ -186,8 +185,7 @@ UnloadLibSampleRate(void)
 }
 #endif
 
-static SDL_AudioDevice *
-get_audio_device(SDL_AudioDeviceID id)
+static SDL_AudioDevice *get_audio_device(SDL_AudioDeviceID id)
 {
     id--;
     if ((id >= SDL_arraysize(open_devices)) || (open_devices[id] == NULL)) {
@@ -198,82 +196,67 @@ get_audio_device(SDL_AudioDeviceID id)
     return open_devices[id];
 }
 
-
 /* stubs for audio drivers that don't need a specific entry point... */
-static void
-SDL_AudioDetectDevices_Default(void)
+static void SDL_AudioDetectDevices_Default(void)
 {
     /* you have to write your own implementation if these assertions fail. */
     SDL_assert(current_audio.impl.OnlyHasDefaultOutputDevice);
     SDL_assert(current_audio.impl.OnlyHasDefaultCaptureDevice || !current_audio.impl.HasCaptureSupport);
 
-    SDL_AddAudioDevice(SDL_FALSE, DEFAULT_OUTPUT_DEVNAME, NULL, (void *) ((size_t) 0x1));
+    SDL_AddAudioDevice(SDL_FALSE, DEFAULT_OUTPUT_DEVNAME, NULL, (void *)((size_t)0x1));
     if (current_audio.impl.HasCaptureSupport) {
-        SDL_AddAudioDevice(SDL_TRUE, DEFAULT_INPUT_DEVNAME, NULL, (void *) ((size_t) 0x2));
+        SDL_AddAudioDevice(SDL_TRUE, DEFAULT_INPUT_DEVNAME, NULL, (void *)((size_t)0x2));
     }
 }
 
-static void
-SDL_AudioThreadInit_Default(_THIS)
-{                               /* no-op. */
+static void SDL_AudioThreadInit_Default(_THIS)
+{ /* no-op. */
 }
 
-static void
-SDL_AudioThreadDeinit_Default(_THIS)
-{                               /* no-op. */
+static void SDL_AudioThreadDeinit_Default(_THIS)
+{ /* no-op. */
 }
 
-static void
-SDL_AudioWaitDevice_Default(_THIS)
-{                               /* no-op. */
+static void SDL_AudioWaitDevice_Default(_THIS)
+{ /* no-op. */
 }
 
-static void
-SDL_AudioPlayDevice_Default(_THIS)
-{                               /* no-op. */
+static void SDL_AudioPlayDevice_Default(_THIS)
+{ /* no-op. */
 }
 
-static Uint8 *
-SDL_AudioGetDeviceBuf_Default(_THIS)
+static Uint8 *SDL_AudioGetDeviceBuf_Default(_THIS)
 {
     return NULL;
 }
 
-static int
-SDL_AudioCaptureFromDevice_Default(_THIS, void *buffer, int buflen)
+static int SDL_AudioCaptureFromDevice_Default(_THIS, void *buffer, int buflen)
 {
-    return -1;  /* just fail immediately. */
+    return -1; /* just fail immediately. */
 }
 
-static void
-SDL_AudioFlushCapture_Default(_THIS)
-{                               /* no-op. */
+static void SDL_AudioFlushCapture_Default(_THIS)
+{ /* no-op. */
 }
 
-static void
-SDL_AudioCloseDevice_Default(_THIS)
-{                               /* no-op. */
+static void SDL_AudioCloseDevice_Default(_THIS)
+{ /* no-op. */
 }
 
-static void
-SDL_AudioDeinitialize_Default(void)
-{                               /* no-op. */
+static void SDL_AudioDeinitialize_Default(void)
+{ /* no-op. */
 }
 
-static void
-SDL_AudioFreeDeviceHandle_Default(void *handle)
-{                               /* no-op. */
+static void SDL_AudioFreeDeviceHandle_Default(void *handle)
+{ /* no-op. */
 }
 
-
-static int
-SDL_AudioOpenDevice_Default(_THIS, const char *devname)
+static int SDL_AudioOpenDevice_Default(_THIS, const char *devname)
 {
     return SDL_Unsupported();
 }
 
-static SDL_INLINE SDL_bool
-is_in_audio_device_thread(SDL_AudioDevice * device)
+static SDL_INLINE SDL_bool is_in_audio_device_thread(SDL_AudioDevice *device)
 {
     /* The device thread locks the same mutex, but not through the public API.
        This check is in case the application, in the audio callback,
@@ -286,35 +269,31 @@ is_in_audio_device_thread(SDL_AudioDevice * device)
     return SDL_FALSE;
 }
 
-static void
-SDL_AudioLockDevice_Default(SDL_AudioDevice * device)
+static void SDL_AudioLockDevice_Default(SDL_AudioDevice *device)
 {
     if (!is_in_audio_device_thread(device)) {
         SDL_LockMutex(device->mixer_lock);
     }
 }
 
-static void
-SDL_AudioUnlockDevice_Default(SDL_AudioDevice * device)
+static void SDL_AudioUnlockDevice_Default(SDL_AudioDevice *device)
 {
     if (!is_in_audio_device_thread(device)) {
         SDL_UnlockMutex(device->mixer_lock);
     }
 }
 
-static void
-finish_audio_entry_points_init(void)
+static void finish_audio_entry_points_init(void)
 {
     /*
      * Fill in stub functions for unused driver entry points. This lets us
      *  blindly call them without having to check for validity first.
      */
 
-
-#define FILL_STUB(x) \
-        if (current_audio.impl.x == NULL) { \
-            current_audio.impl.x = SDL_Audio##x##_Default; \
-        }
+#define FILL_STUB(x)                                   \
+    if (current_audio.impl.x == NULL) {                \
+        current_audio.impl.x = SDL_Audio##x##_Default; \
+    }
     FILL_STUB(DetectDevices);
     FILL_STUB(OpenDevice);
     FILL_STUB(ThreadInit);
@@ -332,21 +311,19 @@ finish_audio_entry_points_init(void)
 #undef FILL_STUB
 }
 
-
 /* device hotplug support... */
 
-static int
-add_audio_device(const char *name, SDL_AudioSpec *spec, void *handle, SDL_AudioDeviceItem **devices, int *devCount)
+static int add_audio_device(const char *name, SDL_AudioSpec *spec, void *handle, SDL_AudioDeviceItem **devices, int *devCount)
 {
     int retval = -1;
     SDL_AudioDeviceItem *item;
     const SDL_AudioDeviceItem *i;
     int dupenum = 0;
 
-    SDL_assert(handle != NULL);  /* we reserve NULL, audio backends can't use it. */
+    SDL_assert(handle != NULL); /* we reserve NULL, audio backends can't use it. */
     SDL_assert(name != NULL);
 
-    item = (SDL_AudioDeviceItem *) SDL_malloc(sizeof (SDL_AudioDeviceItem));
+    item = (SDL_AudioDeviceItem *)SDL_malloc(sizeof(SDL_AudioDeviceItem));
     if (!item) {
         return SDL_OutOfMemory();
     }
@@ -371,13 +348,13 @@ add_audio_device(const char *name, SDL_AudioSpec *spec, void *handle, SDL_AudioD
     for (i = *devices; i != NULL; i = i->next) {
         if (SDL_strcmp(name, i->original_name) == 0) {
             dupenum = i->dupenum + 1;
-            break;  /* stop at the highest-numbered dupe. */
+            break; /* stop at the highest-numbered dupe. */
         }
     }
 
     if (dupenum) {
         const size_t len = SDL_strlen(name) + 16;
-        char *replacement = (char *) SDL_malloc(len);
+        char *replacement = (char *)SDL_malloc(len);
         if (!replacement) {
             SDL_UnlockMutex(current_audio.detectionLock);
             SDL_free(item->original_name);
@@ -392,28 +369,25 @@ add_audio_device(const char *name, SDL_AudioSpec *spec, void *handle, SDL_AudioD
 
     item->next = *devices;
     *devices = item;
-    retval = (*devCount)++;   /* !!! FIXME: this should be an atomic increment */
+    retval = (*devCount)++; /* !!! FIXME: this should be an atomic increment */
 
     SDL_UnlockMutex(current_audio.detectionLock);
 
     return retval;
 }
 
-static SDL_INLINE int
-add_capture_device(const char *name, SDL_AudioSpec *spec, void *handle)
+static SDL_INLINE int add_capture_device(const char *name, SDL_AudioSpec *spec, void *handle)
 {
     SDL_assert(current_audio.impl.HasCaptureSupport);
     return add_audio_device(name, spec, handle, &current_audio.inputDevices, &current_audio.inputDeviceCount);
 }
 
-static SDL_INLINE int
-add_output_device(const char *name, SDL_AudioSpec *spec, void *handle)
+static SDL_INLINE int add_output_device(const char *name, SDL_AudioSpec *spec, void *handle)
 {
     return add_audio_device(name, spec, handle, &current_audio.outputDevices, &current_audio.outputDeviceCount);
 }
 
-static void
-free_device_list(SDL_AudioDeviceItem **devices, int *devCount)
+static void free_device_list(SDL_AudioDeviceItem **devices, int *devCount)
 {
     SDL_AudioDeviceItem *item, *next;
     for (item = *devices; item != NULL; item = next) {
@@ -432,10 +406,8 @@ free_device_list(SDL_AudioDeviceItem **devices, int *devCount)
     *devCount = 0;
 }
 
-
 /* The audio backends call this when a new device is plugged in. */
-void
-SDL_AddAudioDevice(const SDL_bool iscapture, const char *name, SDL_AudioSpec *spec, void *handle)
+void SDL_AddAudioDevice(const SDL_bool iscapture, const char *name, SDL_AudioSpec *spec, void *handle)
 {
     const int device_index = iscapture ? add_capture_device(name, spec, handle) : add_output_device(name, spec, handle);
     if (device_index != -1) {
@@ -457,11 +429,11 @@ void SDL_OpenedAudioDeviceDisconnected(SDL_AudioDevice *device)
     SDL_assert(get_audio_device(device->id) == device);
 
     if (!SDL_AtomicGet(&device->enabled)) {
-        return;  /* don't report disconnects more than once. */
+        return; /* don't report disconnects more than once. */
     }
 
     if (SDL_AtomicGet(&device->shutdown)) {
-        return;  /* don't report disconnect if we're trying to close device. */
+        return; /* don't report disconnect if we're trying to close device. */
     }
 
     /* Ends the audio callback and mark the device as STOPPED, but the
@@ -481,8 +453,7 @@ void SDL_OpenedAudioDeviceDisconnected(SDL_AudioDevice *device)
     }
 }
 
-static void
-mark_device_removed(void *handle, SDL_AudioDeviceItem *devices, SDL_bool *removedFlag)
+static void mark_device_removed(void *handle, SDL_AudioDeviceItem *devices, SDL_bool *removedFlag)
 {
     SDL_AudioDeviceItem *item;
     SDL_assert(handle != NULL);
@@ -496,8 +467,7 @@ mark_device_removed(void *handle, SDL_AudioDeviceItem *devices, SDL_bool *remove
 }
 
 /* The audio backends call this when a device is removed from the system. */
-void
-SDL_RemoveAudioDevice(const SDL_bool iscapture, void *handle)
+void SDL_RemoveAudioDevice(const SDL_bool iscapture, void *handle)
 {
     int device_index;
     SDL_AudioDevice *device = NULL;
@@ -540,40 +510,36 @@ SDL_RemoveAudioDevice(const SDL_bool iscapture, void *handle)
     current_audio.impl.FreeDeviceHandle(handle);
 }
 
-
-
 /* buffer queueing support... */
 
-static void SDLCALL
-SDL_BufferQueueDrainCallback(void *userdata, Uint8 *stream, int len)
+static void SDLCALL SDL_BufferQueueDrainCallback(void *userdata, Uint8 *stream, int len)
 {
     /* this function always holds the mixer lock before being called. */
-    SDL_AudioDevice *device = (SDL_AudioDevice *) userdata;
+    SDL_AudioDevice *device = (SDL_AudioDevice *)userdata;
     size_t dequeued;
 
-    SDL_assert(device != NULL);  /* this shouldn't ever happen, right?! */
-    SDL_assert(!device->iscapture);  /* this shouldn't ever happen, right?! */
-    SDL_assert(len >= 0);  /* this shouldn't ever happen, right?! */
+    SDL_assert(device != NULL);     /* this shouldn't ever happen, right?! */
+    SDL_assert(!device->iscapture); /* this shouldn't ever happen, right?! */
+    SDL_assert(len >= 0);           /* this shouldn't ever happen, right?! */
 
     dequeued = SDL_ReadFromDataQueue(device->buffer_queue, stream, len);
     stream += dequeued;
-    len -= (int) dequeued;
+    len -= (int)dequeued;
 
-    if (len > 0) {  /* fill any remaining space in the stream with silence. */
+    if (len > 0) { /* fill any remaining space in the stream with silence. */
         SDL_assert(SDL_CountDataQueue(device->buffer_queue) == 0);
         SDL_memset(stream, device->callbackspec.silence, len);
     }
 }
 
-static void SDLCALL
-SDL_BufferQueueFillCallback(void *userdata, Uint8 *stream, int len)
+static void SDLCALL SDL_BufferQueueFillCallback(void *userdata, Uint8 *stream, int len)
 {
     /* this function always holds the mixer lock before being called. */
-    SDL_AudioDevice *device = (SDL_AudioDevice *) userdata;
+    SDL_AudioDevice *device = (SDL_AudioDevice *)userdata;
 
-    SDL_assert(device != NULL);  /* this shouldn't ever happen, right?! */
-    SDL_assert(device->iscapture);  /* this shouldn't ever happen, right?! */
-    SDL_assert(len >= 0);  /* this shouldn't ever happen, right?! */
+    SDL_assert(device != NULL);    /* this shouldn't ever happen, right?! */
+    SDL_assert(device->iscapture); /* this shouldn't ever happen, right?! */
+    SDL_assert(len >= 0);          /* this shouldn't ever happen, right?! */
 
     /* note that if this needs to allocate more space and run out of memory,
        we have no choice but to quietly drop the data and hope it works out
@@ -581,14 +547,13 @@ SDL_BufferQueueFillCallback(void *userdata, Uint8 *stream, int len)
     SDL_WriteToDataQueue(device->buffer_queue, stream, len);
 }
 
-int
-SDL_QueueAudio(SDL_AudioDeviceID devid, const void *data, Uint32 len)
+int SDL_QueueAudio(SDL_AudioDeviceID devid, const void *data, Uint32 len)
 {
     SDL_AudioDevice *device = get_audio_device(devid);
     int rc = 0;
 
     if (!device) {
-        return -1;  /* get_audio_device() will have set the error state */
+        return -1; /* get_audio_device() will have set the error state */
     } else if (device->iscapture) {
         return SDL_SetError("This is a capture device, queueing not allowed");
     } else if (device->callbackspec.callback != SDL_BufferQueueDrainCallback) {
@@ -610,15 +575,15 @@ SDL_DequeueAudio(SDL_AudioDeviceID devid, void *data, Uint32 len)
     SDL_AudioDevice *device = get_audio_device(devid);
     Uint32 rc;
 
-    if ( (len == 0) ||  /* nothing to do? */
-         (!device) ||  /* called with bogus device id */
-         (!device->iscapture) ||  /* playback devices can't dequeue */
-         (device->callbackspec.callback != SDL_BufferQueueFillCallback) ) { /* not set for queueing */
-        return 0;  /* just report zero bytes dequeued. */
+    if ((len == 0) ||                                                     /* nothing to do? */
+        (!device) ||                                                      /* called with bogus device id */
+        (!device->iscapture) ||                                           /* playback devices can't dequeue */
+        (device->callbackspec.callback != SDL_BufferQueueFillCallback)) { /* not set for queueing */
+        return 0;                                                         /* just report zero bytes dequeued. */
     }
 
     current_audio.impl.LockDevice(device);
-    rc = (Uint32) SDL_ReadFromDataQueue(device->buffer_queue, data, len);
+    rc = (Uint32)SDL_ReadFromDataQueue(device->buffer_queue, data, len);
     current_audio.impl.UnlockDevice(device);
     return rc;
 }
@@ -635,23 +600,21 @@ SDL_GetQueuedAudioSize(SDL_AudioDeviceID devid)
 
     /* Nothing to do unless we're set up for queueing. */
     if (device->callbackspec.callback == SDL_BufferQueueDrainCallback ||
-        device->callbackspec.callback == SDL_BufferQueueFillCallback)
-    {
+        device->callbackspec.callback == SDL_BufferQueueFillCallback) {
         current_audio.impl.LockDevice(device);
-        retval = (Uint32) SDL_CountDataQueue(device->buffer_queue);
+        retval = (Uint32)SDL_CountDataQueue(device->buffer_queue);
         current_audio.impl.UnlockDevice(device);
     }
 
     return retval;
 }
 
-void
-SDL_ClearQueuedAudio(SDL_AudioDeviceID devid)
+void SDL_ClearQueuedAudio(SDL_AudioDeviceID devid)
 {
     SDL_AudioDevice *device = get_audio_device(devid);
 
     if (!device) {
-        return;  /* nothing to do. */
+        return; /* nothing to do. */
     }
 
     /* Blank out the device and release the mutex. Free it afterwards. */
@@ -663,12 +626,10 @@ SDL_ClearQueuedAudio(SDL_AudioDeviceID devid)
     current_audio.impl.UnlockDevice(device);
 }
 
-
 /* The general mixing thread function */
-static int SDLCALL
-SDL_RunAudio(void *devicep)
+static int SDLCALL SDL_RunAudio(void *devicep)
 {
-    SDL_AudioDevice *device = (SDL_AudioDevice *) devicep;
+    SDL_AudioDevice *device = (SDL_AudioDevice *)devicep;
     void *udata = device->callbackspec.userdata;
     SDL_AudioCallback callback = device->callbackspec.callback;
     int data_len = 0;
@@ -727,15 +688,15 @@ SDL_RunAudio(void *devicep)
             /* if this fails...oh well. We'll play silence here. */
             SDL_AudioStreamPut(device->stream, data, data_len);
 
-            while (SDL_AudioStreamAvailable(device->stream) >= ((int) device->spec.size)) {
+            while (SDL_AudioStreamAvailable(device->stream) >= ((int)device->spec.size)) {
                 int got;
                 data = SDL_AtomicGet(&device->enabled) ? current_audio.impl.GetDeviceBuf(device) : NULL;
                 got = SDL_AudioStreamGet(device->stream, data ? data : device->work_buffer, device->spec.size);
                 SDL_assert((got <= 0) || (got == device->spec.size));
 
-                if (data == NULL) {  /* device is having issues... */
+                if (data == NULL) { /* device is having issues... */
                     const Uint32 delay = ((device->spec.samples * 1000) / device->spec.freq);
-                    SDL_Delay(delay);  /* wait for as long as this buffer would have played. Maybe device recovers later? */
+                    SDL_Delay(delay); /* wait for as long as this buffer would have played. Maybe device recovers later? */
                 } else {
                     if (got != device->spec.size) {
                         SDL_memset(data, device->spec.silence, device->spec.size);
@@ -748,7 +709,7 @@ SDL_RunAudio(void *devicep)
             /* nothing to do; pause like we queued a buffer to play. */
             const Uint32 delay = ((device->spec.samples * 1000) / device->spec.freq);
             SDL_Delay(delay);
-        } else {  /* writing directly to the device. */
+        } else { /* writing directly to the device. */
             /* queue this buffer and wait for it to finish playing. */
             current_audio.impl.PlayDevice(device);
             current_audio.impl.WaitDevice(device);
@@ -765,11 +726,10 @@ SDL_RunAudio(void *devicep)
 
 /* !!! FIXME: this needs to deal with device spec changes. */
 /* The general capture thread function */
-static int SDLCALL
-SDL_CaptureAudio(void *devicep)
+static int SDLCALL SDL_CaptureAudio(void *devicep)
 {
-    SDL_AudioDevice *device = (SDL_AudioDevice *) devicep;
-    const int silence = (int) device->spec.silence;
+    SDL_AudioDevice *device = (SDL_AudioDevice *)devicep;
+    const int silence = (int)device->spec.silence;
     const Uint32 delay = ((device->spec.samples * 1000) / device->spec.freq);
     const int data_len = device->spec.size;
     Uint8 *data;
@@ -799,11 +759,11 @@ SDL_CaptureAudio(void *devicep)
         Uint8 *ptr;
 
         if (SDL_AtomicGet(&device->paused)) {
-            SDL_Delay(delay);  /* just so we don't cook the CPU. */
+            SDL_Delay(delay); /* just so we don't cook the CPU. */
             if (device->stream) {
                 SDL_AudioStreamClear(device->stream);
             }
-            current_audio.impl.FlushCapture(device);  /* dump anything pending. */
+            current_audio.impl.FlushCapture(device); /* dump anything pending. */
             continue;
         }
 
@@ -821,15 +781,15 @@ SDL_CaptureAudio(void *devicep)
            But we don't process it further or call the app's callback. */
 
         if (!SDL_AtomicGet(&device->enabled)) {
-            SDL_Delay(delay);  /* try to keep callback firing at normal pace. */
+            SDL_Delay(delay); /* try to keep callback firing at normal pace. */
         } else {
             while (still_need > 0) {
                 const int rc = current_audio.impl.CaptureFromDevice(device, ptr, still_need);
-                SDL_assert(rc <= still_need);  /* device should not overflow buffer. :) */
+                SDL_assert(rc <= still_need); /* device should not overflow buffer. :) */
                 if (rc > 0) {
                     still_need -= rc;
                     ptr += rc;
-                } else {  /* uhoh, device failed for some reason! */
+                } else { /* uhoh, device failed for some reason! */
                     SDL_OpenedAudioDeviceDisconnected(device);
                     break;
                 }
@@ -845,7 +805,7 @@ SDL_CaptureAudio(void *devicep)
             /* if this fails...oh well. */
             SDL_AudioStreamPut(device->stream, data, data_len);
 
-            while (SDL_AudioStreamAvailable(device->stream) >= ((int) device->callbackspec.size)) {
+            while (SDL_AudioStreamAvailable(device->stream) >= ((int)device->callbackspec.size)) {
                 const int got = SDL_AudioStreamGet(device->stream, device->work_buffer, device->callbackspec.size);
                 SDL_assert((got < 0) || (got == device->callbackspec.size));
                 if (got != device->callbackspec.size) {
@@ -859,7 +819,7 @@ SDL_CaptureAudio(void *devicep)
                 }
                 SDL_UnlockMutex(device->mixer_lock);
             }
-        } else {  /* feeding user callback directly without streaming. */
+        } else { /* feeding user callback directly without streaming. */
             /* !!! FIXME: this should be LockDevice. */
             SDL_LockMutex(device->mixer_lock);
             if (!SDL_AtomicGet(&device->paused)) {
@@ -876,11 +836,11 @@ SDL_CaptureAudio(void *devicep)
     return 0;
 }
 
-
-static SDL_AudioFormat
-SDL_ParseAudioFormat(const char *string)
+static SDL_AudioFormat SDL_ParseAudioFormat(const char *string)
 {
-#define CHECK_FMT_STRING(x) if (SDL_strcmp(string, #x) == 0) return AUDIO_##x
+#define CHECK_FMT_STRING(x)          \
+    if (SDL_strcmp(string, #x) == 0) \
+    return AUDIO_##x
     CHECK_FMT_STRING(U8);
     CHECK_FMT_STRING(S8);
     CHECK_FMT_STRING(U16LSB);
@@ -903,8 +863,7 @@ SDL_ParseAudioFormat(const char *string)
     return 0;
 }
 
-int
-SDL_GetNumAudioDrivers(void)
+int SDL_GetNumAudioDrivers(void)
 {
     return SDL_arraysize(bootstrap) - 1;
 }
@@ -918,14 +877,13 @@ SDL_GetAudioDriver(int index)
     return NULL;
 }
 
-int
-SDL_AudioInit(const char *driver_name)
+int SDL_AudioInit(const char *driver_name)
 {
     int i;
     SDL_bool initialized = SDL_FALSE, tried_to_init = SDL_FALSE;
 
     if (SDL_GetCurrentAudioDriver()) {
-        SDL_AudioQuit();        /* shutdown driver if already running. */
+        SDL_AudioQuit(); /* shutdown driver if already running. */
     }
 
     SDL_zeroa(open_devices);
@@ -998,7 +956,7 @@ SDL_AudioInit(const char *driver_name)
         }
 
         SDL_zero(current_audio);
-        return -1;            /* No driver was available, so fail. */
+        return -1; /* No driver was available, so fail. */
     }
 
     current_audio.detectionLock = SDL_CreateMutex();
@@ -1025,8 +983,7 @@ SDL_GetCurrentAudioDriver()
 }
 
 /* Clean out devices that we've removed but had to keep around for stability. */
-static void
-clean_out_device_list(SDL_AudioDeviceItem **devices, int *devCount, SDL_bool *removedFlag)
+static void clean_out_device_list(SDL_AudioDeviceItem **devices, int *devCount, SDL_bool *removedFlag)
 {
     SDL_AudioDeviceItem *item = *devices;
     SDL_AudioDeviceItem *prev = NULL;
@@ -1057,9 +1014,7 @@ clean_out_device_list(SDL_AudioDeviceItem **devices, int *devCount, SDL_bool *re
     *removedFlag = SDL_FALSE;
 }
 
-
-int
-SDL_GetNumAudioDevices(int iscapture)
+int SDL_GetNumAudioDevices(int iscapture)
 {
     int retval = 0;
 
@@ -1082,7 +1037,6 @@ SDL_GetNumAudioDevices(int iscapture)
     return retval;
 }
 
-
 const char *
 SDL_GetAudioDeviceName(int index, int iscapture)
 {
@@ -1113,9 +1067,7 @@ SDL_GetAudioDeviceName(int index, int iscapture)
     return retval;
 }
 
-
-int
-SDL_GetAudioDeviceSpec(int index, int iscapture, SDL_AudioSpec *spec)
+int SDL_GetAudioDeviceSpec(int index, int iscapture, SDL_AudioSpec *spec)
 {
     SDL_AudioDeviceItem *item;
     int i, retval;
@@ -1146,9 +1098,7 @@ SDL_GetAudioDeviceSpec(int index, int iscapture, SDL_AudioSpec *spec)
     return retval;
 }
 
-
-int
-SDL_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
+int SDL_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
 {
     if (spec == NULL) {
         return SDL_InvalidParamError("spec");
@@ -1164,9 +1114,7 @@ SDL_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
     return current_audio.impl.GetDefaultAudioInfo(name, spec, iscapture);
 }
 
-
-static void
-close_audio_device(SDL_AudioDevice * device)
+static void close_audio_device(SDL_AudioDevice *device)
 {
     if (!device) {
         return;
@@ -1207,34 +1155,32 @@ close_audio_device(SDL_AudioDevice * device)
     SDL_free(device);
 }
 
-
 /*
  * Sanity check desired AudioSpec for SDL_OpenAudio() in (orig).
  *  Fills in a sanitized copy in (prepared).
  *  Returns non-zero if okay, zero on fatal parameters in (orig).
  */
-static int
-prepare_audiospec(const SDL_AudioSpec * orig, SDL_AudioSpec * prepared)
+static int prepare_audiospec(const SDL_AudioSpec *orig, SDL_AudioSpec *prepared)
 {
     SDL_copyp(prepared, orig);
 
     if (orig->freq == 0) {
         const char *env = SDL_getenv("SDL_AUDIO_FREQUENCY");
         if ((!env) || ((prepared->freq = SDL_atoi(env)) == 0)) {
-            prepared->freq = 22050;     /* a reasonable default */
+            prepared->freq = 22050; /* a reasonable default */
         }
     }
 
     if (orig->format == 0) {
         const char *env = SDL_getenv("SDL_AUDIO_FORMAT");
         if ((!env) || ((prepared->format = SDL_ParseAudioFormat(env)) == 0)) {
-            prepared->format = AUDIO_S16;       /* a reasonable default */
+            prepared->format = AUDIO_S16; /* a reasonable default */
         }
     }
 
     if (orig->channels == 0) {
         const char *env = SDL_getenv("SDL_AUDIO_CHANNELS");
-        if ((!env) || ((prepared->channels = (Uint8) SDL_atoi(env)) == 0)) {
+        if ((!env) || ((prepared->channels = (Uint8)SDL_atoi(env)) == 0)) {
             prepared->channels = 2; /* a reasonable default */
         }
     } else if (orig->channels > 8) {
@@ -1244,7 +1190,7 @@ prepare_audiospec(const SDL_AudioSpec * orig, SDL_AudioSpec * prepared)
 
     if (orig->samples == 0) {
         const char *env = SDL_getenv("SDL_AUDIO_SAMPLES");
-        if ((!env) || ((prepared->samples = (Uint16) SDL_atoi(env)) == 0)) {
+        if ((!env) || ((prepared->samples = (Uint16)SDL_atoi(env)) == 0)) {
             /* Pick a default of ~46 ms at desired frequency */
             /* !!! FIXME: remove this when the non-Po2 resampling is in. */
             const int samples = (prepared->freq / 1000) * 46;
@@ -1262,10 +1208,9 @@ prepare_audiospec(const SDL_AudioSpec * orig, SDL_AudioSpec * prepared)
     return 1;
 }
 
-static SDL_AudioDeviceID
-open_audio_device(const char *devname, int iscapture,
-                  const SDL_AudioSpec * desired, SDL_AudioSpec * obtained,
-                  int allowed_changes, int min_id)
+static SDL_AudioDeviceID open_audio_device(const char *devname, int iscapture,
+                                           const SDL_AudioSpec *desired, SDL_AudioSpec *obtained,
+                                           int allowed_changes, int min_id)
 {
     const SDL_bool is_internal_thread = (desired->callback == NULL);
     SDL_AudioDeviceID id = 0;
@@ -1377,7 +1322,7 @@ open_audio_device(const char *devname, int iscapture,
         }
     }
 
-    device = (SDL_AudioDevice *) SDL_calloc(1, sizeof (SDL_AudioDevice));
+    device = (SDL_AudioDevice *)SDL_calloc(1, sizeof(SDL_AudioDevice));
     if (device == NULL) {
         SDL_OutOfMemory();
         SDL_UnlockMutex(current_audio.detectionLock);
@@ -1388,7 +1333,7 @@ open_audio_device(const char *devname, int iscapture,
     device->iscapture = iscapture ? SDL_TRUE : SDL_FALSE;
     device->handle = handle;
 
-    SDL_AtomicSet(&device->shutdown, 0);  /* just in case. */
+    SDL_AtomicSet(&device->shutdown, 0); /* just in case. */
     SDL_AtomicSet(&device->paused, 1);
     SDL_AtomicSet(&device->enabled, 1);
 
@@ -1451,19 +1396,19 @@ open_audio_device(const char *devname, int iscapture,
         }
     }
 
-    SDL_CalculateAudioSpec(obtained);  /* recalc after possible changes. */
+    SDL_CalculateAudioSpec(obtained); /* recalc after possible changes. */
 
     device->callbackspec = *obtained;
 
     if (build_stream) {
         if (iscapture) {
             device->stream = SDL_NewAudioStream(device->spec.format,
-                                  device->spec.channels, device->spec.freq,
-                                  obtained->format, obtained->channels, obtained->freq);
+                                                device->spec.channels, device->spec.freq,
+                                                obtained->format, obtained->channels, obtained->freq);
         } else {
             device->stream = SDL_NewAudioStream(obtained->format, obtained->channels,
-                                  obtained->freq, device->spec.format,
-                                  device->spec.channels, device->spec.freq);
+                                                obtained->freq, device->spec.format,
+                                                device->spec.channels, device->spec.freq);
         }
 
         if (!device->stream) {
@@ -1473,7 +1418,7 @@ open_audio_device(const char *devname, int iscapture,
         }
     }
 
-    if (device->spec.callback == NULL) {  /* use buffer queueing? */
+    if (device->spec.callback == NULL) { /* use buffer queueing? */
         /* pool a few packets to start. Enough for two callbacks. */
         device->buffer_queue = SDL_NewDataQueue(SDL_AUDIOBUFFERQUEUE_PACKETLEN, obtained->size * 2);
         if (!device->buffer_queue) {
@@ -1493,7 +1438,7 @@ open_audio_device(const char *devname, int iscapture,
     }
     SDL_assert(device->work_buffer_len > 0);
 
-    device->work_buffer = (Uint8 *) SDL_malloc(device->work_buffer_len);
+    device->work_buffer = (Uint8 *)SDL_malloc(device->work_buffer_len);
     if (device->work_buffer == NULL) {
         close_audio_device(device);
         SDL_UnlockMutex(current_audio.detectionLock);
@@ -1501,7 +1446,7 @@ open_audio_device(const char *devname, int iscapture,
         return 0;
     }
 
-    open_devices[id] = device;  /* add it to our list of open devices. */
+    open_devices[id] = device; /* add it to our list of open devices. */
 
     /* Start the audio thread if necessary */
     if (!current_audio.impl.ProvidesOwnCallbackThread) {
@@ -1511,7 +1456,7 @@ open_audio_device(const char *devname, int iscapture,
         const size_t stacksize = is_internal_thread ? 64 * 1024 : 0;
         char threadname[64];
 
-        SDL_snprintf(threadname, sizeof (threadname), "SDLAudio%c%d", (iscapture) ? 'C' : 'P', (int) device->id);
+        SDL_snprintf(threadname, sizeof(threadname), "SDLAudio%c%d", (iscapture) ? 'C' : 'P', (int)device->id);
         device->thread = SDL_CreateThreadInternal(iscapture ? SDL_CaptureAudio : SDL_RunAudio, threadname, stacksize, device);
 
         if (device->thread == NULL) {
@@ -1526,9 +1471,7 @@ open_audio_device(const char *devname, int iscapture,
     return device->id;
 }
 
-
-int
-SDL_OpenAudio(SDL_AudioSpec * desired, SDL_AudioSpec * obtained)
+int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained)
 {
     SDL_AudioDeviceID id = 0;
 
@@ -1564,7 +1507,7 @@ SDL_OpenAudio(SDL_AudioSpec * desired, SDL_AudioSpec * obtained)
 
 SDL_AudioDeviceID
 SDL_OpenAudioDevice(const char *device, int iscapture,
-                    const SDL_AudioSpec * desired, SDL_AudioSpec * obtained,
+                    const SDL_AudioSpec *desired, SDL_AudioSpec *obtained,
                     int allowed_changes)
 {
     return open_audio_device(device, iscapture, desired, obtained,
@@ -1586,15 +1529,13 @@ SDL_GetAudioDeviceStatus(SDL_AudioDeviceID devid)
     return status;
 }
 
-
 SDL_AudioStatus
 SDL_GetAudioStatus(void)
 {
     return SDL_GetAudioDeviceStatus(1);
 }
 
-void
-SDL_PauseAudioDevice(SDL_AudioDeviceID devid, int pause_on)
+void SDL_PauseAudioDevice(SDL_AudioDeviceID devid, int pause_on)
 {
     SDL_AudioDevice *device = get_audio_device(devid);
     if (device) {
@@ -1604,15 +1545,12 @@ SDL_PauseAudioDevice(SDL_AudioDeviceID devid, int pause_on)
     }
 }
 
-void
-SDL_PauseAudio(int pause_on)
+void SDL_PauseAudio(int pause_on)
 {
     SDL_PauseAudioDevice(1, pause_on);
 }
 
-
-void
-SDL_LockAudioDevice(SDL_AudioDeviceID devid)
+void SDL_LockAudioDevice(SDL_AudioDeviceID devid)
 {
     /* Obtain a lock on the mixing buffers */
     SDL_AudioDevice *device = get_audio_device(devid);
@@ -1621,14 +1559,12 @@ SDL_LockAudioDevice(SDL_AudioDeviceID devid)
     }
 }
 
-void
-SDL_LockAudio(void)
+void SDL_LockAudio(void)
 {
     SDL_LockAudioDevice(1);
 }
 
-void
-SDL_UnlockAudioDevice(SDL_AudioDeviceID devid)
+void SDL_UnlockAudioDevice(SDL_AudioDeviceID devid)
 {
     /* Obtain a lock on the mixing buffers */
     SDL_AudioDevice *device = get_audio_device(devid);
@@ -1637,30 +1573,26 @@ SDL_UnlockAudioDevice(SDL_AudioDeviceID devid)
     }
 }
 
-void
-SDL_UnlockAudio(void)
+void SDL_UnlockAudio(void)
 {
     SDL_UnlockAudioDevice(1);
 }
 
-void
-SDL_CloseAudioDevice(SDL_AudioDeviceID devid)
+void SDL_CloseAudioDevice(SDL_AudioDeviceID devid)
 {
     close_audio_device(get_audio_device(devid));
 }
 
-void
-SDL_CloseAudio(void)
+void SDL_CloseAudio(void)
 {
     SDL_CloseAudioDevice(1);
 }
 
-void
-SDL_AudioQuit(void)
+void SDL_AudioQuit(void)
 {
     SDL_AudioDeviceID i;
 
-    if (!current_audio.name) {  /* not initialized?! */
+    if (!current_audio.name) { /* not initialized?! */
         return;
     }
 
@@ -1688,26 +1620,26 @@ SDL_AudioQuit(void)
 static int format_idx;
 static int format_idx_sub;
 static SDL_AudioFormat format_list[NUM_FORMATS][NUM_FORMATS] = {
-    {AUDIO_U8, AUDIO_S8, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB,
-     AUDIO_U16MSB, AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB},
-    {AUDIO_S8, AUDIO_U8, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB,
-     AUDIO_U16MSB, AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB},
-    {AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_S32LSB,
-     AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_U8, AUDIO_S8},
-    {AUDIO_S16MSB, AUDIO_S16LSB, AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_S32MSB,
-     AUDIO_S32LSB, AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_U8, AUDIO_S8},
-    {AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_S32LSB,
-     AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_U8, AUDIO_S8},
-    {AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_S16MSB, AUDIO_S16LSB, AUDIO_S32MSB,
-     AUDIO_S32LSB, AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_U8, AUDIO_S8},
-    {AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_S16LSB,
-     AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_U8, AUDIO_S8},
-    {AUDIO_S32MSB, AUDIO_S32LSB, AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_S16MSB,
-     AUDIO_S16LSB, AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_U8, AUDIO_S8},
-    {AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_S16LSB,
-     AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_U8, AUDIO_S8},
-    {AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_S32MSB, AUDIO_S32LSB, AUDIO_S16MSB,
-     AUDIO_S16LSB, AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_U8, AUDIO_S8},
+    { AUDIO_U8, AUDIO_S8, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB,
+      AUDIO_U16MSB, AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB },
+    { AUDIO_S8, AUDIO_U8, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB,
+      AUDIO_U16MSB, AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB },
+    { AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_S32LSB,
+      AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_U8, AUDIO_S8 },
+    { AUDIO_S16MSB, AUDIO_S16LSB, AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_S32MSB,
+      AUDIO_S32LSB, AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_U8, AUDIO_S8 },
+    { AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_S16LSB, AUDIO_S16MSB, AUDIO_S32LSB,
+      AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_U8, AUDIO_S8 },
+    { AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_S16MSB, AUDIO_S16LSB, AUDIO_S32MSB,
+      AUDIO_S32LSB, AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_U8, AUDIO_S8 },
+    { AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_S16LSB,
+      AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_U8, AUDIO_S8 },
+    { AUDIO_S32MSB, AUDIO_S32LSB, AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_S16MSB,
+      AUDIO_S16LSB, AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_U8, AUDIO_S8 },
+    { AUDIO_F32LSB, AUDIO_F32MSB, AUDIO_S32LSB, AUDIO_S32MSB, AUDIO_S16LSB,
+      AUDIO_S16MSB, AUDIO_U16LSB, AUDIO_U16MSB, AUDIO_U8, AUDIO_S8 },
+    { AUDIO_F32MSB, AUDIO_F32LSB, AUDIO_S32MSB, AUDIO_S32LSB, AUDIO_S16MSB,
+      AUDIO_S16LSB, AUDIO_U16MSB, AUDIO_U16LSB, AUDIO_U8, AUDIO_S8 },
 };
 
 SDL_AudioFormat
@@ -1731,26 +1663,25 @@ SDL_NextAudioFormat(void)
     return format_list[format_idx][format_idx_sub++];
 }
 
-Uint8
-SDL_SilenceValueForFormat(const SDL_AudioFormat format)
+Uint8 SDL_SilenceValueForFormat(const SDL_AudioFormat format)
 {
     switch (format) {
-        /* !!! FIXME: 0x80 isn't perfect for U16, but we can't fit 0x8000 in a
-           !!! FIXME:  byte for SDL_memset() use. This is actually 0.1953 percent
-           !!! FIXME:  off from silence. Maybe just don't use U16. */
-        case AUDIO_U16LSB:
-        case AUDIO_U16MSB:
-        case AUDIO_U8:
-            return 0x80;
+    /* !!! FIXME: 0x80 isn't perfect for U16, but we can't fit 0x8000 in a
+       !!! FIXME:  byte for SDL_memset() use. This is actually 0.1953 percent
+       !!! FIXME:  off from silence. Maybe just don't use U16. */
+    case AUDIO_U16LSB:
+    case AUDIO_U16MSB:
+    case AUDIO_U8:
+        return 0x80;
 
-        default: break;
-    }            
+    default:
+        break;
+    }
 
     return 0x00;
 }
 
-void
-SDL_CalculateAudioSpec(SDL_AudioSpec * spec)
+void SDL_CalculateAudioSpec(SDL_AudioSpec *spec)
 {
     spec->silence = SDL_SilenceValueForFormat(spec->format);
     spec->size = SDL_AUDIO_BITSIZE(spec->format) / 8;
@@ -1758,13 +1689,11 @@ SDL_CalculateAudioSpec(SDL_AudioSpec * spec)
     spec->size *= spec->samples;
 }
 
-
 /*
  * Moved here from SDL_mixer.c, since it relies on internals of an opened
  *  audio device (and is deprecated, by the way!).
  */
-void
-SDL_MixAudio(Uint8 * dst, const Uint8 * src, Uint32 len, int volume)
+void SDL_MixAudio(Uint8 *dst, const Uint8 *src, Uint32 len, int volume)
 {
     /* Mix the user-level audio format */
     SDL_AudioDevice *device = get_audio_device(1);

src/audio/SDL_audio_c.h

@@ -40,11 +40,11 @@
 #include "samplerate.h"
 extern SDL_bool SRC_available;
 extern int SRC_converter;
-extern SRC_STATE* (*SRC_src_new)(int converter_type, int channels, int *error);
+extern SRC_STATE *(*SRC_src_new)(int converter_type, int channels, int *error);
 extern int (*SRC_src_process)(SRC_STATE *state, SRC_DATA *data);
 extern int (*SRC_src_reset)(SRC_STATE *state);
-extern SRC_STATE* (*SRC_src_delete)(SRC_STATE *state);
-extern const char* (*SRC_src_strerror)(int error);
+extern SRC_STATE *(*SRC_src_delete)(SRC_STATE *state);
+extern const char *(*SRC_src_strerror)(int error);
 extern int (*SRC_src_simple)(SRC_DATA *data, int converter_type, int channels);
 #endif
 
@@ -54,7 +54,7 @@ extern SDL_AudioFormat SDL_NextAudioFormat(void);
 
 /* Function to calculate the size and silence for a SDL_AudioSpec */
 extern Uint8 SDL_SilenceValueForFormat(const SDL_AudioFormat format);
-extern void SDL_CalculateAudioSpec(SDL_AudioSpec * spec);
+extern void SDL_CalculateAudioSpec(SDL_AudioSpec *spec);
 
 /* Choose the audio filter functions below */
 extern void SDL_ChooseAudioConverters(void);

src/audio/SDL_audio_channel_converters.h

@@ -21,18 +21,17 @@
 
 /* DO NOT EDIT, THIS FILE WAS GENERATED BY build-scripts/gen_audio_channel_conversion.c */
 
-static void SDLCALL
-SDL_ConvertMonoToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertMonoToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 2))) - 2;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 1;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 1) * 2))) - 2;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 1;
     int i;
 
     LOG_DEBUG_CONVERT("mono", "stereo");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 1); i; i--, src -= 1, dst -= 2) {
+    for (i = cvt->len_cvt / (sizeof(float) * 1); i; i--, src -= 1, dst -= 2) {
         const float srcFC = src[0];
         dst[1] /* FR */ = srcFC;
         dst[0] /* FL */ = srcFC;
@@ -40,22 +39,21 @@ SDL_ConvertMonoToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = cvt->len_cvt * 2;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertMonoTo21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertMonoTo21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 3))) - 3;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 1;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 1) * 3))) - 3;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 1;
     int i;
 
     LOG_DEBUG_CONVERT("mono", "2.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 1); i; i--, src -= 1, dst -= 3) {
+    for (i = cvt->len_cvt / (sizeof(float) * 1); i; i--, src -= 1, dst -= 3) {
         const float srcFC = src[0];
         dst[2] /* LFE */ = 0.0f;
         dst[1] /* FR */ = srcFC;
@@ -64,22 +62,21 @@ SDL_ConvertMonoTo21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = cvt->len_cvt * 3;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertMonoToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertMonoToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 4))) - 4;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 1;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 1) * 4))) - 4;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 1;
     int i;
 
     LOG_DEBUG_CONVERT("mono", "quad");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 1); i; i--, src -= 1, dst -= 4) {
+    for (i = cvt->len_cvt / (sizeof(float) * 1); i; i--, src -= 1, dst -= 4) {
         const float srcFC = src[0];
         dst[3] /* BR */ = 0.0f;
         dst[2] /* BL */ = 0.0f;
@@ -89,22 +86,21 @@ SDL_ConvertMonoToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = cvt->len_cvt * 4;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertMonoTo41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertMonoTo41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 5))) - 5;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 1;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 1) * 5))) - 5;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 1;
     int i;
 
     LOG_DEBUG_CONVERT("mono", "4.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 1); i; i--, src -= 1, dst -= 5) {
+    for (i = cvt->len_cvt / (sizeof(float) * 1); i; i--, src -= 1, dst -= 5) {
         const float srcFC = src[0];
         dst[4] /* BR */ = 0.0f;
         dst[3] /* BL */ = 0.0f;
@@ -115,22 +111,21 @@ SDL_ConvertMonoTo41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = cvt->len_cvt * 5;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertMonoTo51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertMonoTo51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 6))) - 6;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 1;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 1) * 6))) - 6;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 1;
     int i;
 
     LOG_DEBUG_CONVERT("mono", "5.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 1); i; i--, src -= 1, dst -= 6) {
+    for (i = cvt->len_cvt / (sizeof(float) * 1); i; i--, src -= 1, dst -= 6) {
         const float srcFC = src[0];
         dst[5] /* BR */ = 0.0f;
         dst[4] /* BL */ = 0.0f;
@@ -142,22 +137,21 @@ SDL_ConvertMonoTo51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = cvt->len_cvt * 6;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertMonoTo61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertMonoTo61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 7))) - 7;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 1;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 1) * 7))) - 7;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 1;
     int i;
 
     LOG_DEBUG_CONVERT("mono", "6.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 1); i; i--, src -= 1, dst -= 7) {
+    for (i = cvt->len_cvt / (sizeof(float) * 1); i; i--, src -= 1, dst -= 7) {
         const float srcFC = src[0];
         dst[6] /* SR */ = 0.0f;
         dst[5] /* SL */ = 0.0f;
@@ -170,22 +164,21 @@ SDL_ConvertMonoTo61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = cvt->len_cvt * 7;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertMonoTo71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertMonoTo71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 1) * 8))) - 8;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 1;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 1) * 8))) - 8;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 1;
     int i;
 
     LOG_DEBUG_CONVERT("mono", "7.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 1); i; i--, src -= 1, dst -= 8) {
+    for (i = cvt->len_cvt / (sizeof(float) * 1); i; i--, src -= 1, dst -= 8) {
         const float srcFC = src[0];
         dst[7] /* SR */ = 0.0f;
         dst[6] /* SL */ = 0.0f;
@@ -199,42 +192,40 @@ SDL_ConvertMonoTo71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = cvt->len_cvt * 8;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertStereoToMono(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertStereoToMono(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("stereo", "mono");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 2); i; i--, src += 2, dst += 1) {
+    for (i = cvt->len_cvt / (sizeof(float) * 2); i; i--, src += 2, dst += 1) {
         dst[0] /* FC */ = (src[0] * 0.500000000f) + (src[1] * 0.500000000f);
     }
 
     cvt->len_cvt = cvt->len_cvt / 2;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertStereoTo21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertStereoTo21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 2) * 3))) - 3;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 2;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 2) * 3))) - 3;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 2;
     int i;
 
     LOG_DEBUG_CONVERT("stereo", "2.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 2); i; i--, src -= 2, dst -= 3) {
+    for (i = cvt->len_cvt / (sizeof(float) * 2); i; i--, src -= 2, dst -= 3) {
         dst[2] /* LFE */ = 0.0f;
         dst[1] /* FR */ = src[1];
         dst[0] /* FL */ = src[0];
@@ -242,22 +233,21 @@ SDL_ConvertStereoTo21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 2) * 3;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertStereoToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertStereoToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 2) * 4))) - 4;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 2;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 2) * 4))) - 4;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 2;
     int i;
 
     LOG_DEBUG_CONVERT("stereo", "quad");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 2); i; i--, src -= 2, dst -= 4) {
+    for (i = cvt->len_cvt / (sizeof(float) * 2); i; i--, src -= 2, dst -= 4) {
         dst[3] /* BR */ = 0.0f;
         dst[2] /* BL */ = 0.0f;
         dst[1] /* FR */ = src[1];
@@ -266,22 +256,21 @@ SDL_ConvertStereoToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 2) * 4;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertStereoTo41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertStereoTo41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 2) * 5))) - 5;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 2;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 2) * 5))) - 5;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 2;
     int i;
 
     LOG_DEBUG_CONVERT("stereo", "4.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 2); i; i--, src -= 2, dst -= 5) {
+    for (i = cvt->len_cvt / (sizeof(float) * 2); i; i--, src -= 2, dst -= 5) {
         dst[4] /* BR */ = 0.0f;
         dst[3] /* BL */ = 0.0f;
         dst[2] /* LFE */ = 0.0f;
@@ -291,22 +280,21 @@ SDL_ConvertStereoTo41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 2) * 5;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertStereoTo51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertStereoTo51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 2) * 6))) - 6;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 2;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 2) * 6))) - 6;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 2;
     int i;
 
     LOG_DEBUG_CONVERT("stereo", "5.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 2); i; i--, src -= 2, dst -= 6) {
+    for (i = cvt->len_cvt / (sizeof(float) * 2); i; i--, src -= 2, dst -= 6) {
         dst[5] /* BR */ = 0.0f;
         dst[4] /* BL */ = 0.0f;
         dst[3] /* LFE */ = 0.0f;
@@ -317,22 +305,21 @@ SDL_ConvertStereoTo51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 2) * 6;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertStereoTo61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertStereoTo61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 2) * 7))) - 7;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 2;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 2) * 7))) - 7;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 2;
     int i;
 
     LOG_DEBUG_CONVERT("stereo", "6.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 2); i; i--, src -= 2, dst -= 7) {
+    for (i = cvt->len_cvt / (sizeof(float) * 2); i; i--, src -= 2, dst -= 7) {
         dst[6] /* SR */ = 0.0f;
         dst[5] /* SL */ = 0.0f;
         dst[4] /* BC */ = 0.0f;
@@ -344,22 +331,21 @@ SDL_ConvertStereoTo61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 2) * 7;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertStereoTo71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertStereoTo71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 2) * 8))) - 8;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 2;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 2) * 8))) - 8;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 2;
     int i;
 
     LOG_DEBUG_CONVERT("stereo", "7.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 2); i; i--, src -= 2, dst -= 8) {
+    for (i = cvt->len_cvt / (sizeof(float) * 2); i; i--, src -= 2, dst -= 8) {
         dst[7] /* SR */ = 0.0f;
         dst[6] /* SL */ = 0.0f;
         dst[5] /* BR */ = 0.0f;
@@ -372,41 +358,39 @@ SDL_ConvertStereoTo71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 2) * 8;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert21ToMono(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert21ToMono(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("2.1", "mono");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 3); i; i--, src += 3, dst += 1) {
+    for (i = cvt->len_cvt / (sizeof(float) * 3); i; i--, src += 3, dst += 1) {
         dst[0] /* FC */ = (src[0] * 0.333333343f) + (src[1] * 0.333333343f) + (src[2] * 0.333333343f);
     }
 
     cvt->len_cvt = cvt->len_cvt / 3;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert21ToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert21ToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("2.1", "stereo");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 3); i; i--, src += 3, dst += 2) {
+    for (i = cvt->len_cvt / (sizeof(float) * 3); i; i--, src += 3, dst += 2) {
         const float srcLFE = src[2];
         dst[0] /* FL */ = (src[0] * 0.800000012f) + (srcLFE * 0.200000003f);
         dst[1] /* FR */ = (src[1] * 0.800000012f) + (srcLFE * 0.200000003f);
@@ -414,22 +398,21 @@ SDL_Convert21ToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 3) * 2;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert21ToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert21ToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 3) * 4))) - 4;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 3;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 3) * 4))) - 4;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 3;
     int i;
 
     LOG_DEBUG_CONVERT("2.1", "quad");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 3); i; i--, src -= 3, dst -= 4) {
+    for (i = cvt->len_cvt / (sizeof(float) * 3); i; i--, src -= 3, dst -= 4) {
         const float srcLFE = src[2];
         dst[3] /* BR */ = (srcLFE * 0.111111112f);
         dst[2] /* BL */ = (srcLFE * 0.111111112f);
@@ -439,22 +422,21 @@ SDL_Convert21ToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 3) * 4;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert21To41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert21To41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 3) * 5))) - 5;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 3;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 3) * 5))) - 5;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 3;
     int i;
 
     LOG_DEBUG_CONVERT("2.1", "4.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 3); i; i--, src -= 3, dst -= 5) {
+    for (i = cvt->len_cvt / (sizeof(float) * 3); i; i--, src -= 3, dst -= 5) {
         dst[4] /* BR */ = 0.0f;
         dst[3] /* BL */ = 0.0f;
         dst[2] /* LFE */ = src[2];
@@ -464,22 +446,21 @@ SDL_Convert21To41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 3) * 5;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert21To51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert21To51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 3) * 6))) - 6;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 3;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 3) * 6))) - 6;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 3;
     int i;
 
     LOG_DEBUG_CONVERT("2.1", "5.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 3); i; i--, src -= 3, dst -= 6) {
+    for (i = cvt->len_cvt / (sizeof(float) * 3); i; i--, src -= 3, dst -= 6) {
         dst[5] /* BR */ = 0.0f;
         dst[4] /* BL */ = 0.0f;
         dst[3] /* LFE */ = src[2];
@@ -490,22 +471,21 @@ SDL_Convert21To51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 3) * 6;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert21To61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert21To61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 3) * 7))) - 7;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 3;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 3) * 7))) - 7;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 3;
     int i;
 
     LOG_DEBUG_CONVERT("2.1", "6.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 3); i; i--, src -= 3, dst -= 7) {
+    for (i = cvt->len_cvt / (sizeof(float) * 3); i; i--, src -= 3, dst -= 7) {
         dst[6] /* SR */ = 0.0f;
         dst[5] /* SL */ = 0.0f;
         dst[4] /* BC */ = 0.0f;
@@ -517,22 +497,21 @@ SDL_Convert21To61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 3) * 7;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert21To71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert21To71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 3) * 8))) - 8;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 3;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 3) * 8))) - 8;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 3;
     int i;
 
     LOG_DEBUG_CONVERT("2.1", "7.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 3); i; i--, src -= 3, dst -= 8) {
+    for (i = cvt->len_cvt / (sizeof(float) * 3); i; i--, src -= 3, dst -= 8) {
         dst[7] /* SR */ = 0.0f;
         dst[6] /* SL */ = 0.0f;
         dst[5] /* BR */ = 0.0f;
@@ -545,41 +524,39 @@ SDL_Convert21To71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 3) * 8;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertQuadToMono(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertQuadToMono(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("quad", "mono");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 4); i; i--, src += 4, dst += 1) {
+    for (i = cvt->len_cvt / (sizeof(float) * 4); i; i--, src += 4, dst += 1) {
         dst[0] /* FC */ = (src[0] * 0.250000000f) + (src[1] * 0.250000000f) + (src[2] * 0.250000000f) + (src[3] * 0.250000000f);
     }
 
     cvt->len_cvt = cvt->len_cvt / 4;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertQuadToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertQuadToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("quad", "stereo");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 4); i; i--, src += 4, dst += 2) {
+    for (i = cvt->len_cvt / (sizeof(float) * 4); i; i--, src += 4, dst += 2) {
         const float srcBL = src[2];
         const float srcBR = src[3];
         dst[0] /* FL */ = (src[0] * 0.421000004f) + (srcBL * 0.358999997f) + (srcBR * 0.219999999f);
@@ -588,21 +565,20 @@ SDL_ConvertQuadToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 4) * 2;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertQuadTo21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertQuadTo21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("quad", "2.1");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 4); i; i--, src += 4, dst += 3) {
+    for (i = cvt->len_cvt / (sizeof(float) * 4); i; i--, src += 4, dst += 3) {
         const float srcBL = src[2];
         const float srcBR = src[3];
         dst[0] /* FL */ = (src[0] * 0.421000004f) + (srcBL * 0.358999997f) + (srcBR * 0.219999999f);
@@ -612,22 +588,21 @@ SDL_ConvertQuadTo21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 4) * 3;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertQuadTo41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertQuadTo41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 4) * 5))) - 5;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 4;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 4) * 5))) - 5;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 4;
     int i;
 
     LOG_DEBUG_CONVERT("quad", "4.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 4); i; i--, src -= 4, dst -= 5) {
+    for (i = cvt->len_cvt / (sizeof(float) * 4); i; i--, src -= 4, dst -= 5) {
         dst[4] /* BR */ = src[3];
         dst[3] /* BL */ = src[2];
         dst[2] /* LFE */ = 0.0f;
@@ -637,22 +612,21 @@ SDL_ConvertQuadTo41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 4) * 5;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertQuadTo51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertQuadTo51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 4) * 6))) - 6;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 4;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 4) * 6))) - 6;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 4;
     int i;
 
     LOG_DEBUG_CONVERT("quad", "5.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 4); i; i--, src -= 4, dst -= 6) {
+    for (i = cvt->len_cvt / (sizeof(float) * 4); i; i--, src -= 4, dst -= 6) {
         dst[5] /* BR */ = src[3];
         dst[4] /* BL */ = src[2];
         dst[3] /* LFE */ = 0.0f;
@@ -663,22 +637,21 @@ SDL_ConvertQuadTo51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 4) * 6;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertQuadTo61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertQuadTo61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 4) * 7))) - 7;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 4;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 4) * 7))) - 7;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 4;
     int i;
 
     LOG_DEBUG_CONVERT("quad", "6.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 4); i; i--, src -= 4, dst -= 7) {
+    for (i = cvt->len_cvt / (sizeof(float) * 4); i; i--, src -= 4, dst -= 7) {
         const float srcBL = src[2];
         const float srcBR = src[3];
         dst[6] /* SR */ = (srcBR * 0.796000004f);
@@ -692,22 +665,21 @@ SDL_ConvertQuadTo61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 4) * 7;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_ConvertQuadTo71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertQuadTo71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 4) * 8))) - 8;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 4;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 4) * 8))) - 8;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 4;
     int i;
 
     LOG_DEBUG_CONVERT("quad", "7.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 4); i; i--, src -= 4, dst -= 8) {
+    for (i = cvt->len_cvt / (sizeof(float) * 4); i; i--, src -= 4, dst -= 8) {
         dst[7] /* SR */ = 0.0f;
         dst[6] /* SL */ = 0.0f;
         dst[5] /* BR */ = src[3];
@@ -720,41 +692,39 @@ SDL_ConvertQuadTo71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 4) * 8;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert41ToMono(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert41ToMono(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("4.1", "mono");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 5); i; i--, src += 5, dst += 1) {
+    for (i = cvt->len_cvt / (sizeof(float) * 5); i; i--, src += 5, dst += 1) {
         dst[0] /* FC */ = (src[0] * 0.200000003f) + (src[1] * 0.200000003f) + (src[2] * 0.200000003f) + (src[3] * 0.200000003f) + (src[4] * 0.200000003f);
     }
 
     cvt->len_cvt = cvt->len_cvt / 5;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert41ToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert41ToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("4.1", "stereo");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 5); i; i--, src += 5, dst += 2) {
+    for (i = cvt->len_cvt / (sizeof(float) * 5); i; i--, src += 5, dst += 2) {
         const float srcLFE = src[2];
         const float srcBL = src[3];
         const float srcBR = src[4];
@@ -764,21 +734,20 @@ SDL_Convert41ToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 5) * 2;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert41To21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert41To21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("4.1", "2.1");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 5); i; i--, src += 5, dst += 3) {
+    for (i = cvt->len_cvt / (sizeof(float) * 5); i; i--, src += 5, dst += 3) {
         const float srcBL = src[3];
         const float srcBR = src[4];
         dst[0] /* FL */ = (src[0] * 0.421000004f) + (srcBL * 0.358999997f) + (srcBR * 0.219999999f);
@@ -788,21 +757,20 @@ SDL_Convert41To21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 5) * 3;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert41ToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert41ToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("4.1", "quad");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 5); i; i--, src += 5, dst += 4) {
+    for (i = cvt->len_cvt / (sizeof(float) * 5); i; i--, src += 5, dst += 4) {
         const float srcLFE = src[2];
         dst[0] /* FL */ = (src[0] * 0.941176474f) + (srcLFE * 0.058823530f);
         dst[1] /* FR */ = (src[1] * 0.941176474f) + (srcLFE * 0.058823530f);
@@ -812,22 +780,21 @@ SDL_Convert41ToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 5) * 4;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert41To51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert41To51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 5) * 6))) - 6;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 5;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 5) * 6))) - 6;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 5;
     int i;
 
     LOG_DEBUG_CONVERT("4.1", "5.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 5); i; i--, src -= 5, dst -= 6) {
+    for (i = cvt->len_cvt / (sizeof(float) * 5); i; i--, src -= 5, dst -= 6) {
         dst[5] /* BR */ = src[4];
         dst[4] /* BL */ = src[3];
         dst[3] /* LFE */ = src[2];
@@ -838,22 +805,21 @@ SDL_Convert41To51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 5) * 6;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert41To61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert41To61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 5) * 7))) - 7;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 5;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 5) * 7))) - 7;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 5;
     int i;
 
     LOG_DEBUG_CONVERT("4.1", "6.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 5); i; i--, src -= 5, dst -= 7) {
+    for (i = cvt->len_cvt / (sizeof(float) * 5); i; i--, src -= 5, dst -= 7) {
         const float srcBL = src[3];
         const float srcBR = src[4];
         dst[6] /* SR */ = (srcBR * 0.796000004f);
@@ -867,22 +833,21 @@ SDL_Convert41To61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 5) * 7;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert41To71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert41To71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 5) * 8))) - 8;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 5;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 5) * 8))) - 8;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 5;
     int i;
 
     LOG_DEBUG_CONVERT("4.1", "7.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 5); i; i--, src -= 5, dst -= 8) {
+    for (i = cvt->len_cvt / (sizeof(float) * 5); i; i--, src -= 5, dst -= 8) {
         dst[7] /* SR */ = 0.0f;
         dst[6] /* SL */ = 0.0f;
         dst[5] /* BR */ = src[4];
@@ -895,41 +860,39 @@ SDL_Convert41To71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 5) * 8;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert51ToMono(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert51ToMono(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("5.1", "mono");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 6); i; i--, src += 6, dst += 1) {
+    for (i = cvt->len_cvt / (sizeof(float) * 6); i; i--, src += 6, dst += 1) {
         dst[0] /* FC */ = (src[0] * 0.166666672f) + (src[1] * 0.166666672f) + (src[2] * 0.166666672f) + (src[3] * 0.166666672f) + (src[4] * 0.166666672f) + (src[5] * 0.166666672f);
     }
 
     cvt->len_cvt = cvt->len_cvt / 6;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert51ToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert51ToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("5.1", "stereo");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 6); i; i--, src += 6, dst += 2) {
+    for (i = cvt->len_cvt / (sizeof(float) * 6); i; i--, src += 6, dst += 2) {
         const float srcFC = src[2];
         const float srcLFE = src[3];
         const float srcBL = src[4];
@@ -940,21 +903,20 @@ SDL_Convert51ToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 6) * 2;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert51To21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert51To21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("5.1", "2.1");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 6); i; i--, src += 6, dst += 3) {
+    for (i = cvt->len_cvt / (sizeof(float) * 6); i; i--, src += 6, dst += 3) {
         const float srcFC = src[2];
         const float srcBL = src[4];
         const float srcBR = src[5];
@@ -965,21 +927,20 @@ SDL_Convert51To21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 6) * 3;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert51ToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert51ToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("5.1", "quad");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 6); i; i--, src += 6, dst += 4) {
+    for (i = cvt->len_cvt / (sizeof(float) * 6); i; i--, src += 6, dst += 4) {
         const float srcFC = src[2];
         const float srcLFE = src[3];
         dst[0] /* FL */ = (src[0] * 0.558095276f) + (srcFC * 0.394285709f) + (srcLFE * 0.047619049f);
@@ -990,21 +951,20 @@ SDL_Convert51ToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 6) * 4;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert51To41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert51To41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("5.1", "4.1");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 6); i; i--, src += 6, dst += 5) {
+    for (i = cvt->len_cvt / (sizeof(float) * 6); i; i--, src += 6, dst += 5) {
         const float srcFC = src[2];
         dst[0] /* FL */ = (src[0] * 0.586000025f) + (srcFC * 0.414000005f);
         dst[1] /* FR */ = (src[1] * 0.586000025f) + (srcFC * 0.414000005f);
@@ -1015,22 +975,21 @@ SDL_Convert51To41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 6) * 5;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert51To61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert51To61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 6) * 7))) - 7;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 6;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 6) * 7))) - 7;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 6;
     int i;
 
     LOG_DEBUG_CONVERT("5.1", "6.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 6); i; i--, src -= 6, dst -= 7) {
+    for (i = cvt->len_cvt / (sizeof(float) * 6); i; i--, src -= 6, dst -= 7) {
         const float srcBL = src[4];
         const float srcBR = src[5];
         dst[6] /* SR */ = (srcBR * 0.796000004f);
@@ -1044,22 +1003,21 @@ SDL_Convert51To61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 6) * 7;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert51To71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert51To71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 6) * 8))) - 8;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 6;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 6) * 8))) - 8;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 6;
     int i;
 
     LOG_DEBUG_CONVERT("5.1", "7.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 6); i; i--, src -= 6, dst -= 8) {
+    for (i = cvt->len_cvt / (sizeof(float) * 6); i; i--, src -= 6, dst -= 8) {
         dst[7] /* SR */ = 0.0f;
         dst[6] /* SL */ = 0.0f;
         dst[5] /* BR */ = src[5];
@@ -1072,41 +1030,39 @@ SDL_Convert51To71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 6) * 8;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert61ToMono(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert61ToMono(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("6.1", "mono");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 7); i; i--, src += 7, dst += 1) {
+    for (i = cvt->len_cvt / (sizeof(float) * 7); i; i--, src += 7, dst += 1) {
         dst[0] /* FC */ = (src[0] * 0.143142849f) + (src[1] * 0.143142849f) + (src[2] * 0.143142849f) + (src[3] * 0.142857149f) + (src[4] * 0.143142849f) + (src[5] * 0.143142849f) + (src[6] * 0.143142849f);
     }
 
     cvt->len_cvt = cvt->len_cvt / 7;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert61ToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert61ToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("6.1", "stereo");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 7); i; i--, src += 7, dst += 2) {
+    for (i = cvt->len_cvt / (sizeof(float) * 7); i; i--, src += 7, dst += 2) {
         const float srcFC = src[2];
         const float srcLFE = src[3];
         const float srcBC = src[4];
@@ -1118,21 +1074,20 @@ SDL_Convert61ToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 7) * 2;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert61To21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert61To21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("6.1", "2.1");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 7); i; i--, src += 7, dst += 3) {
+    for (i = cvt->len_cvt / (sizeof(float) * 7); i; i--, src += 7, dst += 3) {
         const float srcFC = src[2];
         const float srcBC = src[4];
         const float srcSL = src[5];
@@ -1144,21 +1099,20 @@ SDL_Convert61To21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 7) * 3;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert61ToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert61ToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("6.1", "quad");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 7); i; i--, src += 7, dst += 4) {
+    for (i = cvt->len_cvt / (sizeof(float) * 7); i; i--, src += 7, dst += 4) {
         const float srcFC = src[2];
         const float srcLFE = src[3];
         const float srcBC = src[4];
@@ -1172,21 +1126,20 @@ SDL_Convert61ToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 7) * 4;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert61To41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert61To41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("6.1", "4.1");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 7); i; i--, src += 7, dst += 5) {
+    for (i = cvt->len_cvt / (sizeof(float) * 7); i; i--, src += 7, dst += 5) {
         const float srcFC = src[2];
         const float srcBC = src[4];
         const float srcSL = src[5];
@@ -1200,21 +1153,20 @@ SDL_Convert61To41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 7) * 5;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert61To51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert61To51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("6.1", "5.1");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 7); i; i--, src += 7, dst += 6) {
+    for (i = cvt->len_cvt / (sizeof(float) * 7); i; i--, src += 7, dst += 6) {
         const float srcBC = src[4];
         const float srcSL = src[5];
         const float srcSR = src[6];
@@ -1228,22 +1180,21 @@ SDL_Convert61To51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 7) * 6;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert61To71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert61To71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + ((cvt->len_cvt / 7) * 8))) - 8;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 7;
+    float *dst = ((float *)(cvt->buf + ((cvt->len_cvt / 7) * 8))) - 8;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 7;
     int i;
 
     LOG_DEBUG_CONVERT("6.1", "7.1");
     SDL_assert(format == AUDIO_F32SYS);
 
     /* convert backwards, since output is growing in-place. */
-    for (i = cvt->len_cvt / (sizeof (float) * 7); i; i--, src -= 7, dst -= 8) {
+    for (i = cvt->len_cvt / (sizeof(float) * 7); i; i--, src -= 7, dst -= 8) {
         const float srcBC = src[4];
         dst[7] /* SR */ = src[6];
         dst[6] /* SL */ = src[5];
@@ -1257,41 +1208,39 @@ SDL_Convert61To71(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 7) * 8;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert71ToMono(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert71ToMono(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("7.1", "mono");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 8); i; i--, src += 8, dst += 1) {
+    for (i = cvt->len_cvt / (sizeof(float) * 8); i; i--, src += 8, dst += 1) {
         dst[0] /* FC */ = (src[0] * 0.125125006f) + (src[1] * 0.125125006f) + (src[2] * 0.125125006f) + (src[3] * 0.125000000f) + (src[4] * 0.125125006f) + (src[5] * 0.125125006f) + (src[6] * 0.125125006f) + (src[7] * 0.125125006f);
     }
 
     cvt->len_cvt = cvt->len_cvt / 8;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert71ToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert71ToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("7.1", "stereo");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 8); i; i--, src += 8, dst += 2) {
+    for (i = cvt->len_cvt / (sizeof(float) * 8); i; i--, src += 8, dst += 2) {
         const float srcFC = src[2];
         const float srcLFE = src[3];
         const float srcBL = src[4];
@@ -1304,21 +1253,20 @@ SDL_Convert71ToStereo(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 8) * 2;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert71To21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert71To21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("7.1", "2.1");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 8); i; i--, src += 8, dst += 3) {
+    for (i = cvt->len_cvt / (sizeof(float) * 8); i; i--, src += 8, dst += 3) {
         const float srcFC = src[2];
         const float srcBL = src[4];
         const float srcBR = src[5];
@@ -1331,21 +1279,20 @@ SDL_Convert71To21(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 8) * 3;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert71ToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert71ToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("7.1", "quad");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 8); i; i--, src += 8, dst += 4) {
+    for (i = cvt->len_cvt / (sizeof(float) * 8); i; i--, src += 8, dst += 4) {
         const float srcFC = src[2];
         const float srcLFE = src[3];
         const float srcSL = src[6];
@@ -1358,21 +1305,20 @@ SDL_Convert71ToQuad(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 8) * 4;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert71To41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert71To41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("7.1", "4.1");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 8); i; i--, src += 8, dst += 5) {
+    for (i = cvt->len_cvt / (sizeof(float) * 8); i; i--, src += 8, dst += 5) {
         const float srcFC = src[2];
         const float srcSL = src[6];
         const float srcSR = src[7];
@@ -1385,21 +1331,20 @@ SDL_Convert71To41(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 8) * 5;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert71To51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert71To51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("7.1", "5.1");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 8); i; i--, src += 8, dst += 6) {
+    for (i = cvt->len_cvt / (sizeof(float) * 8); i; i--, src += 8, dst += 6) {
         const float srcSL = src[6];
         const float srcSR = src[7];
         dst[0] /* FL */ = (src[0] * 0.518000007f) + (srcSL * 0.188999996f);
@@ -1412,21 +1357,20 @@ SDL_Convert71To51(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 8) * 6;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static void SDLCALL
-SDL_Convert71To61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert71To61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i;
 
     LOG_DEBUG_CONVERT("7.1", "6.1");
     SDL_assert(format == AUDIO_F32SYS);
 
-    for (i = cvt->len_cvt / (sizeof (float) * 8); i; i--, src += 8, dst += 7) {
+    for (i = cvt->len_cvt / (sizeof(float) * 8); i; i--, src += 8, dst += 7) {
         const float srcBL = src[4];
         const float srcBR = src[5];
         dst[0] /* FL */ = (src[0] * 0.541000009f);
@@ -1440,20 +1384,19 @@ SDL_Convert71To61(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 
     cvt->len_cvt = (cvt->len_cvt / 8) * 7;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 
-static const SDL_AudioFilter channel_converters[8][8] = {   /* [from][to] */
-    { NULL, SDL_ConvertMonoToStereo, SDL_ConvertMonoTo21, SDL_ConvertMonoToQuad, SDL_ConvertMonoTo41, SDL_ConvertMonoTo51, SDL_ConvertMonoTo61, SDL_ConvertMonoTo71 },
-    { SDL_ConvertStereoToMono, NULL, SDL_ConvertStereoTo21, SDL_ConvertStereoToQuad, SDL_ConvertStereoTo41, SDL_ConvertStereoTo51, SDL_ConvertStereoTo61, SDL_ConvertStereoTo71 },
-    { SDL_Convert21ToMono, SDL_Convert21ToStereo, NULL, SDL_Convert21ToQuad, SDL_Convert21To41, SDL_Convert21To51, SDL_Convert21To61, SDL_Convert21To71 },
-    { SDL_ConvertQuadToMono, SDL_ConvertQuadToStereo, SDL_ConvertQuadTo21, NULL, SDL_ConvertQuadTo41, SDL_ConvertQuadTo51, SDL_ConvertQuadTo61, SDL_ConvertQuadTo71 },
-    { SDL_Convert41ToMono, SDL_Convert41ToStereo, SDL_Convert41To21, SDL_Convert41ToQuad, NULL, SDL_Convert41To51, SDL_Convert41To61, SDL_Convert41To71 },
-    { SDL_Convert51ToMono, SDL_Convert51ToStereo, SDL_Convert51To21, SDL_Convert51ToQuad, SDL_Convert51To41, NULL, SDL_Convert51To61, SDL_Convert51To71 },
-    { SDL_Convert61ToMono, SDL_Convert61ToStereo, SDL_Convert61To21, SDL_Convert61ToQuad, SDL_Convert61To41, SDL_Convert61To51, NULL, SDL_Convert61To71 },
-    { SDL_Convert71ToMono, SDL_Convert71ToStereo, SDL_Convert71To21, SDL_Convert71ToQuad, SDL_Convert71To41, SDL_Convert71To51, SDL_Convert71To61, NULL }
+static const SDL_AudioFilter channel_converters[8][8] = { /* [from][to] */
+                                                          { NULL, SDL_ConvertMonoToStereo, SDL_ConvertMonoTo21, SDL_ConvertMonoToQuad, SDL_ConvertMonoTo41, SDL_ConvertMonoTo51, SDL_ConvertMonoTo61, SDL_ConvertMonoTo71 },
+                                                          { SDL_ConvertStereoToMono, NULL, SDL_ConvertStereoTo21, SDL_ConvertStereoToQuad, SDL_ConvertStereoTo41, SDL_ConvertStereoTo51, SDL_ConvertStereoTo61, SDL_ConvertStereoTo71 },
+                                                          { SDL_Convert21ToMono, SDL_Convert21ToStereo, NULL, SDL_Convert21ToQuad, SDL_Convert21To41, SDL_Convert21To51, SDL_Convert21To61, SDL_Convert21To71 },
+                                                          { SDL_ConvertQuadToMono, SDL_ConvertQuadToStereo, SDL_ConvertQuadTo21, NULL, SDL_ConvertQuadTo41, SDL_ConvertQuadTo51, SDL_ConvertQuadTo61, SDL_ConvertQuadTo71 },
+                                                          { SDL_Convert41ToMono, SDL_Convert41ToStereo, SDL_Convert41To21, SDL_Convert41ToQuad, NULL, SDL_Convert41To51, SDL_Convert41To61, SDL_Convert41To71 },
+                                                          { SDL_Convert51ToMono, SDL_Convert51ToStereo, SDL_Convert51To21, SDL_Convert51ToQuad, SDL_Convert51To41, NULL, SDL_Convert51To61, SDL_Convert51To71 },
+                                                          { SDL_Convert61ToMono, SDL_Convert61ToStereo, SDL_Convert61To21, SDL_Convert61ToQuad, SDL_Convert61To41, SDL_Convert61To51, NULL, SDL_Convert61To71 },
+                                                          { SDL_Convert71ToMono, SDL_Convert71ToStereo, SDL_Convert71To21, SDL_Convert71ToQuad, SDL_Convert71To41, SDL_Convert71To51, SDL_Convert71To61, NULL }
 };
 
 /* vi: set ts=4 sw=4 expandtab: */
-

src/audio/SDL_audio_resampler_filter.h

@@ -21,10 +21,10 @@
 
 /* DO NOT EDIT, THIS FILE WAS GENERATED BY build-scripts/gen_audio_resampler_filter.c */
 
-#define RESAMPLER_ZERO_CROSSINGS 5
-#define RESAMPLER_BITS_PER_SAMPLE 16
+#define RESAMPLER_ZERO_CROSSINGS            5
+#define RESAMPLER_BITS_PER_SAMPLE           16
 #define RESAMPLER_SAMPLES_PER_ZERO_CROSSING (1 << ((RESAMPLER_BITS_PER_SAMPLE / 2) + 1))
-#define RESAMPLER_FILTER_SIZE ((RESAMPLER_SAMPLES_PER_ZERO_CROSSING * RESAMPLER_ZERO_CROSSINGS) + 1)
+#define RESAMPLER_FILTER_SIZE               ((RESAMPLER_SAMPLES_PER_ZERO_CROSSING * RESAMPLER_ZERO_CROSSINGS) + 1)
 
 static const float ResamplerFilter[RESAMPLER_FILTER_SIZE] = {
     1.000000000f, 0.999993682f, 0.999974370f, 0.999941289f, 0.999894559f,
@@ -1059,4 +1059,3 @@ static const float ResamplerFilterDifference[RESAMPLER_FILTER_SIZE] = {
 };
 
 /* vi: set ts=4 sw=4 expandtab: */
-

src/audio/SDL_audiocvt.c

@@ -44,16 +44,16 @@
 #define HAVE_AVX_INTRINSICS 1
 #endif
 #if defined __clang__
-# if (!__has_attribute(target))
-#   undef HAVE_AVX_INTRINSICS
-# endif
-# if (defined(_MSC_VER) || defined(__SCE__)) && !defined(__AVX__)
-#   undef HAVE_AVX_INTRINSICS
-# endif
+#if (!__has_attribute(target))
+#undef HAVE_AVX_INTRINSICS
+#endif
+#if (defined(_MSC_VER) || defined(__SCE__)) && !defined(__AVX__)
+#undef HAVE_AVX_INTRINSICS
+#endif
 #elif defined __GNUC__
-# if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 9)
-#   undef HAVE_AVX_INTRINSICS
-# endif
+#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 9)
+#undef HAVE_AVX_INTRINSICS
+#endif
 #endif
 
 /*
@@ -91,11 +91,10 @@
 
 #if HAVE_SSE3_INTRINSICS
 /* Convert from stereo to mono. Average left and right. */
-static void SDLCALL
-SDL_ConvertStereoToMono_SSE3(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertStereoToMono_SSE3(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
     const __m128 divby2 = _mm_set1_ps(0.5f);
-    float *dst = (float *) cvt->buf;
+    float *dst = (float *)cvt->buf;
     const float *src = dst;
     int i = cvt->len_cvt / 8;
 
@@ -105,32 +104,35 @@ SDL_ConvertStereoToMono_SSE3(SDL_AudioCVT * cvt, SDL_AudioFormat format)
     /* Do SSE blocks as long as we have 16 bytes available.
        Just use unaligned load/stores, if the memory at runtime is
        aligned it'll be just as fast on modern processors */
-    while (i >= 4) {   /* 4 * float32 */
-        _mm_storeu_ps(dst, _mm_mul_ps(_mm_hadd_ps(_mm_loadu_ps(src), _mm_loadu_ps(src+4)), divby2));
-        i -= 4; src += 8; dst += 4;
+    while (i >= 4) { /* 4 * float32 */
+        _mm_storeu_ps(dst, _mm_mul_ps(_mm_hadd_ps(_mm_loadu_ps(src), _mm_loadu_ps(src + 4)), divby2));
+        i -= 4;
+        src += 8;
+        dst += 4;
     }
 
     /* Finish off any leftovers with scalar operations. */
     while (i) {
         *dst = (src[0] + src[1]) * 0.5f;
-        dst++; i--; src += 2;
+        dst++;
+        i--;
+        src += 2;
     }
 
     cvt->len_cvt /= 2;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 #endif
 
 #if HAVE_SSE_INTRINSICS
 /* Convert from mono to stereo. Duplicate to stereo left and right. */
-static void SDLCALL
-SDL_ConvertMonoToStereo_SSE(SDL_AudioCVT * cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_ConvertMonoToStereo_SSE(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    float *dst = ((float *) (cvt->buf + (cvt->len_cvt * 2))) - 8;
-    const float *src = ((const float *) (cvt->buf + cvt->len_cvt)) - 4;
-    int i = cvt->len_cvt / sizeof (float);
+    float *dst = ((float *)(cvt->buf + (cvt->len_cvt * 2))) - 8;
+    const float *src = ((const float *)(cvt->buf + cvt->len_cvt)) - 4;
+    int i = cvt->len_cvt / sizeof(float);
 
     LOG_DEBUG_CONVERT("mono", "stereo (using SSE)");
     SDL_assert(format == AUDIO_F32SYS);
@@ -139,42 +141,43 @@ SDL_ConvertMonoToStereo_SSE(SDL_AudioCVT * cvt, SDL_AudioFormat format)
        Just use unaligned load/stores, if the memory at runtime is
        aligned it'll be just as fast on modern processors */
     /* convert backwards, since output is growing in-place. */
-    while (i >= 4) {   /* 4 * float32 */
-        const __m128 input = _mm_loadu_ps(src);   /* A B C D */
-        _mm_storeu_ps(dst, _mm_unpacklo_ps(input, input));  /* A A B B */
-        _mm_storeu_ps(dst+4, _mm_unpackhi_ps(input, input));  /* C C D D */
-        i -= 4; src -= 4; dst -= 8;
+    while (i >= 4) {                                           /* 4 * float32 */
+        const __m128 input = _mm_loadu_ps(src);                /* A B C D */
+        _mm_storeu_ps(dst, _mm_unpacklo_ps(input, input));     /* A A B B */
+        _mm_storeu_ps(dst + 4, _mm_unpackhi_ps(input, input)); /* C C D D */
+        i -= 4;
+        src -= 4;
+        dst -= 8;
     }
 
     /* Finish off any leftovers with scalar operations. */
-    src += 3; dst += 6;  /* adjust for smaller buffers. */
-    while (i) {     /* convert backwards, since output is growing in-place. */
+    src += 3;
+    dst += 6;   /* adjust for smaller buffers. */
+    while (i) { /* convert backwards, since output is growing in-place. */
         const float srcFC = src[0];
         dst[1] /* FR */ = srcFC;
         dst[0] /* FL */ = srcFC;
-        i--; src--; dst -= 2;
+        i--;
+        src--;
+        dst -= 2;
     }
 
     cvt->len_cvt *= 2;
     if (cvt->filters[++cvt->filter_index]) {
-        cvt->filters[cvt->filter_index] (cvt, format);
+        cvt->filters[cvt->filter_index](cvt, format);
     }
 }
 #endif
 
-
 /* Include the autogenerated channel converters... */
 #include "SDL_audio_channel_converters.h"
 
-
-
 /* SDL's resampler uses a "bandlimited interpolation" algorithm:
      https://ccrma.stanford.edu/~jos/resample/ */
 
 #include "SDL_audio_resampler_filter.h"
 
-static int
-ResamplerPadding(const int inrate, const int outrate)
+static int ResamplerPadding(const int inrate, const int outrate)
 {
     if (inrate == outrate) {
         return 0;
@@ -186,23 +189,22 @@ ResamplerPadding(const int inrate, const int outrate)
 }
 
 /* lpadding and rpadding are expected to be buffers of (ResamplePadding(inrate, outrate) * chans * sizeof (float)) bytes. */
-static int
-SDL_ResampleAudio(const int chans, const int inrate, const int outrate,
-                        const float *lpadding, const float *rpadding,
-                        const float *inbuf, const int inbuflen,
-                        float *outbuf, const int outbuflen)
+static int SDL_ResampleAudio(const int chans, const int inrate, const int outrate,
+                             const float *lpadding, const float *rpadding,
+                             const float *inbuf, const int inbuflen,
+                             float *outbuf, const int outbuflen)
 {
     /* Note that this used to be double, but it looks like we can get by with float in most cases at
        almost twice the speed on Intel processors, and orders of magnitude more
        on CPUs that need a software fallback for double calculations. */
     typedef float ResampleFloatType;
 
-    const ResampleFloatType finrate = (ResampleFloatType) inrate;
-    const ResampleFloatType ratio = ((float) outrate) / ((float) inrate);
+    const ResampleFloatType finrate = (ResampleFloatType)inrate;
+    const ResampleFloatType ratio = ((float)outrate) / ((float)inrate);
     const int paddinglen = ResamplerPadding(inrate, outrate);
-    const int framelen = chans * (int)sizeof (float);
+    const int framelen = chans * (int)sizeof(float);
     const int inframes = inbuflen / framelen;
-    const int wantedoutframes = (int) ((inbuflen / framelen) * ratio);  /* outbuflen isn't total to write, it's total available. */
+    const int wantedoutframes = (int)((inbuflen / framelen) * ratio); /* outbuflen isn't total to write, it's total available. */
     const int maxoutframes = outbuflen / framelen;
     const int outframes = SDL_min(wantedoutframes, maxoutframes);
     ResampleFloatType outtime = 0.0f;
@@ -210,14 +212,14 @@ SDL_ResampleAudio(const int chans, const int inrate, const int outrate,
     int i, j, chan;
 
     for (i = 0; i < outframes; i++) {
-        const int srcindex = (int) (outtime * inrate);
-        const ResampleFloatType intime = ((ResampleFloatType) srcindex) / finrate;
-        const ResampleFloatType innexttime = ((ResampleFloatType) (srcindex + 1)) / finrate;
+        const int srcindex = (int)(outtime * inrate);
+        const ResampleFloatType intime = ((ResampleFloatType)srcindex) / finrate;
+        const ResampleFloatType innexttime = ((ResampleFloatType)(srcindex + 1)) / finrate;
         const ResampleFloatType indeltatime = innexttime - intime;
         const ResampleFloatType interpolation1 = (indeltatime == 0.0f) ? 1.0f : (1.0f - ((innexttime - outtime) / indeltatime));
-        const int filterindex1 = (int) (interpolation1 * RESAMPLER_SAMPLES_PER_ZERO_CROSSING);
+        const int filterindex1 = (int)(interpolation1 * RESAMPLER_SAMPLES_PER_ZERO_CROSSING);
         const ResampleFloatType interpolation2 = 1.0f - interpolation1;
-        const int filterindex2 = (int) (interpolation2 * RESAMPLER_SAMPLES_PER_ZERO_CROSSING);
+        const int filterindex2 = (int)(interpolation2 * RESAMPLER_SAMPLES_PER_ZERO_CROSSING);
 
         for (chan = 0; chan < chans; chan++) {
             float outsample = 0.0f;
@@ -242,14 +244,13 @@ SDL_ResampleAudio(const int chans, const int inrate, const int outrate,
             *(dst++) = outsample;
         }
 
-        outtime = ((ResampleFloatType) i) / ((ResampleFloatType) outrate);
+        outtime = ((ResampleFloatType)i) / ((ResampleFloatType)outrate);
     }
 
     return outframes * chans * sizeof(float);
 }
 
-int
-SDL_ConvertAudio(SDL_AudioCVT * cvt)
+int SDL_ConvertAudio(SDL_AudioCVT *cvt)
 {
     /* !!! FIXME: (cvt) should be const; stack-copy it here. */
     /* !!! FIXME: (actually, we can't...len_cvt needs to be updated. Grr.) */
@@ -267,35 +268,37 @@ SDL_ConvertAudio(SDL_AudioCVT * cvt)
 
     /* Set up the conversion and go! */
     cvt->filter_index = 0;
-    cvt->filters[0] (cvt, cvt->src_format);
+    cvt->filters[0](cvt, cvt->src_format);
     return 0;
 }
 
-static void SDLCALL
-SDL_Convert_Byteswap(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_Byteswap(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
 #if DEBUG_CONVERT
     SDL_Log("SDL_AUDIO_CONVERT: Converting byte order\n");
 #endif
 
     switch (SDL_AUDIO_BITSIZE(format)) {
-        #define CASESWAP(b) \
-            case b: { \
-                Uint##b *ptr = (Uint##b *) cvt->buf; \
-                int i; \
-                for (i = cvt->len_cvt / sizeof (*ptr); i; --i, ++ptr) { \
-                    *ptr = SDL_Swap##b(*ptr); \
-                } \
-                break; \
-            }
+#define CASESWAP(b)                                            \
+    case b:                                                    \
+    {                                                          \
+        Uint##b *ptr = (Uint##b *)cvt->buf;                    \
+        int i;                                                 \
+        for (i = cvt->len_cvt / sizeof(*ptr); i; --i, ++ptr) { \
+            *ptr = SDL_Swap##b(*ptr);                          \
+        }                                                      \
+        break;                                                 \
+    }
 
         CASESWAP(16);
         CASESWAP(32);
         CASESWAP(64);
 
-        #undef CASESWAP
+#undef CASESWAP
 
-        default: SDL_assert(!"unhandled byteswap datatype!"); break;
+    default:
+        SDL_assert(!"unhandled byteswap datatype!");
+        break;
     }
 
     if (cvt->filters[++cvt->filter_index]) {
@@ -309,8 +312,7 @@ SDL_Convert_Byteswap(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static int
-SDL_AddAudioCVTFilter(SDL_AudioCVT *cvt, const SDL_AudioFilter filter)
+static int SDL_AddAudioCVTFilter(SDL_AudioCVT *cvt, const SDL_AudioFilter filter)
 {
     if (cvt->filter_index >= SDL_AUDIOCVT_MAX_FILTERS) {
         return SDL_SetError("Too many filters needed for conversion, exceeded maximum of %d", SDL_AUDIOCVT_MAX_FILTERS);
@@ -321,16 +323,15 @@ SDL_AddAudioCVTFilter(SDL_AudioCVT *cvt, const SDL_AudioFilter filter)
     return 0;
 }
 
-static int
-SDL_BuildAudioTypeCVTToFloat(SDL_AudioCVT *cvt, const SDL_AudioFormat src_fmt)
+static int SDL_BuildAudioTypeCVTToFloat(SDL_AudioCVT *cvt, const SDL_AudioFormat src_fmt)
 {
-    int retval = 0;  /* 0 == no conversion necessary. */
+    int retval = 0; /* 0 == no conversion necessary. */
 
     if ((SDL_AUDIO_ISBIGENDIAN(src_fmt) != 0) == (SDL_BYTEORDER == SDL_LIL_ENDIAN) && SDL_AUDIO_BITSIZE(src_fmt) > 8) {
         if (SDL_AddAudioCVTFilter(cvt, SDL_Convert_Byteswap) < 0) {
             return -1;
         }
-        retval = 1;  /* added a converter. */
+        retval = 1; /* added a converter. */
     }
 
     if (!SDL_AUDIO_ISFLOAT(src_fmt)) {
@@ -339,12 +340,24 @@ SDL_BuildAudioTypeCVTToFloat(SDL_AudioCVT *cvt, const SDL_AudioFormat src_fmt)
         SDL_AudioFilter filter = NULL;
 
         switch (src_fmt & ~SDL_AUDIO_MASK_ENDIAN) {
-            case AUDIO_S8: filter = SDL_Convert_S8_to_F32; break;
-            case AUDIO_U8: filter = SDL_Convert_U8_to_F32; break;
-            case AUDIO_S16: filter = SDL_Convert_S16_to_F32; break;
-            case AUDIO_U16: filter = SDL_Convert_U16_to_F32; break;
-            case AUDIO_S32: filter = SDL_Convert_S32_to_F32; break;
-            default: SDL_assert(!"Unexpected audio format!"); break;
+        case AUDIO_S8:
+            filter = SDL_Convert_S8_to_F32;
+            break;
+        case AUDIO_U8:
+            filter = SDL_Convert_U8_to_F32;
+            break;
+        case AUDIO_S16:
+            filter = SDL_Convert_S16_to_F32;
+            break;
+        case AUDIO_U16:
+            filter = SDL_Convert_U16_to_F32;
+            break;
+        case AUDIO_S32:
+            filter = SDL_Convert_S32_to_F32;
+            break;
+        default:
+            SDL_assert(!"Unexpected audio format!");
+            break;
         }
 
         if (!filter) {
@@ -362,28 +375,39 @@ SDL_BuildAudioTypeCVTToFloat(SDL_AudioCVT *cvt, const SDL_AudioFormat src_fmt)
             cvt->len_ratio /= (src_bitsize / dst_bitsize);
         }
 
-        retval = 1;  /* added a converter. */
+        retval = 1; /* added a converter. */
     }
 
     return retval;
 }
 
-static int
-SDL_BuildAudioTypeCVTFromFloat(SDL_AudioCVT *cvt, const SDL_AudioFormat dst_fmt)
+static int SDL_BuildAudioTypeCVTFromFloat(SDL_AudioCVT *cvt, const SDL_AudioFormat dst_fmt)
 {
-    int retval = 0;  /* 0 == no conversion necessary. */
+    int retval = 0; /* 0 == no conversion necessary. */
 
     if (!SDL_AUDIO_ISFLOAT(dst_fmt)) {
         const Uint16 dst_bitsize = SDL_AUDIO_BITSIZE(dst_fmt);
         const Uint16 src_bitsize = 32;
         SDL_AudioFilter filter = NULL;
         switch (dst_fmt & ~SDL_AUDIO_MASK_ENDIAN) {
-            case AUDIO_S8: filter = SDL_Convert_F32_to_S8; break;
-            case AUDIO_U8: filter = SDL_Convert_F32_to_U8; break;
-            case AUDIO_S16: filter = SDL_Convert_F32_to_S16; break;
-            case AUDIO_U16: filter = SDL_Convert_F32_to_U16; break;
-            case AUDIO_S32: filter = SDL_Convert_F32_to_S32; break;
-            default: SDL_assert(!"Unexpected audio format!"); break;
+        case AUDIO_S8:
+            filter = SDL_Convert_F32_to_S8;
+            break;
+        case AUDIO_U8:
+            filter = SDL_Convert_F32_to_U8;
+            break;
+        case AUDIO_S16:
+            filter = SDL_Convert_F32_to_S16;
+            break;
+        case AUDIO_U16:
+            filter = SDL_Convert_F32_to_U16;
+            break;
+        case AUDIO_S32:
+            filter = SDL_Convert_F32_to_S32;
+            break;
+        default:
+            SDL_assert(!"Unexpected audio format!");
+            break;
         }
 
         if (!filter) {
@@ -401,14 +425,14 @@ SDL_BuildAudioTypeCVTFromFloat(SDL_AudioCVT *cvt, const SDL_AudioFormat dst_fmt)
             const int div = (src_bitsize / dst_bitsize);
             cvt->len_ratio /= div;
         }
-        retval = 1;  /* added a converter. */
+        retval = 1; /* added a converter. */
     }
 
     if ((SDL_AUDIO_ISBIGENDIAN(dst_fmt) != 0) == (SDL_BYTEORDER == SDL_LIL_ENDIAN) && SDL_AUDIO_BITSIZE(dst_fmt) > 8) {
         if (SDL_AddAudioCVTFilter(cvt, SDL_Convert_Byteswap) < 0) {
             return -1;
         }
-        retval = 1;  /* added a converter. */
+        retval = 1; /* added a converter. */
     }
 
     return retval;
@@ -416,12 +440,11 @@ SDL_BuildAudioTypeCVTFromFloat(SDL_AudioCVT *cvt, const SDL_AudioFormat dst_fmt)
 
 #ifdef HAVE_LIBSAMPLERATE_H
 
-static void
-SDL_ResampleCVT_SRC(SDL_AudioCVT *cvt, const int chans, const SDL_AudioFormat format)
+static void SDL_ResampleCVT_SRC(SDL_AudioCVT *cvt, const int chans, const SDL_AudioFormat format)
 {
-    const float *src = (const float *) cvt->buf;
+    const float *src = (const float *)cvt->buf;
     const int srclen = cvt->len_cvt;
-    float *dst = (float *) (cvt->buf + srclen);
+    float *dst = (float *)(cvt->buf + srclen);
     const int dstlen = (cvt->len * cvt->len_mult) - srclen;
     const int framelen = sizeof(float) * chans;
     int result = 0;
@@ -438,12 +461,12 @@ SDL_ResampleCVT_SRC(SDL_AudioCVT *cvt, const int chans, const SDL_AudioFormat fo
     data.src_ratio = cvt->rate_incr;
 
     result = SRC_src_simple(&data, SRC_converter, chans); /* Simple API converts the whole buffer at once.  No need for initialization. */
-    /* !!! FIXME: Handle library failures? */
-    #ifdef DEBUG_CONVERT
+/* !!! FIXME: Handle library failures? */
+#ifdef DEBUG_CONVERT
     if (result != 0) {
         SDL_Log("src_simple() failed: %s", SRC_src_strerror(result));
     }
-    #endif
+#endif
 
     cvt->len_cvt = data.output_frames_gen * framelen;
 
@@ -456,20 +479,19 @@ SDL_ResampleCVT_SRC(SDL_AudioCVT *cvt, const int chans, const SDL_AudioFormat fo
 
 #endif /* HAVE_LIBSAMPLERATE_H */
 
-static void
-SDL_ResampleCVT(SDL_AudioCVT *cvt, const int chans, const SDL_AudioFormat format)
+static void SDL_ResampleCVT(SDL_AudioCVT *cvt, const int chans, const SDL_AudioFormat format)
 {
     /* !!! FIXME in 2.1: there are ten slots in the filter list, and the theoretical maximum we use is six (seven with NULL terminator).
        !!! FIXME in 2.1:   We need to store data for this resampler, because the cvt structure doesn't store the original sample rates,
        !!! FIXME in 2.1:   so we steal the ninth and tenth slot.  :( */
-    const int inrate = (int) (size_t) cvt->filters[SDL_AUDIOCVT_MAX_FILTERS-1];
-    const int outrate = (int) (size_t) cvt->filters[SDL_AUDIOCVT_MAX_FILTERS];
-    const float *src = (const float *) cvt->buf;
+    const int inrate = (int)(size_t)cvt->filters[SDL_AUDIOCVT_MAX_FILTERS - 1];
+    const int outrate = (int)(size_t)cvt->filters[SDL_AUDIOCVT_MAX_FILTERS];
+    const float *src = (const float *)cvt->buf;
     const int srclen = cvt->len_cvt;
     /*float *dst = (float *) cvt->buf;
     const int dstlen = (cvt->len * cvt->len_mult);*/
     /* !!! FIXME: remove this if we can get the resampler to work in-place again. */
-    float *dst = (float *) (cvt->buf + srclen);
+    float *dst = (float *)(cvt->buf + srclen);
     const int dstlen = (cvt->len * cvt->len_mult) - srclen;
     const int requestedpadding = ResamplerPadding(inrate, outrate);
     int paddingsamples;
@@ -483,7 +505,7 @@ SDL_ResampleCVT(SDL_AudioCVT *cvt, const int chans, const SDL_AudioFormat format
     SDL_assert(format == AUDIO_F32SYS);
 
     /* we keep no streaming state here, so pad with silence on both ends. */
-    padding = (float *) SDL_calloc(paddingsamples ? paddingsamples : 1, sizeof (float));
+    padding = (float *)SDL_calloc(paddingsamples ? paddingsamples : 1, sizeof(float));
     if (padding == NULL) {
         SDL_OutOfMemory();
         return;
@@ -493,7 +515,7 @@ SDL_ResampleCVT(SDL_AudioCVT *cvt, const int chans, const SDL_AudioFormat format
 
     SDL_free(padding);
 
-    SDL_memmove(cvt->buf, dst, cvt->len_cvt);  /* !!! FIXME: remove this if we can get the resampler to work in-place again. */
+    SDL_memmove(cvt->buf, dst, cvt->len_cvt); /* !!! FIXME: remove this if we can get the resampler to work in-place again. */
 
     if (cvt->filters[++cvt->filter_index]) {
         cvt->filters[cvt->filter_index](cvt, format);
@@ -504,10 +526,11 @@ SDL_ResampleCVT(SDL_AudioCVT *cvt, const int chans, const SDL_AudioFormat format
    !!! FIXME:  store channel info, so we have to have function entry
    !!! FIXME:  points for each supported channel count and multiple
    !!! FIXME:  vs arbitrary. When we rev the ABI, clean this up. */
-#define RESAMPLER_FUNCS(chans) \
-    static void SDLCALL \
-    SDL_ResampleCVT_c##chans(SDL_AudioCVT *cvt, SDL_AudioFormat format) { \
-        SDL_ResampleCVT(cvt, chans, format); \
+#define RESAMPLER_FUNCS(chans)                                              \
+    static void SDLCALL                                                     \
+        SDL_ResampleCVT_c##chans(SDL_AudioCVT *cvt, SDL_AudioFormat format) \
+    {                                                                       \
+        SDL_ResampleCVT(cvt, chans, format);                                \
     }
 RESAMPLER_FUNCS(1)
 RESAMPLER_FUNCS(2)
@@ -517,10 +540,11 @@ RESAMPLER_FUNCS(8)
 #undef RESAMPLER_FUNCS
 
 #ifdef HAVE_LIBSAMPLERATE_H
-#define RESAMPLER_FUNCS(chans) \
-    static void SDLCALL \
-    SDL_ResampleCVT_SRC_c##chans(SDL_AudioCVT *cvt, SDL_AudioFormat format) { \
-        SDL_ResampleCVT_SRC(cvt, chans, format); \
+#define RESAMPLER_FUNCS(chans)                                                  \
+    static void SDLCALL                                                         \
+        SDL_ResampleCVT_SRC_c##chans(SDL_AudioCVT *cvt, SDL_AudioFormat format) \
+    {                                                                           \
+        SDL_ResampleCVT_SRC(cvt, chans, format);                                \
     }
 RESAMPLER_FUNCS(1)
 RESAMPLER_FUNCS(2)
@@ -530,42 +554,52 @@ RESAMPLER_FUNCS(8)
 #undef RESAMPLER_FUNCS
 #endif /* HAVE_LIBSAMPLERATE_H */
 
-static SDL_AudioFilter
-ChooseCVTResampler(const int dst_channels)
+static SDL_AudioFilter ChooseCVTResampler(const int dst_channels)
 {
-    #ifdef HAVE_LIBSAMPLERATE_H
+#ifdef HAVE_LIBSAMPLERATE_H
     if (SRC_available) {
         switch (dst_channels) {
-            case 1: return SDL_ResampleCVT_SRC_c1;
-            case 2: return SDL_ResampleCVT_SRC_c2;
-            case 4: return SDL_ResampleCVT_SRC_c4;
-            case 6: return SDL_ResampleCVT_SRC_c6;
-            case 8: return SDL_ResampleCVT_SRC_c8;
-            default: break;
+        case 1:
+            return SDL_ResampleCVT_SRC_c1;
+        case 2:
+            return SDL_ResampleCVT_SRC_c2;
+        case 4:
+            return SDL_ResampleCVT_SRC_c4;
+        case 6:
+            return SDL_ResampleCVT_SRC_c6;
+        case 8:
+            return SDL_ResampleCVT_SRC_c8;
+        default:
+            break;
         }
     }
-    #endif /* HAVE_LIBSAMPLERATE_H */
+#endif /* HAVE_LIBSAMPLERATE_H */
 
     switch (dst_channels) {
-        case 1: return SDL_ResampleCVT_c1;
-        case 2: return SDL_ResampleCVT_c2;
-        case 4: return SDL_ResampleCVT_c4;
-        case 6: return SDL_ResampleCVT_c6;
-        case 8: return SDL_ResampleCVT_c8;
-        default: break;
+    case 1:
+        return SDL_ResampleCVT_c1;
+    case 2:
+        return SDL_ResampleCVT_c2;
+    case 4:
+        return SDL_ResampleCVT_c4;
+    case 6:
+        return SDL_ResampleCVT_c6;
+    case 8:
+        return SDL_ResampleCVT_c8;
+    default:
+        break;
     }
 
     return NULL;
 }
 
-static int
-SDL_BuildAudioResampleCVT(SDL_AudioCVT * cvt, const int dst_channels,
-                          const int src_rate, const int dst_rate)
+static int SDL_BuildAudioResampleCVT(SDL_AudioCVT *cvt, const int dst_channels,
+                                     const int src_rate, const int dst_rate)
 {
     SDL_AudioFilter filter;
 
     if (src_rate == dst_rate) {
-        return 0;  /* no conversion necessary. */
+        return 0; /* no conversion necessary. */
     }
 
     filter = ChooseCVTResampler(dst_channels);
@@ -581,18 +615,18 @@ SDL_BuildAudioResampleCVT(SDL_AudioCVT * cvt, const int dst_channels,
     /* !!! FIXME in 2.1: there are ten slots in the filter list, and the theoretical maximum we use is six (seven with NULL terminator).
        !!! FIXME in 2.1:   We need to store data for this resampler, because the cvt structure doesn't store the original sample rates,
        !!! FIXME in 2.1:   so we steal the ninth and tenth slot.  :( */
-    if (cvt->filter_index >= (SDL_AUDIOCVT_MAX_FILTERS-2)) {
+    if (cvt->filter_index >= (SDL_AUDIOCVT_MAX_FILTERS - 2)) {
         return SDL_SetError("Too many filters needed for conversion, exceeded maximum of %d", SDL_AUDIOCVT_MAX_FILTERS - 2);
     }
-    cvt->filters[SDL_AUDIOCVT_MAX_FILTERS-1] = (SDL_AudioFilter) (uintptr_t) src_rate;
-    cvt->filters[SDL_AUDIOCVT_MAX_FILTERS] = (SDL_AudioFilter) (uintptr_t) dst_rate;
+    cvt->filters[SDL_AUDIOCVT_MAX_FILTERS - 1] = (SDL_AudioFilter)(uintptr_t)src_rate;
+    cvt->filters[SDL_AUDIOCVT_MAX_FILTERS] = (SDL_AudioFilter)(uintptr_t)dst_rate;
 
     if (src_rate < dst_rate) {
-        const double mult = ((double) dst_rate) / ((double) src_rate);
-        cvt->len_mult *= (int) SDL_ceil(mult);
+        const double mult = ((double)dst_rate) / ((double)src_rate);
+        cvt->len_mult *= (int)SDL_ceil(mult);
         cvt->len_ratio *= mult;
     } else {
-        cvt->len_ratio /= ((double) src_rate) / ((double) dst_rate);
+        cvt->len_ratio /= ((double)src_rate) / ((double)dst_rate);
     }
 
     /* !!! FIXME: remove this if we can get the resampler to work in-place again. */
@@ -600,48 +634,44 @@ SDL_BuildAudioResampleCVT(SDL_AudioCVT * cvt, const int dst_channels,
        we need it large enough to hold a separate scratch buffer. */
     cvt->len_mult *= 2;
 
-    return 1;               /* added a converter. */
+    return 1; /* added a converter. */
 }
 
-static SDL_bool
-SDL_SupportedAudioFormat(const SDL_AudioFormat fmt)
+static SDL_bool SDL_SupportedAudioFormat(const SDL_AudioFormat fmt)
 {
     switch (fmt) {
-        case AUDIO_U8:
-        case AUDIO_S8:
-        case AUDIO_U16LSB:
-        case AUDIO_S16LSB:
-        case AUDIO_U16MSB:
-        case AUDIO_S16MSB:
-        case AUDIO_S32LSB:
-        case AUDIO_S32MSB:
-        case AUDIO_F32LSB:
-        case AUDIO_F32MSB:
-            return SDL_TRUE;  /* supported. */
-
-        default:
-            break;
-    }
-
-    return SDL_FALSE;  /* unsupported. */
+    case AUDIO_U8:
+    case AUDIO_S8:
+    case AUDIO_U16LSB:
+    case AUDIO_S16LSB:
+    case AUDIO_U16MSB:
+    case AUDIO_S16MSB:
+    case AUDIO_S32LSB:
+    case AUDIO_S32MSB:
+    case AUDIO_F32LSB:
+    case AUDIO_F32MSB:
+        return SDL_TRUE; /* supported. */
+
+    default:
+        break;
+    }
+
+    return SDL_FALSE; /* unsupported. */
 }
 
-static SDL_bool
-SDL_SupportedChannelCount(const int channels)
+static SDL_bool SDL_SupportedChannelCount(const int channels)
 {
     return ((channels >= 1) && (channels <= 8)) ? SDL_TRUE : SDL_FALSE;
 }
 
-
 /* Creates a set of audio filters to convert from one format to another.
    Returns 0 if no conversion is needed, 1 if the audio filter is set up,
    or -1 if an error like invalid parameter, unsupported format, etc. occurred.
 */
 
-int
-SDL_BuildAudioCVT(SDL_AudioCVT * cvt,
-                  SDL_AudioFormat src_fmt, Uint8 src_channels, int src_rate,
-                  SDL_AudioFormat dst_fmt, Uint8 dst_channels, int dst_rate)
+int SDL_BuildAudioCVT(SDL_AudioCVT *cvt,
+                      SDL_AudioFormat src_fmt, Uint8 src_channels, int src_rate,
+                      SDL_AudioFormat dst_fmt, Uint8 dst_channels, int dst_rate)
 {
     SDL_AudioFilter channel_converter = NULL;
 
@@ -680,7 +710,7 @@ SDL_BuildAudioCVT(SDL_AudioCVT * cvt,
 
 #if DEBUG_CONVERT
     SDL_Log("SDL_AUDIO_CONVERT: Build format %04x->%04x, channels %u->%u, rate %d->%d\n",
-           src_fmt, dst_fmt, src_channels, dst_channels, src_rate, dst_rate);
+            src_fmt, dst_fmt, src_channels, dst_channels, src_rate, dst_rate);
 #endif
 
     /* Start off with no conversion necessary */
@@ -691,7 +721,7 @@ SDL_BuildAudioCVT(SDL_AudioCVT * cvt,
     SDL_zeroa(cvt->filters);
     cvt->len_mult = 1;
     cvt->len_ratio = 1.0;
-    cvt->rate_incr = ((double) dst_rate) / ((double) src_rate);
+    cvt->rate_incr = ((double)dst_rate) / ((double)src_rate);
 
     /* Make sure we've chosen audio conversion functions (SIMD, scalar, etc.) */
     SDL_ChooseAudioConverters();
@@ -731,17 +761,16 @@ SDL_BuildAudioCVT(SDL_AudioCVT * cvt,
 
     /* Convert data types, if necessary. Updates (cvt). */
     if (SDL_BuildAudioTypeCVTToFloat(cvt, src_fmt) < 0) {
-        return -1;              /* shouldn't happen, but just in case... */
+        return -1; /* shouldn't happen, but just in case... */
     }
 
-
     /* Channel conversion */
 
     /* SDL_SupportedChannelCount should have caught these asserts, or we added a new format and forgot to update the table. */
     SDL_assert(src_channels <= SDL_arraysize(channel_converters));
     SDL_assert(dst_channels <= SDL_arraysize(channel_converters[0]));
 
-    channel_converter = channel_converters[src_channels-1][dst_channels-1];
+    channel_converter = channel_converters[src_channels - 1][dst_channels - 1];
     if ((channel_converter == NULL) != (src_channels == dst_channels)) {
         /* All combinations of supported channel counts should have been handled by now, but let's be defensive */
         return SDL_SetError("Invalid channel combination");
@@ -749,16 +778,24 @@ SDL_BuildAudioCVT(SDL_AudioCVT * cvt,
         /* swap in some SIMD versions for a few of these. */
         if (channel_converter == SDL_ConvertStereoToMono) {
             SDL_AudioFilter filter = NULL;
-            #if HAVE_SSE3_INTRINSICS
-            if (!filter && SDL_HasSSE3()) { filter = SDL_ConvertStereoToMono_SSE3; }
-            #endif
-            if (filter) { channel_converter = filter; }
+#if HAVE_SSE3_INTRINSICS
+            if (!filter && SDL_HasSSE3()) {
+                filter = SDL_ConvertStereoToMono_SSE3;
+            }
+#endif
+            if (filter) {
+                channel_converter = filter;
+            }
         } else if (channel_converter == SDL_ConvertMonoToStereo) {
             SDL_AudioFilter filter = NULL;
-            #if HAVE_SSE_INTRINSICS
-            if (!filter && SDL_HasSSE()) { filter = SDL_ConvertMonoToStereo_SSE; }
-            #endif
-            if (filter) { channel_converter = filter; }
+#if HAVE_SSE_INTRINSICS
+            if (!filter && SDL_HasSSE()) {
+                filter = SDL_ConvertMonoToStereo_SSE;
+            }
+#endif
+            if (filter) {
+                channel_converter = filter;
+            }
         }
 
         if (SDL_AddAudioCVTFilter(cvt, channel_converter) < 0) {
@@ -766,7 +803,7 @@ SDL_BuildAudioCVT(SDL_AudioCVT * cvt,
         }
 
         if (src_channels < dst_channels) {
-            cvt->len_mult = ((cvt->len_mult * dst_channels) + (src_channels-1)) / src_channels;
+            cvt->len_mult = ((cvt->len_mult * dst_channels) + (src_channels - 1)) / src_channels;
         }
 
         cvt->len_ratio = (cvt->len_ratio * dst_channels) / src_channels;
@@ -775,12 +812,12 @@ SDL_BuildAudioCVT(SDL_AudioCVT * cvt,
 
     /* Do rate conversion, if necessary. Updates (cvt). */
     if (SDL_BuildAudioResampleCVT(cvt, dst_channels, src_rate, dst_rate) < 0) {
-        return -1;              /* shouldn't happen, but just in case... */
+        return -1; /* shouldn't happen, but just in case... */
     }
 
     /* Move to final data type. */
     if (SDL_BuildAudioTypeCVTFromFloat(cvt, dst_fmt) < 0) {
-        return -1;              /* shouldn't happen, but just in case... */
+        return -1; /* shouldn't happen, but just in case... */
     }
 
     cvt->needed = (cvt->filter_index != 0);
@@ -800,7 +837,7 @@ struct _SDL_AudioStream
     Uint8 *staging_buffer;
     int staging_buffer_size;
     int staging_buffer_filled;
-    Uint8 *work_buffer_base;  /* maybe unaligned pointer from SDL_realloc(). */
+    Uint8 *work_buffer_base; /* maybe unaligned pointer from SDL_realloc(). */
     int work_buffer_len;
     int src_sample_frame_size;
     SDL_AudioFormat src_format;
@@ -821,8 +858,7 @@ struct _SDL_AudioStream
     SDL_CleanupAudioStreamResamplerFunc cleanup_resampler_func;
 };
 
-static Uint8 *
-EnsureStreamBufferSize(SDL_AudioStream *stream, const int newlen)
+static Uint8 *EnsureStreamBufferSize(SDL_AudioStream *stream, const int newlen)
 {
     Uint8 *ptr;
     size_t offset;
@@ -830,7 +866,7 @@ EnsureStreamBufferSize(SDL_AudioStream *stream, const int newlen)
     if (stream->work_buffer_len >= newlen) {
         ptr = stream->work_buffer_base;
     } else {
-        ptr = (Uint8 *) SDL_realloc(stream->work_buffer_base, newlen + 32);
+        ptr = (Uint8 *)SDL_realloc(stream->work_buffer_base, newlen + 32);
         if (ptr == NULL) {
             SDL_OutOfMemory();
             return NULL;
@@ -840,22 +876,21 @@ EnsureStreamBufferSize(SDL_AudioStream *stream, const int newlen)
         stream->work_buffer_len = newlen;
     }
 
-    offset = ((size_t) ptr) & 15;
+    offset = ((size_t)ptr) & 15;
     return offset ? ptr + (16 - offset) : ptr;
 }
 
 #ifdef HAVE_LIBSAMPLERATE_H
-static int
-SDL_ResampleAudioStream_SRC(SDL_AudioStream *stream, const void *_inbuf, const int inbuflen, void *_outbuf, const int outbuflen)
+static int SDL_ResampleAudioStream_SRC(SDL_AudioStream *stream, const void *_inbuf, const int inbuflen, void *_outbuf, const int outbuflen)
 {
-    const float *inbuf = (const float *) _inbuf;
-    float *outbuf = (float *) _outbuf;
+    const float *inbuf = (const float *)_inbuf;
+    float *outbuf = (float *)_outbuf;
     const int framelen = sizeof(float) * stream->pre_resample_channels;
     SRC_STATE *state = (SRC_STATE *)stream->resampler_state;
     SRC_DATA data;
     int result;
 
-    SDL_assert(inbuf != ((const float *) outbuf));  /* SDL_AudioStreamPut() shouldn't allow in-place resamples. */
+    SDL_assert(inbuf != ((const float *)outbuf)); /* SDL_AudioStreamPut() shouldn't allow in-place resamples. */
 
     data.data_in = (float *)inbuf; /* Older versions of libsamplerate had a non-const pointer, but didn't write to it */
     data.input_frames = inbuflen / framelen;
@@ -879,14 +914,12 @@ SDL_ResampleAudioStream_SRC(SDL_AudioStream *stream, const void *_inbuf, const i
     return data.output_frames_gen * (sizeof(float) * stream->pre_resample_channels);
 }
 
-static void
-SDL_ResetAudioStreamResampler_SRC(SDL_AudioStream *stream)
+static void SDL_ResetAudioStreamResampler_SRC(SDL_AudioStream *stream)
 {
     SRC_src_reset((SRC_STATE *)stream->resampler_state);
 }
 
-static void
-SDL_CleanupAudioStreamResampler_SRC(SDL_AudioStream *stream)
+static void SDL_CleanupAudioStreamResampler_SRC(SDL_AudioStream *stream)
 {
     SRC_STATE *state = (SRC_STATE *)stream->resampler_state;
     if (state) {
@@ -899,8 +932,7 @@ SDL_CleanupAudioStreamResampler_SRC(SDL_AudioStream *stream)
     stream->cleanup_resampler_func = NULL;
 }
 
-static SDL_bool
-SetupLibSampleRateResampling(SDL_AudioStream *stream)
+static SDL_bool SetupLibSampleRateResampling(SDL_AudioStream *stream)
 {
     int result = 0;
     SRC_STATE *state = NULL;
@@ -926,42 +958,38 @@ SetupLibSampleRateResampling(SDL_AudioStream *stream)
 }
 #endif /* HAVE_LIBSAMPLERATE_H */
 
-
-static int
-SDL_ResampleAudioStream(SDL_AudioStream *stream, const void *_inbuf, const int inbuflen, void *_outbuf, const int outbuflen)
+static int SDL_ResampleAudioStream(SDL_AudioStream *stream, const void *_inbuf, const int inbuflen, void *_outbuf, const int outbuflen)
 {
-    const Uint8 *inbufend = ((const Uint8 *) _inbuf) + inbuflen;
-    const float *inbuf = (const float *) _inbuf;
-    float *outbuf = (float *) _outbuf;
-    const int chans = (int) stream->pre_resample_channels;
+    const Uint8 *inbufend = ((const Uint8 *)_inbuf) + inbuflen;
+    const float *inbuf = (const float *)_inbuf;
+    float *outbuf = (float *)_outbuf;
+    const int chans = (int)stream->pre_resample_channels;
     const int inrate = stream->src_rate;
     const int outrate = stream->dst_rate;
     const int paddingsamples = stream->resampler_padding_samples;
-    const int paddingbytes = paddingsamples * sizeof (float);
-    float *lpadding = (float *) stream->resampler_state;
-    const float *rpadding = (const float *) inbufend; /* we set this up so there are valid padding samples at the end of the input buffer. */
+    const int paddingbytes = paddingsamples * sizeof(float);
+    float *lpadding = (float *)stream->resampler_state;
+    const float *rpadding = (const float *)inbufend; /* we set this up so there are valid padding samples at the end of the input buffer. */
     const int cpy = SDL_min(inbuflen, paddingbytes);
     int retval;
 
-    SDL_assert(inbuf != ((const float *) outbuf));  /* SDL_AudioStreamPut() shouldn't allow in-place resamples. */
+    SDL_assert(inbuf != ((const float *)outbuf)); /* SDL_AudioStreamPut() shouldn't allow in-place resamples. */
 
     retval = SDL_ResampleAudio(chans, inrate, outrate, lpadding, rpadding, inbuf, inbuflen, outbuf, outbuflen);
 
     /* update our left padding with end of current input, for next run. */
-    SDL_memcpy((lpadding + paddingsamples) - (cpy / sizeof (float)), inbufend - cpy, cpy);
+    SDL_memcpy((lpadding + paddingsamples) - (cpy / sizeof(float)), inbufend - cpy, cpy);
     return retval;
 }
 
-static void
-SDL_ResetAudioStreamResampler(SDL_AudioStream *stream)
+static void SDL_ResetAudioStreamResampler(SDL_AudioStream *stream)
 {
     /* set all the padding to silence. */
     const int len = stream->resampler_padding_samples;
-    SDL_memset(stream->resampler_state, '\0', len * sizeof (float));
+    SDL_memset(stream->resampler_state, '\0', len * sizeof(float));
 }
 
-static void
-SDL_CleanupAudioStreamResampler(SDL_AudioStream *stream)
+static void SDL_CleanupAudioStreamResampler(SDL_AudioStream *stream)
 {
     SDL_free(stream->resampler_state);
 }
@@ -974,11 +1002,11 @@ SDL_NewAudioStream(const SDL_AudioFormat src_format,
                    const Uint8 dst_channels,
                    const int dst_rate)
 {
-    const int packetlen = 4096;  /* !!! FIXME: good enough for now. */
+    const int packetlen = 4096; /* !!! FIXME: good enough for now. */
     Uint8 pre_resample_channels;
     SDL_AudioStream *retval;
 
-    retval = (SDL_AudioStream *) SDL_calloc(1, sizeof (SDL_AudioStream));
+    retval = (SDL_AudioStream *)SDL_calloc(1, sizeof(SDL_AudioStream));
     if (retval == NULL) {
         SDL_OutOfMemory();
         return NULL;
@@ -1001,9 +1029,9 @@ SDL_NewAudioStream(const SDL_AudioFormat src_format,
     retval->dst_rate = dst_rate;
     retval->pre_resample_channels = pre_resample_channels;
     retval->packetlen = packetlen;
-    retval->rate_incr = ((double) dst_rate) / ((double) src_rate);
+    retval->rate_incr = ((double)dst_rate) / ((double)src_rate);
     retval->resampler_padding_samples = ResamplerPadding(retval->src_rate, retval->dst_rate) * pre_resample_channels;
-    retval->resampler_padding = (float *) SDL_calloc(retval->resampler_padding_samples ? retval->resampler_padding_samples : 1, sizeof (float));
+    retval->resampler_padding = (float *)SDL_calloc(retval->resampler_padding_samples ? retval->resampler_padding_samples : 1, sizeof(float));
 
     if (retval->resampler_padding == NULL) {
         SDL_FreeAudioStream(retval);
@@ -1013,7 +1041,7 @@ SDL_NewAudioStream(const SDL_AudioFormat src_format,
 
     retval->staging_buffer_size = ((retval->resampler_padding_samples / retval->pre_resample_channels) * retval->src_sample_frame_size);
     if (retval->staging_buffer_size > 0) {
-        retval->staging_buffer = (Uint8 *) SDL_malloc(retval->staging_buffer_size);
+        retval->staging_buffer = (Uint8 *)SDL_malloc(retval->staging_buffer_size);
         if (retval->staging_buffer == NULL) {
             SDL_FreeAudioStream(retval);
             SDL_OutOfMemory();
@@ -1026,14 +1054,14 @@ SDL_NewAudioStream(const SDL_AudioFormat src_format,
         retval->cvt_before_resampling.needed = SDL_FALSE;
         if (SDL_BuildAudioCVT(&retval->cvt_after_resampling, src_format, src_channels, dst_rate, dst_format, dst_channels, dst_rate) < 0) {
             SDL_FreeAudioStream(retval);
-            return NULL;  /* SDL_BuildAudioCVT should have called SDL_SetError. */
+            return NULL; /* SDL_BuildAudioCVT should have called SDL_SetError. */
         }
     } else {
         /* Don't resample at first. Just get us to Float32 format. */
         /* !!! FIXME: convert to int32 on devices without hardware float. */
         if (SDL_BuildAudioCVT(&retval->cvt_before_resampling, src_format, src_channels, src_rate, AUDIO_F32SYS, pre_resample_channels, src_rate) < 0) {
             SDL_FreeAudioStream(retval);
-            return NULL;  /* SDL_BuildAudioCVT should have called SDL_SetError. */
+            return NULL; /* SDL_BuildAudioCVT should have called SDL_SetError. */
         }
 
 #ifdef HAVE_LIBSAMPLERATE_H
@@ -1041,7 +1069,7 @@ SDL_NewAudioStream(const SDL_AudioFormat src_format,
 #endif
 
         if (!retval->resampler_func) {
-            retval->resampler_state = SDL_calloc(retval->resampler_padding_samples, sizeof (float));
+            retval->resampler_state = SDL_calloc(retval->resampler_padding_samples, sizeof(float));
             if (!retval->resampler_state) {
                 SDL_FreeAudioStream(retval);
                 SDL_OutOfMemory();
@@ -1056,21 +1084,20 @@ SDL_NewAudioStream(const SDL_AudioFormat src_format,
         /* Convert us to the final format after resampling. */
         if (SDL_BuildAudioCVT(&retval->cvt_after_resampling, AUDIO_F32SYS, pre_resample_channels, dst_rate, dst_format, dst_channels, dst_rate) < 0) {
             SDL_FreeAudioStream(retval);
-            return NULL;  /* SDL_BuildAudioCVT should have called SDL_SetError. */
+            return NULL; /* SDL_BuildAudioCVT should have called SDL_SetError. */
         }
     }
 
     retval->queue = SDL_NewDataQueue(packetlen, packetlen * 2);
     if (!retval->queue) {
         SDL_FreeAudioStream(retval);
-        return NULL;  /* SDL_NewDataQueue should have called SDL_SetError. */
+        return NULL; /* SDL_NewDataQueue should have called SDL_SetError. */
     }
 
     return retval;
 }
 
-static int
-SDL_AudioStreamPutInternal(SDL_AudioStream *stream, const void *buf, int len, int *maxputbytes)
+static int SDL_AudioStreamPutInternal(SDL_AudioStream *stream, const void *buf, int len, int *maxputbytes)
 {
     int buflen = len;
     int workbuflen;
@@ -1089,7 +1116,7 @@ SDL_AudioStreamPutInternal(SDL_AudioStream *stream, const void *buf, int len, in
        !!! FIXME:  a few samples at the end and convert them separately. */
 
     /* no padding prepended on first run. */
-    neededpaddingbytes = stream->resampler_padding_samples * sizeof (float);
+    neededpaddingbytes = stream->resampler_padding_samples * sizeof(float);
     paddingbytes = stream->first_run ? 0 : neededpaddingbytes;
     stream->first_run = SDL_FALSE;
 
@@ -1101,12 +1128,12 @@ SDL_AudioStreamPutInternal(SDL_AudioStream *stream, const void *buf, int len, in
 
     if (stream->dst_rate != stream->src_rate) {
         /* resamples can't happen in place, so make space for second buf. */
-        const int framesize = stream->pre_resample_channels * sizeof (float);
+        const int framesize = stream->pre_resample_channels * sizeof(float);
         const int frames = workbuflen / framesize;
-        resamplebuflen = ((int) SDL_ceil(frames * stream->rate_incr)) * framesize;
-        #if DEBUG_AUDIOSTREAM
+        resamplebuflen = ((int)SDL_ceil(frames * stream->rate_incr)) * framesize;
+#if DEBUG_AUDIOSTREAM
         SDL_Log("AUDIOSTREAM: will resample %d bytes to %d (ratio=%.6f)\n", workbuflen, resamplebuflen, stream->rate_incr);
-        #endif
+#endif
         workbuflen += resamplebuflen;
     }
 
@@ -1117,16 +1144,16 @@ SDL_AudioStreamPutInternal(SDL_AudioStream *stream, const void *buf, int len, in
 
     workbuflen += neededpaddingbytes;
 
-    #if DEBUG_AUDIOSTREAM
+#if DEBUG_AUDIOSTREAM
     SDL_Log("AUDIOSTREAM: Putting %d bytes of preconverted audio, need %d byte work buffer\n", buflen, workbuflen);
-    #endif
+#endif
 
     workbuf = EnsureStreamBufferSize(stream, workbuflen);
     if (workbuf == NULL) {
-        return -1;  /* probably out of memory. */
+        return -1; /* probably out of memory. */
     }
 
-    resamplebuf = workbuf;  /* default if not resampling. */
+    resamplebuf = workbuf; /* default if not resampling. */
 
     SDL_memcpy(workbuf + paddingbytes, buf, buflen);
 
@@ -1134,13 +1161,13 @@ SDL_AudioStreamPutInternal(SDL_AudioStream *stream, const void *buf, int len, in
         stream->cvt_before_resampling.buf = workbuf + paddingbytes;
         stream->cvt_before_resampling.len = buflen;
         if (SDL_ConvertAudio(&stream->cvt_before_resampling) == -1) {
-            return -1;   /* uhoh! */
+            return -1; /* uhoh! */
         }
         buflen = stream->cvt_before_resampling.len_cvt;
 
-        #if DEBUG_AUDIOSTREAM
+#if DEBUG_AUDIOSTREAM
         SDL_Log("AUDIOSTREAM: After initial conversion we have %d bytes\n", buflen);
-        #endif
+#endif
     }
 
     if (stream->dst_rate != stream->src_rate) {
@@ -1157,7 +1184,7 @@ SDL_AudioStreamPutInternal(SDL_AudioStream *stream, const void *buf, int len, in
         /* save off the data at the end for the next run. */
         SDL_memcpy(stream->resampler_padding, workbuf + (buflen - neededpaddingbytes), neededpaddingbytes);
 
-        resamplebuf = workbuf + buflen;  /* skip to second piece of workbuf. */
+        resamplebuf = workbuf + buflen; /* skip to second piece of workbuf. */
         SDL_assert(buflen >= neededpaddingbytes);
         if (buflen > neededpaddingbytes) {
             buflen = stream->resampler_func(stream, workbuf, buflen - neededpaddingbytes, resamplebuf, resamplebuflen);
@@ -1165,27 +1192,27 @@ SDL_AudioStreamPutInternal(SDL_AudioStream *stream, const void *buf, int len, in
             buflen = 0;
         }
 
-        #if DEBUG_AUDIOSTREAM
+#if DEBUG_AUDIOSTREAM
         SDL_Log("AUDIOSTREAM: After resampling we have %d bytes\n", buflen);
-        #endif
+#endif
     }
 
     if (stream->cvt_after_resampling.needed && (buflen > 0)) {
         stream->cvt_after_resampling.buf = resamplebuf;
         stream->cvt_after_resampling.len = buflen;
         if (SDL_ConvertAudio(&stream->cvt_after_resampling) == -1) {
-            return -1;   /* uhoh! */
+            return -1; /* uhoh! */
         }
         buflen = stream->cvt_after_resampling.len_cvt;
 
-        #if DEBUG_AUDIOSTREAM
+#if DEBUG_AUDIOSTREAM
         SDL_Log("AUDIOSTREAM: After final conversion we have %d bytes\n", buflen);
-        #endif
+#endif
     }
 
-    #if DEBUG_AUDIOSTREAM
+#if DEBUG_AUDIOSTREAM
     SDL_Log("AUDIOSTREAM: Final output is %d bytes\n", buflen);
-    #endif
+#endif
 
     if (maxputbytes) {
         const int maxbytes = *maxputbytes;
@@ -1199,8 +1226,7 @@ SDL_AudioStreamPutInternal(SDL_AudioStream *stream, const void *buf, int len, in
     return buflen ? SDL_WriteToDataQueue(stream->queue, resamplebuf, buflen) : 0;
 }
 
-int
-SDL_AudioStreamPut(SDL_AudioStream *stream, const void *buf, int len)
+int SDL_AudioStreamPut(SDL_AudioStream *stream, const void *buf, int len)
 {
     /* !!! FIXME: several converters can take advantage of SIMD, but only
        !!! FIXME:  if the data is aligned to 16 bytes. EnsureStreamBufferSize()
@@ -1210,9 +1236,9 @@ SDL_AudioStreamPut(SDL_AudioStream *stream, const void *buf, int len)
        !!! FIXME:  isn't a multiple of 16. In these cases, we should chop off
        !!! FIXME:  a few samples at the end and convert them separately. */
 
-    #if DEBUG_AUDIOSTREAM
+#if DEBUG_AUDIOSTREAM
     SDL_Log("AUDIOSTREAM: wants to put %d preconverted bytes\n", buflen);
-    #endif
+#endif
 
     if (stream == NULL) {
         return SDL_InvalidParamError("stream");
@@ -1221,7 +1247,7 @@ SDL_AudioStreamPut(SDL_AudioStream *stream, const void *buf, int len)
         return SDL_InvalidParamError("buf");
     }
     if (len == 0) {
-        return 0;  /* nothing to do. */
+        return 0; /* nothing to do. */
     }
     if ((len % stream->src_sample_frame_size) != 0) {
         return SDL_SetError("Can't add partial sample frames");
@@ -1230,9 +1256,9 @@ SDL_AudioStreamPut(SDL_AudioStream *stream, const void *buf, int len)
     if (!stream->cvt_before_resampling.needed &&
         (stream->dst_rate == stream->src_rate) &&
         !stream->cvt_after_resampling.needed) {
-        #if DEBUG_AUDIOSTREAM
+#if DEBUG_AUDIOSTREAM
         SDL_Log("AUDIOSTREAM: no conversion needed at all, queueing %d bytes.\n", len);
-        #endif
+#endif
         return SDL_WriteToDataQueue(stream->queue, buf, len);
     }
 
@@ -1273,9 +1299,9 @@ int SDL_AudioStreamFlush(SDL_AudioStream *stream)
         return SDL_InvalidParamError("stream");
     }
 
-    #if DEBUG_AUDIOSTREAM
+#if DEBUG_AUDIOSTREAM
     SDL_Log("AUDIOSTREAM: flushing! staging_buffer_filled=%d bytes\n", stream->staging_buffer_filled);
-    #endif
+#endif
 
     /* shouldn't use a staging buffer if we're not resampling. */
     SDL_assert((stream->dst_rate != stream->src_rate) || (stream->staging_buffer_filled == 0));
@@ -1291,13 +1317,13 @@ int SDL_AudioStreamFlush(SDL_AudioStream *stream)
             actual_input_frames += stream->resampler_padding_samples / stream->pre_resample_channels;
         }
 
-        if (actual_input_frames > 0) {  /* don't bother if nothing to flush. */
+        if (actual_input_frames > 0) { /* don't bother if nothing to flush. */
             /* This is how many bytes we're expecting without silence appended. */
-            int flush_remaining = ((int) SDL_ceil(actual_input_frames * stream->rate_incr)) * stream->dst_sample_frame_size;
+            int flush_remaining = ((int)SDL_ceil(actual_input_frames * stream->rate_incr)) * stream->dst_sample_frame_size;
 
-            #if DEBUG_AUDIOSTREAM
+#if DEBUG_AUDIOSTREAM
             SDL_Log("AUDIOSTREAM: flushing with padding to get max %d bytes!\n", flush_remaining);
-            #endif
+#endif
 
             SDL_memset(stream->staging_buffer + filled, '\0', stream->staging_buffer_size - filled);
             if (SDL_AudioStreamPutInternal(stream, stream->staging_buffer, stream->staging_buffer_size, &flush_remaining) < 0) {
@@ -1321,12 +1347,11 @@ int SDL_AudioStreamFlush(SDL_AudioStream *stream)
 }
 
 /* get converted/resampled data from the stream */
-int
-SDL_AudioStreamGet(SDL_AudioStream *stream, void *buf, int len)
+int SDL_AudioStreamGet(SDL_AudioStream *stream, void *buf, int len)
 {
-    #if DEBUG_AUDIOSTREAM
+#if DEBUG_AUDIOSTREAM
     SDL_Log("AUDIOSTREAM: want to get %d converted bytes\n", len);
-    #endif
+#endif
 
     if (stream == NULL) {
         return SDL_InvalidParamError("stream");
@@ -1335,7 +1360,7 @@ SDL_AudioStreamGet(SDL_AudioStream *stream, void *buf, int len)
         return SDL_InvalidParamError("buf");
     }
     if (len <= 0) {
-        return 0;  /* nothing to do. */
+        return 0; /* nothing to do. */
     }
     if ((len % stream->dst_sample_frame_size) != 0) {
         return SDL_SetError("Can't request partial sample frames");
@@ -1345,14 +1370,12 @@ SDL_AudioStreamGet(SDL_AudioStream *stream, void *buf, int len)
 }
 
 /* number of converted/resampled bytes available */
-int
-SDL_AudioStreamAvailable(SDL_AudioStream *stream)
+int SDL_AudioStreamAvailable(SDL_AudioStream *stream)
 {
     return stream ? (int)SDL_CountDataQueue(stream->queue) : 0;
 }
 
-void
-SDL_AudioStreamClear(SDL_AudioStream *stream)
+void SDL_AudioStreamClear(SDL_AudioStream *stream)
 {
     if (stream == NULL) {
         SDL_InvalidParamError("stream");
@@ -1367,8 +1390,7 @@ SDL_AudioStreamClear(SDL_AudioStream *stream)
 }
 
 /* dispose of a stream */
-void
-SDL_FreeAudioStream(SDL_AudioStream *stream)
+void SDL_FreeAudioStream(SDL_AudioStream *stream)
 {
     if (stream) {
         if (stream->cleanup_resampler_func) {

src/audio/SDL_audiodev.c

@@ -33,9 +33,9 @@
 
 #ifndef _PATH_DEV_DSP
 #if defined(__NETBSD__) || defined(__OPENBSD__)
-#define _PATH_DEV_DSP  "/dev/audio"
+#define _PATH_DEV_DSP "/dev/audio"
 #else
-#define _PATH_DEV_DSP  "/dev/dsp"
+#define _PATH_DEV_DSP "/dev/dsp"
 #endif
 #endif
 #ifndef _PATH_DEV_DSP24
@@ -45,8 +45,7 @@
 #define _PATH_DEV_AUDIO "/dev/audio"
 #endif
 
-static void
-test_device(const int iscapture, const char *fname, int flags, int (*test) (int fd))
+static void test_device(const int iscapture, const char *fname, int flags, int (*test)(int fd))
 {
     struct stat sb;
     if ((stat(fname, &sb) == 0) && (S_ISCHR(sb.st_mode))) {
@@ -64,20 +63,18 @@ test_device(const int iscapture, const char *fname, int flags, int (*test) (int
                  * information,  making this information inaccessible at
                  * enumeration time
                  */
-                SDL_AddAudioDevice(iscapture, fname, NULL, (void *) (uintptr_t) dummyhandle);
+                SDL_AddAudioDevice(iscapture, fname, NULL, (void *)(uintptr_t)dummyhandle);
             }
         }
     }
 }
 
-static int
-test_stub(int fd)
+static int test_stub(int fd)
 {
     return 1;
 }
 
-static void
-SDL_EnumUnixAudioDevices_Internal(const int iscapture, const int classic, int (*test)(int))
+static void SDL_EnumUnixAudioDevices_Internal(const int iscapture, const int classic, int (*test)(int))
 {
     const int flags = iscapture ? OPEN_FLAGS_INPUT : OPEN_FLAGS_OUTPUT;
     const char *audiodev;
@@ -96,9 +93,7 @@ SDL_EnumUnixAudioDevices_Internal(const int iscapture, const int classic, int (*
             struct stat sb;
 
             /* Added support for /dev/sound/\* in Linux 2.4 */
-            if (((stat("/dev/sound", &sb) == 0) && S_ISDIR(sb.st_mode))
-                && ((stat(_PATH_DEV_DSP24, &sb) == 0)
-                    && S_ISCHR(sb.st_mode))) {
+            if (((stat("/dev/sound", &sb) == 0) && S_ISDIR(sb.st_mode)) && ((stat(_PATH_DEV_DSP24, &sb) == 0) && S_ISCHR(sb.st_mode))) {
                 audiodev = _PATH_DEV_DSP24;
             } else {
                 audiodev = _PATH_DEV_DSP;
@@ -118,8 +113,7 @@ SDL_EnumUnixAudioDevices_Internal(const int iscapture, const int classic, int (*
     }
 }
 
-void
-SDL_EnumUnixAudioDevices(const int classic, int (*test)(int))
+void SDL_EnumUnixAudioDevices(const int classic, int (*test)(int))
 {
     SDL_EnumUnixAudioDevices_Internal(SDL_TRUE, classic, test);
     SDL_EnumUnixAudioDevices_Internal(SDL_FALSE, classic, test);

src/audio/SDL_audiodev_c.h

@@ -30,10 +30,10 @@
 
 #ifdef USE_BLOCKING_WRITES
 #define OPEN_FLAGS_OUTPUT O_WRONLY
-#define OPEN_FLAGS_INPUT O_RDONLY
+#define OPEN_FLAGS_INPUT  O_RDONLY
 #else
-#define OPEN_FLAGS_OUTPUT (O_WRONLY|O_NONBLOCK)
-#define OPEN_FLAGS_INPUT (O_RDONLY|O_NONBLOCK)
+#define OPEN_FLAGS_OUTPUT (O_WRONLY | O_NONBLOCK)
+#define OPEN_FLAGS_INPUT  (O_RDONLY | O_NONBLOCK)
 #endif
 
 extern void SDL_EnumUnixAudioDevices(const int classic, int (*test)(int));

src/audio/SDL_audiotypecvt.c

@@ -31,13 +31,13 @@
 #endif
 
 #if defined(__x86_64__) && HAVE_SSE2_INTRINSICS
-#define NEED_SCALAR_CONVERTER_FALLBACKS 0  /* x86_64 guarantees SSE2. */
+#define NEED_SCALAR_CONVERTER_FALLBACKS 0 /* x86_64 guarantees SSE2. */
 #elif __MACOS__ && HAVE_SSE2_INTRINSICS
-#define NEED_SCALAR_CONVERTER_FALLBACKS 0  /* macOS/Intel guarantees SSE2. */
+#define NEED_SCALAR_CONVERTER_FALLBACKS 0 /* macOS/Intel guarantees SSE2. */
 #elif defined(__ARM_ARCH) && (__ARM_ARCH >= 8) && HAVE_NEON_INTRINSICS
-#define NEED_SCALAR_CONVERTER_FALLBACKS 0  /* ARMv8+ promise NEON. */
+#define NEED_SCALAR_CONVERTER_FALLBACKS 0 /* ARMv8+ promise NEON. */
 #elif defined(__APPLE__) && defined(__ARM_ARCH) && (__ARM_ARCH >= 7) && HAVE_NEON_INTRINSICS
-#define NEED_SCALAR_CONVERTER_FALLBACKS 0  /* All Apple ARMv7 chips promise NEON support. */
+#define NEED_SCALAR_CONVERTER_FALLBACKS 0 /* All Apple ARMv7 chips promise NEON support. */
 #endif
 
 /* Set to zero if platform is guaranteed to use a SIMD codepath here. */
@@ -57,24 +57,21 @@ SDL_AudioFilter SDL_Convert_F32_to_S16 = NULL;
 SDL_AudioFilter SDL_Convert_F32_to_U16 = NULL;
 SDL_AudioFilter SDL_Convert_F32_to_S32 = NULL;
 
-
-#define DIVBY128 0.0078125f
-#define DIVBY32768 0.000030517578125f
+#define DIVBY128     0.0078125f
+#define DIVBY32768   0.000030517578125f
 #define DIVBY8388607 0.00000011920930376163766f
 
-
 #if NEED_SCALAR_CONVERTER_FALLBACKS
-static void SDLCALL
-SDL_Convert_S8_to_F32_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_S8_to_F32_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const Sint8 *src = ((const Sint8 *) (cvt->buf + cvt->len_cvt)) - 1;
-    float *dst = ((float *) (cvt->buf + cvt->len_cvt * 4)) - 1;
+    const Sint8 *src = ((const Sint8 *)(cvt->buf + cvt->len_cvt)) - 1;
+    float *dst = ((float *)(cvt->buf + cvt->len_cvt * 4)) - 1;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_S8", "AUDIO_F32");
 
     for (i = cvt->len_cvt; i; --i, --src, --dst) {
-        *dst = ((float) *src) * DIVBY128;
+        *dst = ((float)*src) * DIVBY128;
     }
 
     cvt->len_cvt *= 4;
@@ -83,17 +80,16 @@ SDL_Convert_S8_to_F32_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_U8_to_F32_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_U8_to_F32_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const Uint8 *src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
-    float *dst = ((float *) (cvt->buf + cvt->len_cvt * 4)) - 1;
+    const Uint8 *src = ((const Uint8 *)(cvt->buf + cvt->len_cvt)) - 1;
+    float *dst = ((float *)(cvt->buf + cvt->len_cvt * 4)) - 1;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_U8", "AUDIO_F32");
 
     for (i = cvt->len_cvt; i; --i, --src, --dst) {
-        *dst = (((float) *src) * DIVBY128) - 1.0f;
+        *dst = (((float)*src) * DIVBY128) - 1.0f;
     }
 
     cvt->len_cvt *= 4;
@@ -102,17 +98,16 @@ SDL_Convert_U8_to_F32_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_S16_to_F32_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_S16_to_F32_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const Sint16 *src = ((const Sint16 *) (cvt->buf + cvt->len_cvt)) - 1;
-    float *dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    const Sint16 *src = ((const Sint16 *)(cvt->buf + cvt->len_cvt)) - 1;
+    float *dst = ((float *)(cvt->buf + cvt->len_cvt * 2)) - 1;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_S16", "AUDIO_F32");
 
-    for (i = cvt->len_cvt / sizeof (Sint16); i; --i, --src, --dst) {
-        *dst = ((float) *src) * DIVBY32768;
+    for (i = cvt->len_cvt / sizeof(Sint16); i; --i, --src, --dst) {
+        *dst = ((float)*src) * DIVBY32768;
     }
 
     cvt->len_cvt *= 2;
@@ -121,17 +116,16 @@ SDL_Convert_S16_to_F32_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_U16_to_F32_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_U16_to_F32_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const Uint16 *src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
-    float *dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    const Uint16 *src = ((const Uint16 *)(cvt->buf + cvt->len_cvt)) - 1;
+    float *dst = ((float *)(cvt->buf + cvt->len_cvt * 2)) - 1;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_U16", "AUDIO_F32");
 
-    for (i = cvt->len_cvt / sizeof (Uint16); i; --i, --src, --dst) {
-        *dst = (((float) *src) * DIVBY32768) - 1.0f;
+    for (i = cvt->len_cvt / sizeof(Uint16); i; --i, --src, --dst) {
+        *dst = (((float)*src) * DIVBY32768) - 1.0f;
     }
 
     cvt->len_cvt *= 2;
@@ -140,17 +134,16 @@ SDL_Convert_U16_to_F32_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_S32_to_F32_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_S32_to_F32_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const Sint32 *src = (const Sint32 *) cvt->buf;
-    float *dst = (float *) cvt->buf;
+    const Sint32 *src = (const Sint32 *)cvt->buf;
+    float *dst = (float *)cvt->buf;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_S32", "AUDIO_F32");
 
-    for (i = cvt->len_cvt / sizeof (Sint32); i; --i, ++src, ++dst) {
-        *dst = ((float) (*src>>8)) * DIVBY8388607;
+    for (i = cvt->len_cvt / sizeof(Sint32); i; --i, ++src, ++dst) {
+        *dst = ((float)(*src >> 8)) * DIVBY8388607;
     }
 
     if (cvt->filters[++cvt->filter_index]) {
@@ -158,16 +151,15 @@ SDL_Convert_S32_to_F32_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_F32_to_S8_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_F32_to_S8_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const float *src = (const float *) cvt->buf;
-    Sint8 *dst = (Sint8 *) cvt->buf;
+    const float *src = (const float *)cvt->buf;
+    Sint8 *dst = (Sint8 *)cvt->buf;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_F32", "AUDIO_S8");
 
-    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+    for (i = cvt->len_cvt / sizeof(float); i; --i, ++src, ++dst) {
         const float sample = *src;
         if (sample >= 1.0f) {
             *dst = 127;
@@ -184,16 +176,15 @@ SDL_Convert_F32_to_S8_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_F32_to_U8_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_F32_to_U8_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const float *src = (const float *) cvt->buf;
-    Uint8 *dst = (Uint8 *) cvt->buf;
+    const float *src = (const float *)cvt->buf;
+    Uint8 *dst = (Uint8 *)cvt->buf;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_F32", "AUDIO_U8");
 
-    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+    for (i = cvt->len_cvt / sizeof(float); i; --i, ++src, ++dst) {
         const float sample = *src;
         if (sample >= 1.0f) {
             *dst = 255;
@@ -210,16 +201,15 @@ SDL_Convert_F32_to_U8_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_F32_to_S16_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_F32_to_S16_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const float *src = (const float *) cvt->buf;
-    Sint16 *dst = (Sint16 *) cvt->buf;
+    const float *src = (const float *)cvt->buf;
+    Sint16 *dst = (Sint16 *)cvt->buf;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_F32", "AUDIO_S16");
 
-    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+    for (i = cvt->len_cvt / sizeof(float); i; --i, ++src, ++dst) {
         const float sample = *src;
         if (sample >= 1.0f) {
             *dst = 32767;
@@ -236,16 +226,15 @@ SDL_Convert_F32_to_S16_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_F32_to_U16_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_F32_to_U16_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const float *src = (const float *) cvt->buf;
-    Uint16 *dst = (Uint16 *) cvt->buf;
+    const float *src = (const float *)cvt->buf;
+    Uint16 *dst = (Uint16 *)cvt->buf;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_F32", "AUDIO_U16");
 
-    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+    for (i = cvt->len_cvt / sizeof(float); i; --i, ++src, ++dst) {
         const float sample = *src;
         if (sample >= 1.0f) {
             *dst = 65535;
@@ -262,21 +251,20 @@ SDL_Convert_F32_to_U16_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_F32_to_S32_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_F32_to_S32_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const float *src = (const float *) cvt->buf;
-    Sint32 *dst = (Sint32 *) cvt->buf;
+    const float *src = (const float *)cvt->buf;
+    Sint32 *dst = (Sint32 *)cvt->buf;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_F32", "AUDIO_S32");
 
-    for (i = cvt->len_cvt / sizeof (float); i; --i, ++src, ++dst) {
+    for (i = cvt->len_cvt / sizeof(float); i; --i, ++src, ++dst) {
         const float sample = *src;
         if (sample >= 1.0f) {
             *dst = 2147483647;
         } else if (sample <= -1.0f) {
-            *dst = (Sint32) -2147483648LL;
+            *dst = (Sint32)-2147483648LL;
         } else {
             *dst = ((Sint32)(sample * 8388607.0f)) << 8;
         }
@@ -288,33 +276,32 @@ SDL_Convert_F32_to_S32_Scalar(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 }
 #endif
 
-
 #if HAVE_SSE2_INTRINSICS
-static void SDLCALL
-SDL_Convert_S8_to_F32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_S8_to_F32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const Sint8 *src = ((const Sint8 *) (cvt->buf + cvt->len_cvt)) - 1;
-    float *dst = ((float *) (cvt->buf + cvt->len_cvt * 4)) - 1;
+    const Sint8 *src = ((const Sint8 *)(cvt->buf + cvt->len_cvt)) - 1;
+    float *dst = ((float *)(cvt->buf + cvt->len_cvt * 4)) - 1;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_S8", "AUDIO_F32 (using SSE2)");
 
     /* Get dst aligned to 16 bytes (since buffer is growing, we don't have to worry about overreading from src) */
-    for (i = cvt->len_cvt; i && (((size_t) (dst-15)) & 15); --i, --src, --dst) {
-        *dst = ((float) *src) * DIVBY128;
+    for (i = cvt->len_cvt; i && (((size_t)(dst - 15)) & 15); --i, --src, --dst) {
+        *dst = ((float)*src) * DIVBY128;
     }
 
-    src -= 15; dst -= 15;  /* adjust to read SSE blocks from the start. */
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
+    src -= 15;
+    dst -= 15; /* adjust to read SSE blocks from the start. */
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
 
     /* Make sure src is aligned too. */
-    if ((((size_t) src) & 15) == 0) {
+    if ((((size_t)src) & 15) == 0) {
         /* Aligned! Do SSE blocks as long as we have 16 bytes available. */
-        const __m128i *mmsrc = (const __m128i *) src;
+        const __m128i *mmsrc = (const __m128i *)src;
         const __m128i zero = _mm_setzero_si128();
         const __m128 divby128 = _mm_set1_ps(DIVBY128);
-        while (i >= 16) {   /* 16 * 8-bit */
-            const __m128i bytes = _mm_load_si128(mmsrc);  /* get 16 sint8 into an XMM register. */
+        while (i >= 16) {                                /* 16 * 8-bit */
+            const __m128i bytes = _mm_load_si128(mmsrc); /* get 16 sint8 into an XMM register. */
             /* treat as int16, shift left to clear every other sint16, then back right with sign-extend. Now sint16. */
             const __m128i shorts1 = _mm_srai_epi16(_mm_slli_epi16(bytes, 8), 8);
             /* right-shift-sign-extend gets us sint16 with the other set of values. */
@@ -326,21 +313,26 @@ SDL_Convert_S8_to_F32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
             const __m128 floats4 = _mm_mul_ps(_mm_cvtepi32_ps(_mm_srai_epi32(_mm_slli_epi32(_mm_unpackhi_epi16(shorts2, zero), 16), 16)), divby128);
             /* Interleave back into correct order, store. */
             _mm_store_ps(dst, _mm_unpacklo_ps(floats1, floats2));
-            _mm_store_ps(dst+4, _mm_unpackhi_ps(floats1, floats2));
-            _mm_store_ps(dst+8, _mm_unpacklo_ps(floats3, floats4));
-            _mm_store_ps(dst+12, _mm_unpackhi_ps(floats3, floats4));
-            i -= 16; mmsrc--; dst -= 16;
+            _mm_store_ps(dst + 4, _mm_unpackhi_ps(floats1, floats2));
+            _mm_store_ps(dst + 8, _mm_unpacklo_ps(floats3, floats4));
+            _mm_store_ps(dst + 12, _mm_unpackhi_ps(floats3, floats4));
+            i -= 16;
+            mmsrc--;
+            dst -= 16;
         }
 
-        src = (const Sint8 *) mmsrc;
+        src = (const Sint8 *)mmsrc;
     }
 
-    src += 15; dst += 15;  /* adjust for any scalar finishing. */
+    src += 15;
+    dst += 15; /* adjust for any scalar finishing. */
 
     /* Finish off any leftovers with scalar operations. */
     while (i) {
-        *dst = ((float) *src) * DIVBY128;
-        i--; src--; dst--;
+        *dst = ((float)*src) * DIVBY128;
+        i--;
+        src--;
+        dst--;
     }
 
     cvt->len_cvt *= 4;
@@ -349,32 +341,32 @@ SDL_Convert_S8_to_F32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_U8_to_F32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_U8_to_F32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const Uint8 *src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
-    float *dst = ((float *) (cvt->buf + cvt->len_cvt * 4)) - 1;
+    const Uint8 *src = ((const Uint8 *)(cvt->buf + cvt->len_cvt)) - 1;
+    float *dst = ((float *)(cvt->buf + cvt->len_cvt * 4)) - 1;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_U8", "AUDIO_F32 (using SSE2)");
 
     /* Get dst aligned to 16 bytes (since buffer is growing, we don't have to worry about overreading from src) */
-    for (i = cvt->len_cvt; i && (((size_t) (dst-15)) & 15); --i, --src, --dst) {
-        *dst = (((float) *src) * DIVBY128) - 1.0f;
+    for (i = cvt->len_cvt; i && (((size_t)(dst - 15)) & 15); --i, --src, --dst) {
+        *dst = (((float)*src) * DIVBY128) - 1.0f;
     }
 
-    src -= 15; dst -= 15;  /* adjust to read SSE blocks from the start. */
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
+    src -= 15;
+    dst -= 15; /* adjust to read SSE blocks from the start. */
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
 
     /* Make sure src is aligned too. */
-    if ((((size_t) src) & 15) == 0) {
+    if ((((size_t)src) & 15) == 0) {
         /* Aligned! Do SSE blocks as long as we have 16 bytes available. */
-        const __m128i *mmsrc = (const __m128i *) src;
+        const __m128i *mmsrc = (const __m128i *)src;
         const __m128i zero = _mm_setzero_si128();
         const __m128 divby128 = _mm_set1_ps(DIVBY128);
         const __m128 minus1 = _mm_set1_ps(-1.0f);
-        while (i >= 16) {   /* 16 * 8-bit */
-            const __m128i bytes = _mm_load_si128(mmsrc);  /* get 16 uint8 into an XMM register. */
+        while (i >= 16) {                                /* 16 * 8-bit */
+            const __m128i bytes = _mm_load_si128(mmsrc); /* get 16 uint8 into an XMM register. */
             /* treat as int16, shift left to clear every other sint16, then back right with zero-extend. Now uint16. */
             const __m128i shorts1 = _mm_srli_epi16(_mm_slli_epi16(bytes, 8), 8);
             /* right-shift-zero-extend gets us uint16 with the other set of values. */
@@ -387,21 +379,26 @@ SDL_Convert_U8_to_F32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
             const __m128 floats4 = _mm_add_ps(_mm_mul_ps(_mm_cvtepi32_ps(_mm_unpackhi_epi16(shorts2, zero)), divby128), minus1);
             /* Interleave back into correct order, store. */
             _mm_store_ps(dst, _mm_unpacklo_ps(floats1, floats2));
-            _mm_store_ps(dst+4, _mm_unpackhi_ps(floats1, floats2));
-            _mm_store_ps(dst+8, _mm_unpacklo_ps(floats3, floats4));
-            _mm_store_ps(dst+12, _mm_unpackhi_ps(floats3, floats4));
-            i -= 16; mmsrc--; dst -= 16;
+            _mm_store_ps(dst + 4, _mm_unpackhi_ps(floats1, floats2));
+            _mm_store_ps(dst + 8, _mm_unpacklo_ps(floats3, floats4));
+            _mm_store_ps(dst + 12, _mm_unpackhi_ps(floats3, floats4));
+            i -= 16;
+            mmsrc--;
+            dst -= 16;
         }
 
-        src = (const Uint8 *) mmsrc;
+        src = (const Uint8 *)mmsrc;
     }
 
-    src += 15; dst += 15;  /* adjust for any scalar finishing. */
+    src += 15;
+    dst += 15; /* adjust for any scalar finishing. */
 
     /* Finish off any leftovers with scalar operations. */
     while (i) {
-        *dst = (((float) *src) * DIVBY128) - 1.0f;
-        i--; src--; dst--;
+        *dst = (((float)*src) * DIVBY128) - 1.0f;
+        i--;
+        src--;
+        dst--;
     }
 
     cvt->len_cvt *= 4;
@@ -410,46 +407,51 @@ SDL_Convert_U8_to_F32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_S16_to_F32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_S16_to_F32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const Sint16 *src = ((const Sint16 *) (cvt->buf + cvt->len_cvt)) - 1;
-    float *dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    const Sint16 *src = ((const Sint16 *)(cvt->buf + cvt->len_cvt)) - 1;
+    float *dst = ((float *)(cvt->buf + cvt->len_cvt * 2)) - 1;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_S16", "AUDIO_F32 (using SSE2)");
 
     /* Get dst aligned to 16 bytes (since buffer is growing, we don't have to worry about overreading from src) */
-    for (i = cvt->len_cvt / sizeof (Sint16); i && (((size_t) (dst-7)) & 15); --i, --src, --dst) {
-        *dst = ((float) *src) * DIVBY32768;
+    for (i = cvt->len_cvt / sizeof(Sint16); i && (((size_t)(dst - 7)) & 15); --i, --src, --dst) {
+        *dst = ((float)*src) * DIVBY32768;
     }
 
-    src -= 7; dst -= 7;  /* adjust to read SSE blocks from the start. */
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
+    src -= 7;
+    dst -= 7; /* adjust to read SSE blocks from the start. */
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
 
     /* Make sure src is aligned too. */
-    if ((((size_t) src) & 15) == 0) {
+    if ((((size_t)src) & 15) == 0) {
         /* Aligned! Do SSE blocks as long as we have 16 bytes available. */
         const __m128 divby32768 = _mm_set1_ps(DIVBY32768);
-        while (i >= 8) {   /* 8 * 16-bit */
-            const __m128i ints = _mm_load_si128((__m128i const *) src);  /* get 8 sint16 into an XMM register. */
+        while (i >= 8) {                                               /* 8 * 16-bit */
+            const __m128i ints = _mm_load_si128((__m128i const *)src); /* get 8 sint16 into an XMM register. */
             /* treat as int32, shift left to clear every other sint16, then back right with sign-extend. Now sint32. */
             const __m128i a = _mm_srai_epi32(_mm_slli_epi32(ints, 16), 16);
             /* right-shift-sign-extend gets us sint32 with the other set of values. */
             const __m128i b = _mm_srai_epi32(ints, 16);
             /* Interleave these back into the right order, convert to float, multiply, store. */
             _mm_store_ps(dst, _mm_mul_ps(_mm_cvtepi32_ps(_mm_unpacklo_epi32(a, b)), divby32768));
-            _mm_store_ps(dst+4, _mm_mul_ps(_mm_cvtepi32_ps(_mm_unpackhi_epi32(a, b)), divby32768));
-            i -= 8; src -= 8; dst -= 8;
+            _mm_store_ps(dst + 4, _mm_mul_ps(_mm_cvtepi32_ps(_mm_unpackhi_epi32(a, b)), divby32768));
+            i -= 8;
+            src -= 8;
+            dst -= 8;
         }
     }
 
-    src += 7; dst += 7;  /* adjust for any scalar finishing. */
+    src += 7;
+    dst += 7; /* adjust for any scalar finishing. */
 
     /* Finish off any leftovers with scalar operations. */
     while (i) {
-        *dst = ((float) *src) * DIVBY32768;
-        i--; src--; dst--;
+        *dst = ((float)*src) * DIVBY32768;
+        i--;
+        src--;
+        dst--;
     }
 
     cvt->len_cvt *= 2;
@@ -458,47 +460,52 @@ SDL_Convert_S16_to_F32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_U16_to_F32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_U16_to_F32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const Uint16 *src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
-    float *dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    const Uint16 *src = ((const Uint16 *)(cvt->buf + cvt->len_cvt)) - 1;
+    float *dst = ((float *)(cvt->buf + cvt->len_cvt * 2)) - 1;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_U16", "AUDIO_F32 (using SSE2)");
 
     /* Get dst aligned to 16 bytes (since buffer is growing, we don't have to worry about overreading from src) */
-    for (i = cvt->len_cvt / sizeof (Sint16); i && (((size_t) (dst-7)) & 15); --i, --src, --dst) {
-        *dst = (((float) *src) * DIVBY32768) - 1.0f;
+    for (i = cvt->len_cvt / sizeof(Sint16); i && (((size_t)(dst - 7)) & 15); --i, --src, --dst) {
+        *dst = (((float)*src) * DIVBY32768) - 1.0f;
     }
 
-    src -= 7; dst -= 7;  /* adjust to read SSE blocks from the start. */
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
+    src -= 7;
+    dst -= 7; /* adjust to read SSE blocks from the start. */
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
 
     /* Make sure src is aligned too. */
-    if ((((size_t) src) & 15) == 0) {
+    if ((((size_t)src) & 15) == 0) {
         /* Aligned! Do SSE blocks as long as we have 16 bytes available. */
         const __m128 divby32768 = _mm_set1_ps(DIVBY32768);
         const __m128 minus1 = _mm_set1_ps(-1.0f);
-        while (i >= 8) {   /* 8 * 16-bit */
-            const __m128i ints = _mm_load_si128((__m128i const *) src);  /* get 8 sint16 into an XMM register. */
+        while (i >= 8) {                                               /* 8 * 16-bit */
+            const __m128i ints = _mm_load_si128((__m128i const *)src); /* get 8 sint16 into an XMM register. */
             /* treat as int32, shift left to clear every other sint16, then back right with zero-extend. Now sint32. */
             const __m128i a = _mm_srli_epi32(_mm_slli_epi32(ints, 16), 16);
             /* right-shift-sign-extend gets us sint32 with the other set of values. */
             const __m128i b = _mm_srli_epi32(ints, 16);
             /* Interleave these back into the right order, convert to float, multiply, store. */
             _mm_store_ps(dst, _mm_add_ps(_mm_mul_ps(_mm_cvtepi32_ps(_mm_unpacklo_epi32(a, b)), divby32768), minus1));
-            _mm_store_ps(dst+4, _mm_add_ps(_mm_mul_ps(_mm_cvtepi32_ps(_mm_unpackhi_epi32(a, b)), divby32768), minus1));
-            i -= 8; src -= 8; dst -= 8;
+            _mm_store_ps(dst + 4, _mm_add_ps(_mm_mul_ps(_mm_cvtepi32_ps(_mm_unpackhi_epi32(a, b)), divby32768), minus1));
+            i -= 8;
+            src -= 8;
+            dst -= 8;
         }
     }
 
-    src += 7; dst += 7;  /* adjust for any scalar finishing. */
+    src += 7;
+    dst += 7; /* adjust for any scalar finishing. */
 
     /* Finish off any leftovers with scalar operations. */
     while (i) {
-        *dst = (((float) *src) * DIVBY32768) - 1.0f;
-        i--; src--; dst--;
+        *dst = (((float)*src) * DIVBY32768) - 1.0f;
+        i--;
+        src--;
+        dst--;
     }
 
     cvt->len_cvt *= 2;
@@ -507,39 +514,42 @@ SDL_Convert_U16_to_F32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_S32_to_F32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_S32_to_F32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const Sint32 *src = (const Sint32 *) cvt->buf;
-    float *dst = (float *) cvt->buf;
+    const Sint32 *src = (const Sint32 *)cvt->buf;
+    float *dst = (float *)cvt->buf;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_S32", "AUDIO_F32 (using SSE2)");
 
     /* Get dst aligned to 16 bytes */
-    for (i = cvt->len_cvt / sizeof (Sint32); i && (((size_t) dst) & 15); --i, ++src, ++dst) {
-        *dst = ((float) (*src>>8)) * DIVBY8388607;
+    for (i = cvt->len_cvt / sizeof(Sint32); i && (((size_t)dst) & 15); --i, ++src, ++dst) {
+        *dst = ((float)(*src >> 8)) * DIVBY8388607;
     }
 
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
 
     /* Make sure src is aligned too. */
-    if ((((size_t) src) & 15) == 0) {
+    if ((((size_t)src) & 15) == 0) {
         /* Aligned! Do SSE blocks as long as we have 16 bytes available. */
         const __m128 divby8388607 = _mm_set1_ps(DIVBY8388607);
-        const __m128i *mmsrc = (const __m128i *) src;
-        while (i >= 4) {   /* 4 * sint32 */
+        const __m128i *mmsrc = (const __m128i *)src;
+        while (i >= 4) { /* 4 * sint32 */
             /* shift out lowest bits so int fits in a float32. Small precision loss, but much faster. */
             _mm_store_ps(dst, _mm_mul_ps(_mm_cvtepi32_ps(_mm_srai_epi32(_mm_load_si128(mmsrc), 8)), divby8388607));
-            i -= 4; mmsrc++; dst += 4;
+            i -= 4;
+            mmsrc++;
+            dst += 4;
         }
-        src = (const Sint32 *) mmsrc;
+        src = (const Sint32 *)mmsrc;
     }
 
     /* Finish off any leftovers with scalar operations. */
     while (i) {
-        *dst = ((float) (*src>>8)) * DIVBY8388607;
-        i--; src++; dst++;
+        *dst = ((float)(*src >> 8)) * DIVBY8388607;
+        i--;
+        src++;
+        dst++;
     }
 
     if (cvt->filters[++cvt->filter_index]) {
@@ -547,17 +557,16 @@ SDL_Convert_S32_to_F32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_F32_to_S8_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_F32_to_S8_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const float *src = (const float *) cvt->buf;
-    Sint8 *dst = (Sint8 *) cvt->buf;
+    const float *src = (const float *)cvt->buf;
+    Sint8 *dst = (Sint8 *)cvt->buf;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_F32", "AUDIO_S8 (using SSE2)");
 
     /* Get dst aligned to 16 bytes */
-    for (i = cvt->len_cvt / sizeof (float); i && (((size_t) dst) & 15); --i, ++src, ++dst) {
+    for (i = cvt->len_cvt / sizeof(float); i && (((size_t)dst) & 15); --i, ++src, ++dst) {
         const float sample = *src;
         if (sample >= 1.0f) {
             *dst = 127;
@@ -568,24 +577,26 @@ SDL_Convert_F32_to_S8_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         }
     }
 
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
 
     /* Make sure src is aligned too. */
-    if ((((size_t) src) & 15) == 0) {
+    if ((((size_t)src) & 15) == 0) {
         /* Aligned! Do SSE blocks as long as we have 16 bytes available. */
         const __m128 one = _mm_set1_ps(1.0f);
         const __m128 negone = _mm_set1_ps(-1.0f);
         const __m128 mulby127 = _mm_set1_ps(127.0f);
-        __m128i *mmdst = (__m128i *) dst;
-        while (i >= 16) {   /* 16 * float32 */
-            const __m128i ints1 = _mm_cvtps_epi32(_mm_mul_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src)), one), mulby127));  /* load 4 floats, clamp, convert to sint32 */
-            const __m128i ints2 = _mm_cvtps_epi32(_mm_mul_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src+4)), one), mulby127));  /* load 4 floats, clamp, convert to sint32 */
-            const __m128i ints3 = _mm_cvtps_epi32(_mm_mul_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src+8)), one), mulby127));  /* load 4 floats, clamp, convert to sint32 */
-            const __m128i ints4 = _mm_cvtps_epi32(_mm_mul_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src+12)), one), mulby127));  /* load 4 floats, clamp, convert to sint32 */
-            _mm_store_si128(mmdst, _mm_packs_epi16(_mm_packs_epi32(ints1, ints2), _mm_packs_epi32(ints3, ints4)));  /* pack down, store out. */
-            i -= 16; src += 16; mmdst++;
+        __m128i *mmdst = (__m128i *)dst;
+        while (i >= 16) {                                                                                                            /* 16 * float32 */
+            const __m128i ints1 = _mm_cvtps_epi32(_mm_mul_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src)), one), mulby127));      /* load 4 floats, clamp, convert to sint32 */
+            const __m128i ints2 = _mm_cvtps_epi32(_mm_mul_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src + 4)), one), mulby127));  /* load 4 floats, clamp, convert to sint32 */
+            const __m128i ints3 = _mm_cvtps_epi32(_mm_mul_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src + 8)), one), mulby127));  /* load 4 floats, clamp, convert to sint32 */
+            const __m128i ints4 = _mm_cvtps_epi32(_mm_mul_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src + 12)), one), mulby127)); /* load 4 floats, clamp, convert to sint32 */
+            _mm_store_si128(mmdst, _mm_packs_epi16(_mm_packs_epi32(ints1, ints2), _mm_packs_epi32(ints3, ints4)));                   /* pack down, store out. */
+            i -= 16;
+            src += 16;
+            mmdst++;
         }
-        dst = (Sint8 *) mmdst;
+        dst = (Sint8 *)mmdst;
     }
 
     /* Finish off any leftovers with scalar operations. */
@@ -598,7 +609,9 @@ SDL_Convert_F32_to_S8_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         } else {
             *dst = (Sint8)(sample * 127.0f);
         }
-        i--; src++; dst++;
+        i--;
+        src++;
+        dst++;
     }
 
     cvt->len_cvt /= 4;
@@ -607,17 +620,16 @@ SDL_Convert_F32_to_S8_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_F32_to_U8_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_F32_to_U8_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const float *src = (const float *) cvt->buf;
+    const float *src = (const float *)cvt->buf;
     Uint8 *dst = cvt->buf;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_F32", "AUDIO_U8 (using SSE2)");
 
     /* Get dst aligned to 16 bytes */
-    for (i = cvt->len_cvt / sizeof (float); i && (((size_t) dst) & 15); --i, ++src, ++dst) {
+    for (i = cvt->len_cvt / sizeof(float); i && (((size_t)dst) & 15); --i, ++src, ++dst) {
         const float sample = *src;
         if (sample >= 1.0f) {
             *dst = 255;
@@ -628,24 +640,26 @@ SDL_Convert_F32_to_U8_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         }
     }
 
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
 
     /* Make sure src is aligned too. */
-    if ((((size_t) src) & 15) == 0) {
+    if ((((size_t)src) & 15) == 0) {
         /* Aligned! Do SSE blocks as long as we have 16 bytes available. */
         const __m128 one = _mm_set1_ps(1.0f);
         const __m128 negone = _mm_set1_ps(-1.0f);
         const __m128 mulby127 = _mm_set1_ps(127.0f);
-        __m128i *mmdst = (__m128i *) dst;
-        while (i >= 16) {   /* 16 * float32 */
-            const __m128i ints1 = _mm_cvtps_epi32(_mm_mul_ps(_mm_add_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src)), one), one), mulby127));  /* load 4 floats, clamp, convert to sint32 */
-            const __m128i ints2 = _mm_cvtps_epi32(_mm_mul_ps(_mm_add_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src+4)), one), one), mulby127));  /* load 4 floats, clamp, convert to sint32 */
-            const __m128i ints3 = _mm_cvtps_epi32(_mm_mul_ps(_mm_add_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src+8)), one), one), mulby127));  /* load 4 floats, clamp, convert to sint32 */
-            const __m128i ints4 = _mm_cvtps_epi32(_mm_mul_ps(_mm_add_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src+12)), one), one), mulby127));  /* load 4 floats, clamp, convert to sint32 */
-            _mm_store_si128(mmdst, _mm_packus_epi16(_mm_packs_epi32(ints1, ints2), _mm_packs_epi32(ints3, ints4)));  /* pack down, store out. */
-            i -= 16; src += 16; mmdst++;
+        __m128i *mmdst = (__m128i *)dst;
+        while (i >= 16) {                                                                                                                             /* 16 * float32 */
+            const __m128i ints1 = _mm_cvtps_epi32(_mm_mul_ps(_mm_add_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src)), one), one), mulby127));      /* load 4 floats, clamp, convert to sint32 */
+            const __m128i ints2 = _mm_cvtps_epi32(_mm_mul_ps(_mm_add_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src + 4)), one), one), mulby127));  /* load 4 floats, clamp, convert to sint32 */
+            const __m128i ints3 = _mm_cvtps_epi32(_mm_mul_ps(_mm_add_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src + 8)), one), one), mulby127));  /* load 4 floats, clamp, convert to sint32 */
+            const __m128i ints4 = _mm_cvtps_epi32(_mm_mul_ps(_mm_add_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src + 12)), one), one), mulby127)); /* load 4 floats, clamp, convert to sint32 */
+            _mm_store_si128(mmdst, _mm_packus_epi16(_mm_packs_epi32(ints1, ints2), _mm_packs_epi32(ints3, ints4)));                                   /* pack down, store out. */
+            i -= 16;
+            src += 16;
+            mmdst++;
         }
-        dst = (Uint8 *) mmdst;
+        dst = (Uint8 *)mmdst;
     }
 
     /* Finish off any leftovers with scalar operations. */
@@ -658,7 +672,9 @@ SDL_Convert_F32_to_U8_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         } else {
             *dst = (Uint8)((sample + 1.0f) * 127.0f);
         }
-        i--; src++; dst++;
+        i--;
+        src++;
+        dst++;
     }
 
     cvt->len_cvt /= 4;
@@ -667,17 +683,16 @@ SDL_Convert_F32_to_U8_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_F32_to_S16_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_F32_to_S16_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const float *src = (const float *) cvt->buf;
-    Sint16 *dst = (Sint16 *) cvt->buf;
+    const float *src = (const float *)cvt->buf;
+    Sint16 *dst = (Sint16 *)cvt->buf;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_F32", "AUDIO_S16 (using SSE2)");
 
     /* Get dst aligned to 16 bytes */
-    for (i = cvt->len_cvt / sizeof (float); i && (((size_t) dst) & 15); --i, ++src, ++dst) {
+    for (i = cvt->len_cvt / sizeof(float); i && (((size_t)dst) & 15); --i, ++src, ++dst) {
         const float sample = *src;
         if (sample >= 1.0f) {
             *dst = 32767;
@@ -688,22 +703,24 @@ SDL_Convert_F32_to_S16_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         }
     }
 
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
 
     /* Make sure src is aligned too. */
-    if ((((size_t) src) & 15) == 0) {
+    if ((((size_t)src) & 15) == 0) {
         /* Aligned! Do SSE blocks as long as we have 16 bytes available. */
         const __m128 one = _mm_set1_ps(1.0f);
         const __m128 negone = _mm_set1_ps(-1.0f);
         const __m128 mulby32767 = _mm_set1_ps(32767.0f);
-        __m128i *mmdst = (__m128i *) dst;
-        while (i >= 8) {   /* 8 * float32 */
-            const __m128i ints1 = _mm_cvtps_epi32(_mm_mul_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src)), one), mulby32767));  /* load 4 floats, clamp, convert to sint32 */
-            const __m128i ints2 = _mm_cvtps_epi32(_mm_mul_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src+4)), one), mulby32767));  /* load 4 floats, clamp, convert to sint32 */
-            _mm_store_si128(mmdst, _mm_packs_epi32(ints1, ints2));  /* pack to sint16, store out. */
-            i -= 8; src += 8; mmdst++;
+        __m128i *mmdst = (__m128i *)dst;
+        while (i >= 8) {                                                                                                              /* 8 * float32 */
+            const __m128i ints1 = _mm_cvtps_epi32(_mm_mul_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src)), one), mulby32767));     /* load 4 floats, clamp, convert to sint32 */
+            const __m128i ints2 = _mm_cvtps_epi32(_mm_mul_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src + 4)), one), mulby32767)); /* load 4 floats, clamp, convert to sint32 */
+            _mm_store_si128(mmdst, _mm_packs_epi32(ints1, ints2));                                                                    /* pack to sint16, store out. */
+            i -= 8;
+            src += 8;
+            mmdst++;
         }
-        dst = (Sint16 *) mmdst;
+        dst = (Sint16 *)mmdst;
     }
 
     /* Finish off any leftovers with scalar operations. */
@@ -716,7 +733,9 @@ SDL_Convert_F32_to_S16_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         } else {
             *dst = (Sint16)(sample * 32767.0f);
         }
-        i--; src++; dst++;
+        i--;
+        src++;
+        dst++;
     }
 
     cvt->len_cvt /= 2;
@@ -725,17 +744,16 @@ SDL_Convert_F32_to_S16_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_F32_to_U16_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_F32_to_U16_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const float *src = (const float *) cvt->buf;
-    Uint16 *dst = (Uint16 *) cvt->buf;
+    const float *src = (const float *)cvt->buf;
+    Uint16 *dst = (Uint16 *)cvt->buf;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_F32", "AUDIO_U16 (using SSE2)");
 
     /* Get dst aligned to 16 bytes */
-    for (i = cvt->len_cvt / sizeof (float); i && (((size_t) dst) & 15); --i, ++src, ++dst) {
+    for (i = cvt->len_cvt / sizeof(float); i && (((size_t)dst) & 15); --i, ++src, ++dst) {
         const float sample = *src;
         if (sample >= 1.0f) {
             *dst = 65535;
@@ -746,10 +764,10 @@ SDL_Convert_F32_to_U16_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         }
     }
 
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
 
     /* Make sure src is aligned too. */
-    if ((((size_t) src) & 15) == 0) {
+    if ((((size_t)src) & 15) == 0) {
         /* Aligned! Do SSE blocks as long as we have 16 bytes available. */
         /* This calculates differently than the scalar path because SSE2 can't
            pack int32 data down to unsigned int16. _mm_packs_epi32 does signed
@@ -762,14 +780,16 @@ SDL_Convert_F32_to_U16_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         const __m128i topbit = _mm_set1_epi16(-32768);
         const __m128 one = _mm_set1_ps(1.0f);
         const __m128 negone = _mm_set1_ps(-1.0f);
-        __m128i *mmdst = (__m128i *) dst;
-        while (i >= 8) {   /* 8 * float32 */
-            const __m128i ints1 = _mm_cvtps_epi32(_mm_mul_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src)), one), mulby32767));  /* load 4 floats, clamp, convert to sint32 */
-            const __m128i ints2 = _mm_cvtps_epi32(_mm_mul_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src+4)), one), mulby32767));  /* load 4 floats, clamp, convert to sint32 */
-            _mm_store_si128(mmdst, _mm_xor_si128(_mm_packs_epi32(ints1, ints2), topbit));  /* pack to sint16, xor top bit, store out. */
-            i -= 8; src += 8; mmdst++;
+        __m128i *mmdst = (__m128i *)dst;
+        while (i >= 8) {                                                                                                              /* 8 * float32 */
+            const __m128i ints1 = _mm_cvtps_epi32(_mm_mul_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src)), one), mulby32767));     /* load 4 floats, clamp, convert to sint32 */
+            const __m128i ints2 = _mm_cvtps_epi32(_mm_mul_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src + 4)), one), mulby32767)); /* load 4 floats, clamp, convert to sint32 */
+            _mm_store_si128(mmdst, _mm_xor_si128(_mm_packs_epi32(ints1, ints2), topbit));                                             /* pack to sint16, xor top bit, store out. */
+            i -= 8;
+            src += 8;
+            mmdst++;
         }
-        dst = (Uint16 *) mmdst;
+        dst = (Uint16 *)mmdst;
     }
 
     /* Finish off any leftovers with scalar operations. */
@@ -782,7 +802,9 @@ SDL_Convert_F32_to_U16_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         } else {
             *dst = (Uint16)((sample + 1.0f) * 32767.0f);
         }
-        i--; src++; dst++;
+        i--;
+        src++;
+        dst++;
     }
 
     cvt->len_cvt /= 2;
@@ -791,41 +813,42 @@ SDL_Convert_F32_to_U16_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_F32_to_S32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_F32_to_S32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const float *src = (const float *) cvt->buf;
-    Sint32 *dst = (Sint32 *) cvt->buf;
+    const float *src = (const float *)cvt->buf;
+    Sint32 *dst = (Sint32 *)cvt->buf;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_F32", "AUDIO_S32 (using SSE2)");
 
     /* Get dst aligned to 16 bytes */
-    for (i = cvt->len_cvt / sizeof (float); i && (((size_t) dst) & 15); --i, ++src, ++dst) {
+    for (i = cvt->len_cvt / sizeof(float); i && (((size_t)dst) & 15); --i, ++src, ++dst) {
         const float sample = *src;
         if (sample >= 1.0f) {
             *dst = 2147483647;
         } else if (sample <= -1.0f) {
-            *dst = (Sint32) -2147483648LL;
+            *dst = (Sint32)-2147483648LL;
         } else {
             *dst = ((Sint32)(sample * 8388607.0f)) << 8;
         }
     }
 
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
-    SDL_assert(!i || ((((size_t) src) & 15) == 0));
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
+    SDL_assert(!i || ((((size_t)src) & 15) == 0));
 
     {
         /* Aligned! Do SSE blocks as long as we have 16 bytes available. */
         const __m128 one = _mm_set1_ps(1.0f);
         const __m128 negone = _mm_set1_ps(-1.0f);
         const __m128 mulby8388607 = _mm_set1_ps(8388607.0f);
-        __m128i *mmdst = (__m128i *) dst;
-        while (i >= 4) {   /* 4 * float32 */
-            _mm_store_si128(mmdst, _mm_slli_epi32(_mm_cvtps_epi32(_mm_mul_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src)), one), mulby8388607)), 8));  /* load 4 floats, clamp, convert to sint32 */
-            i -= 4; src += 4; mmdst++;
+        __m128i *mmdst = (__m128i *)dst;
+        while (i >= 4) {                                                                                                                                 /* 4 * float32 */
+            _mm_store_si128(mmdst, _mm_slli_epi32(_mm_cvtps_epi32(_mm_mul_ps(_mm_min_ps(_mm_max_ps(negone, _mm_load_ps(src)), one), mulby8388607)), 8)); /* load 4 floats, clamp, convert to sint32 */
+            i -= 4;
+            src += 4;
+            mmdst++;
         }
-        dst = (Sint32 *) mmdst;
+        dst = (Sint32 *)mmdst;
     }
 
     /* Finish off any leftovers with scalar operations. */
@@ -834,11 +857,13 @@ SDL_Convert_F32_to_S32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         if (sample >= 1.0f) {
             *dst = 2147483647;
         } else if (sample <= -1.0f) {
-            *dst = (Sint32) -2147483648LL;
+            *dst = (Sint32)-2147483648LL;
         } else {
             *dst = ((Sint32)(sample * 8388607.0f)) << 8;
         }
-        i--; src++; dst++;
+        i--;
+        src++;
+        dst++;
     }
 
     if (cvt->filters[++cvt->filter_index]) {
@@ -847,51 +872,55 @@ SDL_Convert_F32_to_S32_SSE2(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 }
 #endif
 
-
 #if HAVE_NEON_INTRINSICS
-static void SDLCALL
-SDL_Convert_S8_to_F32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_S8_to_F32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const Sint8 *src = ((const Sint8 *) (cvt->buf + cvt->len_cvt)) - 1;
-    float *dst = ((float *) (cvt->buf + cvt->len_cvt * 4)) - 1;
+    const Sint8 *src = ((const Sint8 *)(cvt->buf + cvt->len_cvt)) - 1;
+    float *dst = ((float *)(cvt->buf + cvt->len_cvt * 4)) - 1;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_S8", "AUDIO_F32 (using NEON)");
 
     /* Get dst aligned to 16 bytes (since buffer is growing, we don't have to worry about overreading from src) */
-    for (i = cvt->len_cvt; i && (((size_t) (dst-15)) & 15); --i, --src, --dst) {
-        *dst = ((float) *src) * DIVBY128;
+    for (i = cvt->len_cvt; i && (((size_t)(dst - 15)) & 15); --i, --src, --dst) {
+        *dst = ((float)*src) * DIVBY128;
     }
 
-    src -= 15; dst -= 15;  /* adjust to read NEON blocks from the start. */
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
+    src -= 15;
+    dst -= 15; /* adjust to read NEON blocks from the start. */
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
 
     /* Make sure src is aligned too. */
-    if ((((size_t) src) & 15) == 0) {
+    if ((((size_t)src) & 15) == 0) {
         /* Aligned! Do NEON blocks as long as we have 16 bytes available. */
-        const int8_t *mmsrc = (const int8_t *) src;
+        const int8_t *mmsrc = (const int8_t *)src;
         const float32x4_t divby128 = vdupq_n_f32(DIVBY128);
-        while (i >= 16) {   /* 16 * 8-bit */
-            const int8x16_t bytes = vld1q_s8(mmsrc);  /* get 16 sint8 into a NEON register. */
-            const int16x8_t int16hi = vmovl_s8(vget_high_s8(bytes));  /* convert top 8 bytes to 8 int16 */
-            const int16x8_t int16lo = vmovl_s8(vget_low_s8(bytes));   /* convert bottom 8 bytes to 8 int16 */
+        while (i >= 16) {                                            /* 16 * 8-bit */
+            const int8x16_t bytes = vld1q_s8(mmsrc);                 /* get 16 sint8 into a NEON register. */
+            const int16x8_t int16hi = vmovl_s8(vget_high_s8(bytes)); /* convert top 8 bytes to 8 int16 */
+            const int16x8_t int16lo = vmovl_s8(vget_low_s8(bytes));  /* convert bottom 8 bytes to 8 int16 */
             /* split int16 to two int32, then convert to float, then multiply to normalize, store. */
             vst1q_f32(dst, vmulq_f32(vcvtq_f32_s32(vmovl_s16(vget_low_s16(int16lo))), divby128));
-            vst1q_f32(dst+4, vmulq_f32(vcvtq_f32_s32(vmovl_s16(vget_high_s16(int16lo))), divby128));
-            vst1q_f32(dst+8, vmulq_f32(vcvtq_f32_s32(vmovl_s16(vget_low_s16(int16hi))), divby128));
-            vst1q_f32(dst+12, vmulq_f32(vcvtq_f32_s32(vmovl_s16(vget_high_s16(int16hi))), divby128));
-            i -= 16; mmsrc -= 16; dst -= 16;
+            vst1q_f32(dst + 4, vmulq_f32(vcvtq_f32_s32(vmovl_s16(vget_high_s16(int16lo))), divby128));
+            vst1q_f32(dst + 8, vmulq_f32(vcvtq_f32_s32(vmovl_s16(vget_low_s16(int16hi))), divby128));
+            vst1q_f32(dst + 12, vmulq_f32(vcvtq_f32_s32(vmovl_s16(vget_high_s16(int16hi))), divby128));
+            i -= 16;
+            mmsrc -= 16;
+            dst -= 16;
         }
 
-        src = (const Sint8 *) mmsrc;
+        src = (const Sint8 *)mmsrc;
     }
 
-    src += 15; dst += 15;  /* adjust for any scalar finishing. */
+    src += 15;
+    dst += 15; /* adjust for any scalar finishing. */
 
     /* Finish off any leftovers with scalar operations. */
     while (i) {
-        *dst = ((float) *src) * DIVBY128;
-        i--; src--; dst--;
+        *dst = ((float)*src) * DIVBY128;
+        i--;
+        src--;
+        dst--;
     }
 
     cvt->len_cvt *= 4;
@@ -900,50 +929,55 @@ SDL_Convert_S8_to_F32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_U8_to_F32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_U8_to_F32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const Uint8 *src = ((const Uint8 *) (cvt->buf + cvt->len_cvt)) - 1;
-    float *dst = ((float *) (cvt->buf + cvt->len_cvt * 4)) - 1;
+    const Uint8 *src = ((const Uint8 *)(cvt->buf + cvt->len_cvt)) - 1;
+    float *dst = ((float *)(cvt->buf + cvt->len_cvt * 4)) - 1;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_U8", "AUDIO_F32 (using NEON)");
 
     /* Get dst aligned to 16 bytes (since buffer is growing, we don't have to worry about overreading from src) */
-    for (i = cvt->len_cvt; i && (((size_t) (dst-15)) & 15); --i, --src, --dst) {
-        *dst = (((float) *src) * DIVBY128) - 1.0f;
+    for (i = cvt->len_cvt; i && (((size_t)(dst - 15)) & 15); --i, --src, --dst) {
+        *dst = (((float)*src) * DIVBY128) - 1.0f;
     }
 
-    src -= 15; dst -= 15;  /* adjust to read NEON blocks from the start. */
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
+    src -= 15;
+    dst -= 15; /* adjust to read NEON blocks from the start. */
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
 
     /* Make sure src is aligned too. */
-    if ((((size_t) src) & 15) == 0) {
+    if ((((size_t)src) & 15) == 0) {
         /* Aligned! Do NEON blocks as long as we have 16 bytes available. */
-        const uint8_t *mmsrc = (const uint8_t *) src;
+        const uint8_t *mmsrc = (const uint8_t *)src;
         const float32x4_t divby128 = vdupq_n_f32(DIVBY128);
         const float32x4_t negone = vdupq_n_f32(-1.0f);
-        while (i >= 16) {   /* 16 * 8-bit */
-            const uint8x16_t bytes = vld1q_u8(mmsrc);  /* get 16 uint8 into a NEON register. */
-            const uint16x8_t uint16hi = vmovl_u8(vget_high_u8(bytes));  /* convert top 8 bytes to 8 uint16 */
-            const uint16x8_t uint16lo = vmovl_u8(vget_low_u8(bytes));   /* convert bottom 8 bytes to 8 uint16 */
+        while (i >= 16) {                                              /* 16 * 8-bit */
+            const uint8x16_t bytes = vld1q_u8(mmsrc);                  /* get 16 uint8 into a NEON register. */
+            const uint16x8_t uint16hi = vmovl_u8(vget_high_u8(bytes)); /* convert top 8 bytes to 8 uint16 */
+            const uint16x8_t uint16lo = vmovl_u8(vget_low_u8(bytes));  /* convert bottom 8 bytes to 8 uint16 */
             /* split uint16 to two uint32, then convert to float, then multiply to normalize, subtract to adjust for sign, store. */
             vst1q_f32(dst, vmlaq_f32(negone, vcvtq_f32_u32(vmovl_u16(vget_low_u16(uint16lo))), divby128));
-            vst1q_f32(dst+4, vmlaq_f32(negone, vcvtq_f32_u32(vmovl_u16(vget_high_u16(uint16lo))), divby128));
-            vst1q_f32(dst+8, vmlaq_f32(negone, vcvtq_f32_u32(vmovl_u16(vget_low_u16(uint16hi))), divby128));
-            vst1q_f32(dst+12, vmlaq_f32(negone, vcvtq_f32_u32(vmovl_u16(vget_high_u16(uint16hi))), divby128));
-            i -= 16; mmsrc -= 16; dst -= 16;
+            vst1q_f32(dst + 4, vmlaq_f32(negone, vcvtq_f32_u32(vmovl_u16(vget_high_u16(uint16lo))), divby128));
+            vst1q_f32(dst + 8, vmlaq_f32(negone, vcvtq_f32_u32(vmovl_u16(vget_low_u16(uint16hi))), divby128));
+            vst1q_f32(dst + 12, vmlaq_f32(negone, vcvtq_f32_u32(vmovl_u16(vget_high_u16(uint16hi))), divby128));
+            i -= 16;
+            mmsrc -= 16;
+            dst -= 16;
         }
 
-        src = (const Uint8 *) mmsrc;
+        src = (const Uint8 *)mmsrc;
     }
 
-    src += 15; dst += 15;  /* adjust for any scalar finishing. */
+    src += 15;
+    dst += 15; /* adjust for any scalar finishing. */
 
     /* Finish off any leftovers with scalar operations. */
     while (i) {
-        *dst = (((float) *src) * DIVBY128) - 1.0f;
-        i--; src--; dst--;
+        *dst = (((float)*src) * DIVBY128) - 1.0f;
+        i--;
+        src--;
+        dst--;
     }
 
     cvt->len_cvt *= 4;
@@ -952,42 +986,47 @@ SDL_Convert_U8_to_F32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_S16_to_F32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_S16_to_F32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const Sint16 *src = ((const Sint16 *) (cvt->buf + cvt->len_cvt)) - 1;
-    float *dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    const Sint16 *src = ((const Sint16 *)(cvt->buf + cvt->len_cvt)) - 1;
+    float *dst = ((float *)(cvt->buf + cvt->len_cvt * 2)) - 1;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_S16", "AUDIO_F32 (using NEON)");
 
     /* Get dst aligned to 16 bytes (since buffer is growing, we don't have to worry about overreading from src) */
-    for (i = cvt->len_cvt / sizeof (Sint16); i && (((size_t) (dst-7)) & 15); --i, --src, --dst) {
-        *dst = ((float) *src) * DIVBY32768;
+    for (i = cvt->len_cvt / sizeof(Sint16); i && (((size_t)(dst - 7)) & 15); --i, --src, --dst) {
+        *dst = ((float)*src) * DIVBY32768;
     }
 
-    src -= 7; dst -= 7;  /* adjust to read NEON blocks from the start. */
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
+    src -= 7;
+    dst -= 7; /* adjust to read NEON blocks from the start. */
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
 
     /* Make sure src is aligned too. */
-    if ((((size_t) src) & 15) == 0) {
+    if ((((size_t)src) & 15) == 0) {
         /* Aligned! Do NEON blocks as long as we have 16 bytes available. */
         const float32x4_t divby32768 = vdupq_n_f32(DIVBY32768);
-        while (i >= 8) {   /* 8 * 16-bit */
-            const int16x8_t ints = vld1q_s16((int16_t const *) src);  /* get 8 sint16 into a NEON register. */
+        while (i >= 8) {                                            /* 8 * 16-bit */
+            const int16x8_t ints = vld1q_s16((int16_t const *)src); /* get 8 sint16 into a NEON register. */
             /* split int16 to two int32, then convert to float, then multiply to normalize, store. */
             vst1q_f32(dst, vmulq_f32(vcvtq_f32_s32(vmovl_s16(vget_low_s16(ints))), divby32768));
-            vst1q_f32(dst+4, vmulq_f32(vcvtq_f32_s32(vmovl_s16(vget_high_s16(ints))), divby32768));
-            i -= 8; src -= 8; dst -= 8;
+            vst1q_f32(dst + 4, vmulq_f32(vcvtq_f32_s32(vmovl_s16(vget_high_s16(ints))), divby32768));
+            i -= 8;
+            src -= 8;
+            dst -= 8;
         }
     }
 
-    src += 7; dst += 7;  /* adjust for any scalar finishing. */
+    src += 7;
+    dst += 7; /* adjust for any scalar finishing. */
 
     /* Finish off any leftovers with scalar operations. */
     while (i) {
-        *dst = ((float) *src) * DIVBY32768;
-        i--; src--; dst--;
+        *dst = ((float)*src) * DIVBY32768;
+        i--;
+        src--;
+        dst--;
     }
 
     cvt->len_cvt *= 2;
@@ -996,43 +1035,48 @@ SDL_Convert_S16_to_F32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_U16_to_F32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_U16_to_F32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const Uint16 *src = ((const Uint16 *) (cvt->buf + cvt->len_cvt)) - 1;
-    float *dst = ((float *) (cvt->buf + cvt->len_cvt * 2)) - 1;
+    const Uint16 *src = ((const Uint16 *)(cvt->buf + cvt->len_cvt)) - 1;
+    float *dst = ((float *)(cvt->buf + cvt->len_cvt * 2)) - 1;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_U16", "AUDIO_F32 (using NEON)");
 
     /* Get dst aligned to 16 bytes (since buffer is growing, we don't have to worry about overreading from src) */
-    for (i = cvt->len_cvt / sizeof (Sint16); i && (((size_t) (dst-7)) & 15); --i, --src, --dst) {
-        *dst = (((float) *src) * DIVBY32768) - 1.0f;
+    for (i = cvt->len_cvt / sizeof(Sint16); i && (((size_t)(dst - 7)) & 15); --i, --src, --dst) {
+        *dst = (((float)*src) * DIVBY32768) - 1.0f;
     }
 
-    src -= 7; dst -= 7;  /* adjust to read NEON blocks from the start. */
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
+    src -= 7;
+    dst -= 7; /* adjust to read NEON blocks from the start. */
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
 
     /* Make sure src is aligned too. */
-    if ((((size_t) src) & 15) == 0) {
+    if ((((size_t)src) & 15) == 0) {
         /* Aligned! Do NEON blocks as long as we have 16 bytes available. */
         const float32x4_t divby32768 = vdupq_n_f32(DIVBY32768);
         const float32x4_t negone = vdupq_n_f32(-1.0f);
-        while (i >= 8) {   /* 8 * 16-bit */
-            const uint16x8_t uints = vld1q_u16((uint16_t const *) src);  /* get 8 uint16 into a NEON register. */
+        while (i >= 8) {                                               /* 8 * 16-bit */
+            const uint16x8_t uints = vld1q_u16((uint16_t const *)src); /* get 8 uint16 into a NEON register. */
             /* split uint16 to two int32, then convert to float, then multiply to normalize, subtract for sign, store. */
             vst1q_f32(dst, vmlaq_f32(negone, vcvtq_f32_u32(vmovl_u16(vget_low_u16(uints))), divby32768));
-            vst1q_f32(dst+4, vmlaq_f32(negone, vcvtq_f32_u32(vmovl_u16(vget_high_u16(uints))), divby32768));
-            i -= 8; src -= 8; dst -= 8;
+            vst1q_f32(dst + 4, vmlaq_f32(negone, vcvtq_f32_u32(vmovl_u16(vget_high_u16(uints))), divby32768));
+            i -= 8;
+            src -= 8;
+            dst -= 8;
         }
     }
 
-    src += 7; dst += 7;  /* adjust for any scalar finishing. */
+    src += 7;
+    dst += 7; /* adjust for any scalar finishing. */
 
     /* Finish off any leftovers with scalar operations. */
     while (i) {
-        *dst = (((float) *src) * DIVBY32768) - 1.0f;
-        i--; src--; dst--;
+        *dst = (((float)*src) * DIVBY32768) - 1.0f;
+        i--;
+        src--;
+        dst--;
     }
 
     cvt->len_cvt *= 2;
@@ -1041,39 +1085,42 @@ SDL_Convert_U16_to_F32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_S32_to_F32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_S32_to_F32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const Sint32 *src = (const Sint32 *) cvt->buf;
-    float *dst = (float *) cvt->buf;
+    const Sint32 *src = (const Sint32 *)cvt->buf;
+    float *dst = (float *)cvt->buf;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_S32", "AUDIO_F32 (using NEON)");
 
     /* Get dst aligned to 16 bytes */
-    for (i = cvt->len_cvt / sizeof (Sint32); i && (((size_t) dst) & 15); --i, ++src, ++dst) {
-        *dst = ((float) (*src>>8)) * DIVBY8388607;
+    for (i = cvt->len_cvt / sizeof(Sint32); i && (((size_t)dst) & 15); --i, ++src, ++dst) {
+        *dst = ((float)(*src >> 8)) * DIVBY8388607;
     }
 
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
 
     /* Make sure src is aligned too. */
-    if ((((size_t) src) & 15) == 0) {
+    if ((((size_t)src) & 15) == 0) {
         /* Aligned! Do NEON blocks as long as we have 16 bytes available. */
         const float32x4_t divby8388607 = vdupq_n_f32(DIVBY8388607);
-        const int32_t *mmsrc = (const int32_t *) src;
-        while (i >= 4) {   /* 4 * sint32 */
+        const int32_t *mmsrc = (const int32_t *)src;
+        while (i >= 4) { /* 4 * sint32 */
             /* shift out lowest bits so int fits in a float32. Small precision loss, but much faster. */
             vst1q_f32(dst, vmulq_f32(vcvtq_f32_s32(vshrq_n_s32(vld1q_s32(mmsrc), 8)), divby8388607));
-            i -= 4; mmsrc += 4; dst += 4;
+            i -= 4;
+            mmsrc += 4;
+            dst += 4;
         }
-        src = (const Sint32 *) mmsrc;
+        src = (const Sint32 *)mmsrc;
     }
 
     /* Finish off any leftovers with scalar operations. */
     while (i) {
-        *dst = ((float) (*src>>8)) * DIVBY8388607;
-        i--; src++; dst++;
+        *dst = ((float)(*src >> 8)) * DIVBY8388607;
+        i--;
+        src++;
+        dst++;
     }
 
     if (cvt->filters[++cvt->filter_index]) {
@@ -1081,17 +1128,16 @@ SDL_Convert_S32_to_F32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_F32_to_S8_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_F32_to_S8_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const float *src = (const float *) cvt->buf;
-    Sint8 *dst = (Sint8 *) cvt->buf;
+    const float *src = (const float *)cvt->buf;
+    Sint8 *dst = (Sint8 *)cvt->buf;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_F32", "AUDIO_S8 (using NEON)");
 
     /* Get dst aligned to 16 bytes */
-    for (i = cvt->len_cvt / sizeof (float); i && (((size_t) dst) & 15); --i, ++src, ++dst) {
+    for (i = cvt->len_cvt / sizeof(float); i && (((size_t)dst) & 15); --i, ++src, ++dst) {
         const float sample = *src;
         if (sample >= 1.0f) {
             *dst = 127;
@@ -1102,26 +1148,28 @@ SDL_Convert_F32_to_S8_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         }
     }
 
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
 
     /* Make sure src is aligned too. */
-    if ((((size_t) src) & 15) == 0) {
+    if ((((size_t)src) & 15) == 0) {
         /* Aligned! Do NEON blocks as long as we have 16 bytes available. */
         const float32x4_t one = vdupq_n_f32(1.0f);
         const float32x4_t negone = vdupq_n_f32(-1.0f);
         const float32x4_t mulby127 = vdupq_n_f32(127.0f);
-        int8_t *mmdst = (int8_t *) dst;
-        while (i >= 16) {   /* 16 * float32 */
-            const int32x4_t ints1 = vcvtq_s32_f32(vmulq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src)), one), mulby127));  /* load 4 floats, clamp, convert to sint32 */
-            const int32x4_t ints2 = vcvtq_s32_f32(vmulq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src+4)), one), mulby127));  /* load 4 floats, clamp, convert to sint32 */
-            const int32x4_t ints3 = vcvtq_s32_f32(vmulq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src+8)), one), mulby127));  /* load 4 floats, clamp, convert to sint32 */
-            const int32x4_t ints4 = vcvtq_s32_f32(vmulq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src+12)), one), mulby127));  /* load 4 floats, clamp, convert to sint32 */
-            const int8x8_t i8lo = vmovn_s16(vcombine_s16(vmovn_s32(ints1), vmovn_s32(ints2))); /* narrow to sint16, combine, narrow to sint8 */
-            const int8x8_t i8hi = vmovn_s16(vcombine_s16(vmovn_s32(ints3), vmovn_s32(ints4))); /* narrow to sint16, combine, narrow to sint8 */
-            vst1q_s8(mmdst, vcombine_s8(i8lo, i8hi));  /* combine to int8x16_t, store out */
-            i -= 16; src += 16; mmdst += 16;
+        int8_t *mmdst = (int8_t *)dst;
+        while (i >= 16) {                                                                                                       /* 16 * float32 */
+            const int32x4_t ints1 = vcvtq_s32_f32(vmulq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src)), one), mulby127));      /* load 4 floats, clamp, convert to sint32 */
+            const int32x4_t ints2 = vcvtq_s32_f32(vmulq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src + 4)), one), mulby127));  /* load 4 floats, clamp, convert to sint32 */
+            const int32x4_t ints3 = vcvtq_s32_f32(vmulq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src + 8)), one), mulby127));  /* load 4 floats, clamp, convert to sint32 */
+            const int32x4_t ints4 = vcvtq_s32_f32(vmulq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src + 12)), one), mulby127)); /* load 4 floats, clamp, convert to sint32 */
+            const int8x8_t i8lo = vmovn_s16(vcombine_s16(vmovn_s32(ints1), vmovn_s32(ints2)));                                  /* narrow to sint16, combine, narrow to sint8 */
+            const int8x8_t i8hi = vmovn_s16(vcombine_s16(vmovn_s32(ints3), vmovn_s32(ints4)));                                  /* narrow to sint16, combine, narrow to sint8 */
+            vst1q_s8(mmdst, vcombine_s8(i8lo, i8hi));                                                                           /* combine to int8x16_t, store out */
+            i -= 16;
+            src += 16;
+            mmdst += 16;
         }
-        dst = (Sint8 *) mmdst;
+        dst = (Sint8 *)mmdst;
     }
 
     /* Finish off any leftovers with scalar operations. */
@@ -1134,7 +1182,9 @@ SDL_Convert_F32_to_S8_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         } else {
             *dst = (Sint8)(sample * 127.0f);
         }
-        i--; src++; dst++;
+        i--;
+        src++;
+        dst++;
     }
 
     cvt->len_cvt /= 4;
@@ -1143,17 +1193,16 @@ SDL_Convert_F32_to_S8_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_F32_to_U8_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_F32_to_U8_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const float *src = (const float *) cvt->buf;
-    Uint8 *dst = (Uint8 *) cvt->buf;
+    const float *src = (const float *)cvt->buf;
+    Uint8 *dst = (Uint8 *)cvt->buf;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_F32", "AUDIO_U8 (using NEON)");
 
     /* Get dst aligned to 16 bytes */
-    for (i = cvt->len_cvt / sizeof (float); i && (((size_t) dst) & 15); --i, ++src, ++dst) {
+    for (i = cvt->len_cvt / sizeof(float); i && (((size_t)dst) & 15); --i, ++src, ++dst) {
         const float sample = *src;
         if (sample >= 1.0f) {
             *dst = 255;
@@ -1164,27 +1213,29 @@ SDL_Convert_F32_to_U8_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         }
     }
 
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
 
     /* Make sure src is aligned too. */
-    if ((((size_t) src) & 15) == 0) {
+    if ((((size_t)src) & 15) == 0) {
         /* Aligned! Do NEON blocks as long as we have 16 bytes available. */
         const float32x4_t one = vdupq_n_f32(1.0f);
         const float32x4_t negone = vdupq_n_f32(-1.0f);
         const float32x4_t mulby127 = vdupq_n_f32(127.0f);
-        uint8_t *mmdst = (uint8_t *) dst;
-        while (i >= 16) {   /* 16 * float32 */
-            const uint32x4_t uints1 = vcvtq_u32_f32(vmulq_f32(vaddq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src)), one), one), mulby127));  /* load 4 floats, clamp, convert to uint32 */
-            const uint32x4_t uints2 = vcvtq_u32_f32(vmulq_f32(vaddq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src+4)), one), one), mulby127));  /* load 4 floats, clamp, convert to uint32 */
-            const uint32x4_t uints3 = vcvtq_u32_f32(vmulq_f32(vaddq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src+8)), one), one), mulby127));  /* load 4 floats, clamp, convert to uint32 */
-            const uint32x4_t uints4 = vcvtq_u32_f32(vmulq_f32(vaddq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src+12)), one), one), mulby127));  /* load 4 floats, clamp, convert to uint32 */
-            const uint8x8_t ui8lo = vmovn_u16(vcombine_u16(vmovn_u32(uints1), vmovn_u32(uints2))); /* narrow to uint16, combine, narrow to uint8 */
-            const uint8x8_t ui8hi = vmovn_u16(vcombine_u16(vmovn_u32(uints3), vmovn_u32(uints4))); /* narrow to uint16, combine, narrow to uint8 */
-            vst1q_u8(mmdst, vcombine_u8(ui8lo, ui8hi));  /* combine to uint8x16_t, store out */
-            i -= 16; src += 16; mmdst += 16;
+        uint8_t *mmdst = (uint8_t *)dst;
+        while (i >= 16) {                                                                                                                         /* 16 * float32 */
+            const uint32x4_t uints1 = vcvtq_u32_f32(vmulq_f32(vaddq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src)), one), one), mulby127));      /* load 4 floats, clamp, convert to uint32 */
+            const uint32x4_t uints2 = vcvtq_u32_f32(vmulq_f32(vaddq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src + 4)), one), one), mulby127));  /* load 4 floats, clamp, convert to uint32 */
+            const uint32x4_t uints3 = vcvtq_u32_f32(vmulq_f32(vaddq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src + 8)), one), one), mulby127));  /* load 4 floats, clamp, convert to uint32 */
+            const uint32x4_t uints4 = vcvtq_u32_f32(vmulq_f32(vaddq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src + 12)), one), one), mulby127)); /* load 4 floats, clamp, convert to uint32 */
+            const uint8x8_t ui8lo = vmovn_u16(vcombine_u16(vmovn_u32(uints1), vmovn_u32(uints2)));                                                /* narrow to uint16, combine, narrow to uint8 */
+            const uint8x8_t ui8hi = vmovn_u16(vcombine_u16(vmovn_u32(uints3), vmovn_u32(uints4)));                                                /* narrow to uint16, combine, narrow to uint8 */
+            vst1q_u8(mmdst, vcombine_u8(ui8lo, ui8hi));                                                                                           /* combine to uint8x16_t, store out */
+            i -= 16;
+            src += 16;
+            mmdst += 16;
         }
 
-        dst = (Uint8 *) mmdst;
+        dst = (Uint8 *)mmdst;
     }
 
     /* Finish off any leftovers with scalar operations. */
@@ -1197,7 +1248,9 @@ SDL_Convert_F32_to_U8_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         } else {
             *dst = (Uint8)((sample + 1.0f) * 127.0f);
         }
-        i--; src++; dst++;
+        i--;
+        src++;
+        dst++;
     }
 
     cvt->len_cvt /= 4;
@@ -1206,17 +1259,16 @@ SDL_Convert_F32_to_U8_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_F32_to_S16_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_F32_to_S16_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const float *src = (const float *) cvt->buf;
-    Sint16 *dst = (Sint16 *) cvt->buf;
+    const float *src = (const float *)cvt->buf;
+    Sint16 *dst = (Sint16 *)cvt->buf;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_F32", "AUDIO_S16 (using NEON)");
 
     /* Get dst aligned to 16 bytes */
-    for (i = cvt->len_cvt / sizeof (float); i && (((size_t) dst) & 15); --i, ++src, ++dst) {
+    for (i = cvt->len_cvt / sizeof(float); i && (((size_t)dst) & 15); --i, ++src, ++dst) {
         const float sample = *src;
         if (sample >= 1.0f) {
             *dst = 32767;
@@ -1227,22 +1279,24 @@ SDL_Convert_F32_to_S16_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         }
     }
 
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
 
     /* Make sure src is aligned too. */
-    if ((((size_t) src) & 15) == 0) {
+    if ((((size_t)src) & 15) == 0) {
         /* Aligned! Do NEON blocks as long as we have 16 bytes available. */
         const float32x4_t one = vdupq_n_f32(1.0f);
         const float32x4_t negone = vdupq_n_f32(-1.0f);
         const float32x4_t mulby32767 = vdupq_n_f32(32767.0f);
-        int16_t *mmdst = (int16_t *) dst;
-        while (i >= 8) {   /* 8 * float32 */
-            const int32x4_t ints1 = vcvtq_s32_f32(vmulq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src)), one), mulby32767));  /* load 4 floats, clamp, convert to sint32 */
-            const int32x4_t ints2 = vcvtq_s32_f32(vmulq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src+4)), one), mulby32767));  /* load 4 floats, clamp, convert to sint32 */
-            vst1q_s16(mmdst, vcombine_s16(vmovn_s32(ints1), vmovn_s32(ints2)));  /* narrow to sint16, combine, store out. */
-            i -= 8; src += 8; mmdst += 8;
+        int16_t *mmdst = (int16_t *)dst;
+        while (i >= 8) {                                                                                                         /* 8 * float32 */
+            const int32x4_t ints1 = vcvtq_s32_f32(vmulq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src)), one), mulby32767));     /* load 4 floats, clamp, convert to sint32 */
+            const int32x4_t ints2 = vcvtq_s32_f32(vmulq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src + 4)), one), mulby32767)); /* load 4 floats, clamp, convert to sint32 */
+            vst1q_s16(mmdst, vcombine_s16(vmovn_s32(ints1), vmovn_s32(ints2)));                                                  /* narrow to sint16, combine, store out. */
+            i -= 8;
+            src += 8;
+            mmdst += 8;
         }
-        dst = (Sint16 *) mmdst;
+        dst = (Sint16 *)mmdst;
     }
 
     /* Finish off any leftovers with scalar operations. */
@@ -1255,7 +1309,9 @@ SDL_Convert_F32_to_S16_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         } else {
             *dst = (Sint16)(sample * 32767.0f);
         }
-        i--; src++; dst++;
+        i--;
+        src++;
+        dst++;
     }
 
     cvt->len_cvt /= 2;
@@ -1264,17 +1320,16 @@ SDL_Convert_F32_to_S16_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_F32_to_U16_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_F32_to_U16_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const float *src = (const float *) cvt->buf;
-    Uint16 *dst = (Uint16 *) cvt->buf;
+    const float *src = (const float *)cvt->buf;
+    Uint16 *dst = (Uint16 *)cvt->buf;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_F32", "AUDIO_U16 (using NEON)");
 
     /* Get dst aligned to 16 bytes */
-    for (i = cvt->len_cvt / sizeof (float); i && (((size_t) dst) & 15); --i, ++src, ++dst) {
+    for (i = cvt->len_cvt / sizeof(float); i && (((size_t)dst) & 15); --i, ++src, ++dst) {
         const float sample = *src;
         if (sample >= 1.0f) {
             *dst = 65535;
@@ -1285,22 +1340,24 @@ SDL_Convert_F32_to_U16_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         }
     }
 
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
 
     /* Make sure src is aligned too. */
-    if ((((size_t) src) & 15) == 0) {
+    if ((((size_t)src) & 15) == 0) {
         /* Aligned! Do NEON blocks as long as we have 16 bytes available. */
         const float32x4_t one = vdupq_n_f32(1.0f);
         const float32x4_t negone = vdupq_n_f32(-1.0f);
         const float32x4_t mulby32767 = vdupq_n_f32(32767.0f);
-        uint16_t *mmdst = (uint16_t *) dst;
-        while (i >= 8) {   /* 8 * float32 */
-            const uint32x4_t uints1 = vcvtq_u32_f32(vmulq_f32(vaddq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src)), one), one), mulby32767));  /* load 4 floats, clamp, convert to uint32 */
-            const uint32x4_t uints2 = vcvtq_u32_f32(vmulq_f32(vaddq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src+4)), one), one), mulby32767));  /* load 4 floats, clamp, convert to uint32 */
-            vst1q_u16(mmdst, vcombine_u16(vmovn_u32(uints1), vmovn_u32(uints2)));  /* narrow to uint16, combine, store out. */
-            i -= 8; src += 8; mmdst += 8;
+        uint16_t *mmdst = (uint16_t *)dst;
+        while (i >= 8) {                                                                                                                           /* 8 * float32 */
+            const uint32x4_t uints1 = vcvtq_u32_f32(vmulq_f32(vaddq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src)), one), one), mulby32767));     /* load 4 floats, clamp, convert to uint32 */
+            const uint32x4_t uints2 = vcvtq_u32_f32(vmulq_f32(vaddq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src + 4)), one), one), mulby32767)); /* load 4 floats, clamp, convert to uint32 */
+            vst1q_u16(mmdst, vcombine_u16(vmovn_u32(uints1), vmovn_u32(uints2)));                                                                  /* narrow to uint16, combine, store out. */
+            i -= 8;
+            src += 8;
+            mmdst += 8;
         }
-        dst = (Uint16 *) mmdst;
+        dst = (Uint16 *)mmdst;
     }
 
     /* Finish off any leftovers with scalar operations. */
@@ -1313,7 +1370,9 @@ SDL_Convert_F32_to_U16_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         } else {
             *dst = (Uint16)((sample + 1.0f) * 32767.0f);
         }
-        i--; src++; dst++;
+        i--;
+        src++;
+        dst++;
     }
 
     cvt->len_cvt /= 2;
@@ -1322,17 +1381,16 @@ SDL_Convert_F32_to_U16_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
     }
 }
 
-static void SDLCALL
-SDL_Convert_F32_to_S32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
+static void SDLCALL SDL_Convert_F32_to_S32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 {
-    const float *src = (const float *) cvt->buf;
-    Sint32 *dst = (Sint32 *) cvt->buf;
+    const float *src = (const float *)cvt->buf;
+    Sint32 *dst = (Sint32 *)cvt->buf;
     int i;
 
     LOG_DEBUG_CONVERT("AUDIO_F32", "AUDIO_S32 (using NEON)");
 
     /* Get dst aligned to 16 bytes */
-    for (i = cvt->len_cvt / sizeof (float); i && (((size_t) dst) & 15); --i, ++src, ++dst) {
+    for (i = cvt->len_cvt / sizeof(float); i && (((size_t)dst) & 15); --i, ++src, ++dst) {
         const float sample = *src;
         if (sample >= 1.0f) {
             *dst = 2147483647;
@@ -1343,20 +1401,22 @@ SDL_Convert_F32_to_S32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         }
     }
 
-    SDL_assert(!i || ((((size_t) dst) & 15) == 0));
-    SDL_assert(!i || ((((size_t) src) & 15) == 0));
+    SDL_assert(!i || ((((size_t)dst) & 15) == 0));
+    SDL_assert(!i || ((((size_t)src) & 15) == 0));
 
     {
         /* Aligned! Do NEON blocks as long as we have 16 bytes available. */
         const float32x4_t one = vdupq_n_f32(1.0f);
         const float32x4_t negone = vdupq_n_f32(-1.0f);
         const float32x4_t mulby8388607 = vdupq_n_f32(8388607.0f);
-        int32_t *mmdst = (int32_t *) dst;
-        while (i >= 4) {   /* 4 * float32 */
+        int32_t *mmdst = (int32_t *)dst;
+        while (i >= 4) { /* 4 * float32 */
             vst1q_s32(mmdst, vshlq_n_s32(vcvtq_s32_f32(vmulq_f32(vminq_f32(vmaxq_f32(negone, vld1q_f32(src)), one), mulby8388607)), 8));
-            i -= 4; src += 4; mmdst += 4;
+            i -= 4;
+            src += 4;
+            mmdst += 4;
         }
-        dst = (Sint32 *) mmdst;
+        dst = (Sint32 *)mmdst;
     }
 
     /* Finish off any leftovers with scalar operations. */
@@ -1369,7 +1429,9 @@ SDL_Convert_F32_to_S32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
         } else {
             *dst = ((Sint32)(sample * 8388607.0f)) << 8;
         }
-        i--; src++; dst++;
+        i--;
+        src++;
+        dst++;
     }
 
     if (cvt->filters[++cvt->filter_index]) {
@@ -1378,8 +1440,6 @@ SDL_Convert_F32_to_S32_NEON(SDL_AudioCVT *cvt, SDL_AudioFormat format)
 }
 #endif
 
-
-
 void SDL_ChooseAudioConverters(void)
 {
     static SDL_bool converters_chosen = SDL_FALSE;
@@ -1388,18 +1448,18 @@ void SDL_ChooseAudioConverters(void)
         return;
     }
 
-#define SET_CONVERTER_FUNCS(fntype) \
-        SDL_Convert_S8_to_F32 = SDL_Convert_S8_to_F32_##fntype; \
-        SDL_Convert_U8_to_F32 = SDL_Convert_U8_to_F32_##fntype; \
-        SDL_Convert_S16_to_F32 = SDL_Convert_S16_to_F32_##fntype; \
-        SDL_Convert_U16_to_F32 = SDL_Convert_U16_to_F32_##fntype; \
-        SDL_Convert_S32_to_F32 = SDL_Convert_S32_to_F32_##fntype; \
-        SDL_Convert_F32_to_S8 = SDL_Convert_F32_to_S8_##fntype; \
-        SDL_Convert_F32_to_U8 = SDL_Convert_F32_to_U8_##fntype; \
-        SDL_Convert_F32_to_S16 = SDL_Convert_F32_to_S16_##fntype; \
-        SDL_Convert_F32_to_U16 = SDL_Convert_F32_to_U16_##fntype; \
-        SDL_Convert_F32_to_S32 = SDL_Convert_F32_to_S32_##fntype; \
-        converters_chosen = SDL_TRUE
+#define SET_CONVERTER_FUNCS(fntype)                           \
+    SDL_Convert_S8_to_F32 = SDL_Convert_S8_to_F32_##fntype;   \
+    SDL_Convert_U8_to_F32 = SDL_Convert_U8_to_F32_##fntype;   \
+    SDL_Convert_S16_to_F32 = SDL_Convert_S16_to_F32_##fntype; \
+    SDL_Convert_U16_to_F32 = SDL_Convert_U16_to_F32_##fntype; \
+    SDL_Convert_S32_to_F32 = SDL_Convert_S32_to_F32_##fntype; \
+    SDL_Convert_F32_to_S8 = SDL_Convert_F32_to_S8_##fntype;   \
+    SDL_Convert_F32_to_U8 = SDL_Convert_F32_to_U8_##fntype;   \
+    SDL_Convert_F32_to_S16 = SDL_Convert_F32_to_S16_##fntype; \
+    SDL_Convert_F32_to_U16 = SDL_Convert_F32_to_U16_##fntype; \
+    SDL_Convert_F32_to_S32 = SDL_Convert_F32_to_S32_##fntype; \
+    converters_chosen = SDL_TRUE
 
 #if HAVE_SSE2_INTRINSICS
     if (SDL_HasSSE2()) {

src/audio/SDL_mixer.c

@@ -78,14 +78,12 @@ static const Uint8 mix8[] = {
 };
 
 /* The volume ranges from 0 - 128 */
-#define ADJUST_VOLUME(s, v) (s = (s*v)/SDL_MIX_MAXVOLUME)
-#define ADJUST_VOLUME_U8(s, v)  (s = (((s-128)*v)/SDL_MIX_MAXVOLUME)+128)
-#define ADJUST_VOLUME_U16(s, v)  (s = (((s-32768)*v)/SDL_MIX_MAXVOLUME)+32768)
+#define ADJUST_VOLUME(s, v)     (s = (s * v) / SDL_MIX_MAXVOLUME)
+#define ADJUST_VOLUME_U8(s, v)  (s = (((s - 128) * v) / SDL_MIX_MAXVOLUME) + 128)
+#define ADJUST_VOLUME_U16(s, v) (s = (((s - 32768) * v) / SDL_MIX_MAXVOLUME) + 32768)
 
-
-void
-SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
-                   Uint32 len, int volume)
+void SDL_MixAudioFormat(Uint8 *dst, const Uint8 *src, SDL_AudioFormat format,
+                        Uint32 len, int volume)
 {
     if (volume == 0) {
         return;
@@ -94,258 +92,248 @@ SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,
     switch (format) {
 
     case AUDIO_U8:
-        {
-            Uint8 src_sample;
-
-            while (len--) {
-                src_sample = *src;
-                ADJUST_VOLUME_U8(src_sample, volume);
-                *dst = mix8[*dst + src_sample];
-                ++dst;
-                ++src;
-            }
+    {
+        Uint8 src_sample;
+
+        while (len--) {
+            src_sample = *src;
+            ADJUST_VOLUME_U8(src_sample, volume);
+            *dst = mix8[*dst + src_sample];
+            ++dst;
+            ++src;
         }
-        break;
+    } break;
 
     case AUDIO_S8:
-        {
-            Sint8 *dst8, *src8;
-            Sint8 src_sample;
-            int dst_sample;
-            const int max_audioval = SDL_MAX_SINT8;
-            const int min_audioval = SDL_MIN_SINT8;
-
-            src8 = (Sint8 *) src;
-            dst8 = (Sint8 *) dst;
-            while (len--) {
-                src_sample = *src8;
-                ADJUST_VOLUME(src_sample, volume);
-                dst_sample = *dst8 + src_sample;
-                if (dst_sample > max_audioval) {
-                    dst_sample = max_audioval;
-                } else if (dst_sample < min_audioval) {
-                    dst_sample = min_audioval;
-                }
-                *dst8 = dst_sample;
-                ++dst8;
-                ++src8;
+    {
+        Sint8 *dst8, *src8;
+        Sint8 src_sample;
+        int dst_sample;
+        const int max_audioval = SDL_MAX_SINT8;
+        const int min_audioval = SDL_MIN_SINT8;
+
+        src8 = (Sint8 *)src;
+        dst8 = (Sint8 *)dst;
+        while (len--) {
+            src_sample = *src8;
+            ADJUST_VOLUME(src_sample, volume);
+            dst_sample = *dst8 + src_sample;
+            if (dst_sample > max_audioval) {
+                dst_sample = max_audioval;
+            } else if (dst_sample < min_audioval) {
+                dst_sample = min_audioval;
             }
+            *dst8 = dst_sample;
+            ++dst8;
+            ++src8;
         }
-        break;
+    } break;
 
     case AUDIO_S16LSB:
-        {
-            Sint16 src1, src2;
-            int dst_sample;
-            const int max_audioval = SDL_MAX_SINT16;
-            const int min_audioval = SDL_MIN_SINT16;
-
-            len /= 2;
-            while (len--) {
-                src1 = SDL_SwapLE16(*(Sint16 *)src);
-                ADJUST_VOLUME(src1, volume);
-                src2 = SDL_SwapLE16(*(Sint16 *)dst);
-                src += 2;
-                dst_sample = src1 + src2;
-                if (dst_sample > max_audioval) {
-                    dst_sample = max_audioval;
-                } else if (dst_sample < min_audioval) {
-                    dst_sample = min_audioval;
-                }
-                *(Sint16 *)dst = SDL_SwapLE16(dst_sample);
-                dst += 2;
+    {
+        Sint16 src1, src2;
+        int dst_sample;
+        const int max_audioval = SDL_MAX_SINT16;
+        const int min_audioval = SDL_MIN_SINT16;
+
+        len /= 2;
+        while (len--) {
+            src1 = SDL_SwapLE16(*(Sint16 *)src);
+            ADJUST_VOLUME(src1, volume);
+            src2 = SDL_SwapLE16(*(Sint16 *)dst);
+            src += 2;
+            dst_sample = src1 + src2;
+            if (dst_sample > max_audioval) {
+                dst_sample = max_audioval;
+            } else if (dst_sample < min_audioval) {
+                dst_sample = min_audioval;
             }
+            *(Sint16 *)dst = SDL_SwapLE16(dst_sample);
+            dst += 2;
         }
-        break;
+    } break;
 
     case AUDIO_S16MSB:
-        {
-            Sint16 src1, src2;
-            int dst_sample;
-            const int max_audioval = SDL_MAX_SINT16;
-            const int min_audioval = SDL_MIN_SINT16;
-
-            len /= 2;
-            while (len--) {
-                src1 = SDL_SwapBE16(*(Sint16 *)src);
-                ADJUST_VOLUME(src1, volume);
-                src2 = SDL_SwapBE16(*(Sint16 *)dst);
-                src += 2;
-                dst_sample = src1 + src2;
-                if (dst_sample > max_audioval) {
-                    dst_sample = max_audioval;
-                } else if (dst_sample < min_audioval) {
-                    dst_sample = min_audioval;
-                }
-                *(Sint16 *)dst = SDL_SwapBE16(dst_sample);
-                dst += 2;
+    {
+        Sint16 src1, src2;
+        int dst_sample;
+        const int max_audioval = SDL_MAX_SINT16;
+        const int min_audioval = SDL_MIN_SINT16;
+
+        len /= 2;
+        while (len--) {
+            src1 = SDL_SwapBE16(*(Sint16 *)src);
+            ADJUST_VOLUME(src1, volume);
+            src2 = SDL_SwapBE16(*(Sint16 *)dst);
+            src += 2;
+            dst_sample = src1 + src2;
+            if (dst_sample > max_audioval) {
+                dst_sample = max_audioval;
+            } else if (dst_sample < min_audioval) {
+                dst_sample = min_audioval;
             }
+            *(Sint16 *)dst = SDL_SwapBE16(dst_sample);
+            dst += 2;
         }
-        break;
+    } break;
 
     case AUDIO_U16LSB:
-        {
-            Uint16 src1, src2;
-            int dst_sample;
-            const int max_audioval = SDL_MAX_SINT16;
-            const int min_audioval = SDL_MIN_SINT16;
-
-            len /= 2;
-            while (len--) {
-                src1 = SDL_SwapLE16(*(Uint16 *)src);
-                ADJUST_VOLUME_U16(src1, volume);
-                src2 = SDL_SwapLE16(*(Uint16 *)dst);
-                src += 2;
-                dst_sample = src1 + src2 - 32768 * 2;
-                if (dst_sample > max_audioval) {
-                    dst_sample = max_audioval;
-                } else if (dst_sample < min_audioval) {
-                    dst_sample = min_audioval;
-                }
-                dst_sample += 32768;
-                *(Uint16 *)dst = SDL_SwapLE16(dst_sample);
-                dst += 2;
+    {
+        Uint16 src1, src2;
+        int dst_sample;
+        const int max_audioval = SDL_MAX_SINT16;
+        const int min_audioval = SDL_MIN_SINT16;
+
+        len /= 2;
+        while (len--) {
+            src1 = SDL_SwapLE16(*(Uint16 *)src);
+            ADJUST_VOLUME_U16(src1, volume);
+            src2 = SDL_SwapLE16(*(Uint16 *)dst);
+            src += 2;
+            dst_sample = src1 + src2 - 32768 * 2;
+            if (dst_sample > max_audioval) {
+                dst_sample = max_audioval;
+            } else if (dst_sample < min_audioval) {
+                dst_sample = min_audioval;
             }
+            dst_sample += 32768;
+            *(Uint16 *)dst = SDL_SwapLE16(dst_sample);
+            dst += 2;
         }
-        break;
+    } break;
 
     case AUDIO_U16MSB:
-        {
-            Uint16 src1, src2;
-            int dst_sample;
-            const int max_audioval = SDL_MAX_SINT16;
-            const int min_audioval = SDL_MIN_SINT16;
-
-            len /= 2;
-            while (len--) {
-                src1 = SDL_SwapBE16(*(Uint16 *)src);
-                ADJUST_VOLUME_U16(src1, volume);
-                src2 = SDL_SwapBE16(*(Uint16 *)dst);
-                src += 2;
-                dst_sample = src1 + src2 - 32768 * 2;
-                if (dst_sample > max_audioval) {
-                    dst_sample = max_audioval;
-                } else if (dst_sample < min_audioval) {
-                    dst_sample = min_audioval;
-                }
-                dst_sample += 32768;
-                *(Uint16 *)dst = SDL_SwapBE16(dst_sample);
-                dst += 2;
+    {
+        Uint16 src1, src2;
+        int dst_sample;
+        const int max_audioval = SDL_MAX_SINT16;
+        const int min_audioval = SDL_MIN_SINT16;
+
+        len /= 2;
+        while (len--) {
+            src1 = SDL_SwapBE16(*(Uint16 *)src);
+            ADJUST_VOLUME_U16(src1, volume);
+            src2 = SDL_SwapBE16(*(Uint16 *)dst);
+            src += 2;
+            dst_sample = src1 + src2 - 32768 * 2;
+            if (dst_sample > max_audioval) {
+                dst_sample = max_audioval;
+            } else if (dst_sample < min_audioval) {
+                dst_sample = min_audioval;
             }
+            dst_sample += 32768;
+            *(Uint16 *)dst = SDL_SwapBE16(dst_sample);
+            dst += 2;
         }
-        break;
+    } break;
 
     case AUDIO_S32LSB:
-        {
-            const Uint32 *src32 = (Uint32 *) src;
-            Uint32 *dst32 = (Uint32 *) dst;
-            Sint64 src1, src2;
-            Sint64 dst_sample;
-            const Sint64 max_audioval = SDL_MAX_SINT32;
-            const Sint64 min_audioval = SDL_MIN_SINT32;
-
-            len /= 4;
-            while (len--) {
-                src1 = (Sint64) ((Sint32) SDL_SwapLE32(*src32));
-                src32++;
-                ADJUST_VOLUME(src1, volume);
-                src2 = (Sint64) ((Sint32) SDL_SwapLE32(*dst32));
-                dst_sample = src1 + src2;
-                if (dst_sample > max_audioval) {
-                    dst_sample = max_audioval;
-                } else if (dst_sample < min_audioval) {
-                    dst_sample = min_audioval;
-                }
-                *(dst32++) = SDL_SwapLE32((Uint32) ((Sint32) dst_sample));
+    {
+        const Uint32 *src32 = (Uint32 *)src;
+        Uint32 *dst32 = (Uint32 *)dst;
+        Sint64 src1, src2;
+        Sint64 dst_sample;
+        const Sint64 max_audioval = SDL_MAX_SINT32;
+        const Sint64 min_audioval = SDL_MIN_SINT32;
+
+        len /= 4;
+        while (len--) {
+            src1 = (Sint64)((Sint32)SDL_SwapLE32(*src32));
+            src32++;
+            ADJUST_VOLUME(src1, volume);
+            src2 = (Sint64)((Sint32)SDL_SwapLE32(*dst32));
+            dst_sample = src1 + src2;
+            if (dst_sample > max_audioval) {
+                dst_sample = max_audioval;
+            } else if (dst_sample < min_audioval) {
+                dst_sample = min_audioval;
             }
+            *(dst32++) = SDL_SwapLE32((Uint32)((Sint32)dst_sample));
         }
-        break;
+    } break;
 
     case AUDIO_S32MSB:
-        {
-            const Uint32 *src32 = (Uint32 *) src;
-            Uint32 *dst32 = (Uint32 *) dst;
-            Sint64 src1, src2;
-            Sint64 dst_sample;
-            const Sint64 max_audioval = SDL_MAX_SINT32;
-            const Sint64 min_audioval = SDL_MIN_SINT32;
-
-            len /= 4;
-            while (len--) {
-                src1 = (Sint64) ((Sint32) SDL_SwapBE32(*src32));
-                src32++;
-                ADJUST_VOLUME(src1, volume);
-                src2 = (Sint64) ((Sint32) SDL_SwapBE32(*dst32));
-                dst_sample = src1 + src2;
-                if (dst_sample > max_audioval) {
-                    dst_sample = max_audioval;
-                } else if (dst_sample < min_audioval) {
-                    dst_sample = min_audioval;
-                }
-                *(dst32++) = SDL_SwapBE32((Uint32) ((Sint32) dst_sample));
+    {
+        const Uint32 *src32 = (Uint32 *)src;
+        Uint32 *dst32 = (Uint32 *)dst;
+        Sint64 src1, src2;
+        Sint64 dst_sample;
+        const Sint64 max_audioval = SDL_MAX_SINT32;
+        const Sint64 min_audioval = SDL_MIN_SINT32;
+
+        len /= 4;
+        while (len--) {
+            src1 = (Sint64)((Sint32)SDL_SwapBE32(*src32));
+            src32++;
+            ADJUST_VOLUME(src1, volume);
+            src2 = (Sint64)((Sint32)SDL_SwapBE32(*dst32));
+            dst_sample = src1 + src2;
+            if (dst_sample > max_audioval) {
+                dst_sample = max_audioval;
+            } else if (dst_sample < min_audioval) {
+                dst_sample = min_audioval;
             }
+            *(dst32++) = SDL_SwapBE32((Uint32)((Sint32)dst_sample));
         }
-        break;
+    } break;
 
     case AUDIO_F32LSB:
-        {
-            const float fmaxvolume = 1.0f / ((float) SDL_MIX_MAXVOLUME);
-            const float fvolume = (float) volume;
-            const float *src32 = (float *) src;
-            float *dst32 = (float *) dst;
-            float src1, src2;
-            double dst_sample;
-            /* !!! FIXME: are these right? */
-            const double max_audioval = 3.402823466e+38F;
-            const double min_audioval = -3.402823466e+38F;
-
-            len /= 4;
-            while (len--) {
-                src1 = ((SDL_SwapFloatLE(*src32) * fvolume) * fmaxvolume);
-                src2 = SDL_SwapFloatLE(*dst32);
-                src32++;
-
-                dst_sample = ((double) src1) + ((double) src2);
-                if (dst_sample > max_audioval) {
-                    dst_sample = max_audioval;
-                } else if (dst_sample < min_audioval) {
-                    dst_sample = min_audioval;
-                }
-                *(dst32++) = SDL_SwapFloatLE((float) dst_sample);
+    {
+        const float fmaxvolume = 1.0f / ((float)SDL_MIX_MAXVOLUME);
+        const float fvolume = (float)volume;
+        const float *src32 = (float *)src;
+        float *dst32 = (float *)dst;
+        float src1, src2;
+        double dst_sample;
+        /* !!! FIXME: are these right? */
+        const double max_audioval = 3.402823466e+38F;
+        const double min_audioval = -3.402823466e+38F;
+
+        len /= 4;
+        while (len--) {
+            src1 = ((SDL_SwapFloatLE(*src32) * fvolume) * fmaxvolume);
+            src2 = SDL_SwapFloatLE(*dst32);
+            src32++;
+
+            dst_sample = ((double)src1) + ((double)src2);
+            if (dst_sample > max_audioval) {
+                dst_sample = max_audioval;
+            } else if (dst_sample < min_audioval) {
+                dst_sample = min_audioval;
             }
+            *(dst32++) = SDL_SwapFloatLE((float)dst_sample);
         }
-        break;
+    } break;
 
     case AUDIO_F32MSB:
-        {
-            const float fmaxvolume = 1.0f / ((float) SDL_MIX_MAXVOLUME);
-            const float fvolume = (float) volume;
-            const float *src32 = (float *) src;
-            float *dst32 = (float *) dst;
-            float src1, src2;
-            double dst_sample;
-            /* !!! FIXME: are these right? */
-            const double max_audioval = 3.402823466e+38F;
-            const double min_audioval = -3.402823466e+38F;
-
-            len /= 4;
-            while (len--) {
-                src1 = ((SDL_SwapFloatBE(*src32) * fvolume) * fmaxvolume);
-                src2 = SDL_SwapFloatBE(*dst32);
-                src32++;
-
-                dst_sample = ((double) src1) + ((double) src2);
-                if (dst_sample > max_audioval) {
-                    dst_sample = max_audioval;
-                } else if (dst_sample < min_audioval) {
-                    dst_sample = min_audioval;
-                }
-                *(dst32++) = SDL_SwapFloatBE((float) dst_sample);
+    {
+        const float fmaxvolume = 1.0f / ((float)SDL_MIX_MAXVOLUME);
+        const float fvolume = (float)volume;
+        const float *src32 = (float *)src;
+        float *dst32 = (float *)dst;
+        float src1, src2;
+        double dst_sample;
+        /* !!! FIXME: are these right? */
+        const double max_audioval = 3.402823466e+38F;
+        const double min_audioval = -3.402823466e+38F;
+
+        len /= 4;
+        while (len--) {
+            src1 = ((SDL_SwapFloatBE(*src32) * fvolume) * fmaxvolume);
+            src2 = SDL_SwapFloatBE(*dst32);
+            src32++;
+
+            dst_sample = ((double)src1) + ((double)src2);
+            if (dst_sample > max_audioval) {
+                dst_sample = max_audioval;
+            } else if (dst_sample < min_audioval) {
+                dst_sample = min_audioval;
             }
+            *(dst32++) = SDL_SwapFloatBE((float)dst_sample);
         }
-        break;
+    } break;
 
-    default:                   /* If this happens... FIXME! */
+    default: /* If this happens... FIXME! */
         SDL_SetError("SDL_MixAudioFormat(): unknown audio format");
         return;
     }

src/audio/SDL_sysaudio.h

@@ -28,11 +28,11 @@
 
 /* !!! FIXME: These are wordy and unlocalized... */
 #define DEFAULT_OUTPUT_DEVNAME "System audio output device"
-#define DEFAULT_INPUT_DEVNAME "System audio capture device"
+#define DEFAULT_INPUT_DEVNAME  "System audio capture device"
 
 /* The SDL audio driver */
 typedef struct SDL_AudioDevice SDL_AudioDevice;
-#define _THIS   SDL_AudioDevice *_this
+#define _THIS SDL_AudioDevice *_this
 
 /* Audio targets should call this as devices are added to the system (such as
    a USB headset being plugged in), and should also be called for
@@ -62,21 +62,21 @@ extern void SDL_OpenedAudioDeviceDisconnected(SDL_AudioDevice *device);
 
 typedef struct SDL_AudioDriverImpl
 {
-    void (*DetectDevices) (void);
-    int (*OpenDevice) (_THIS, const char *devname);
-    void (*ThreadInit) (_THIS); /* Called by audio thread at start */
-    void (*ThreadDeinit) (_THIS); /* Called by audio thread at end */
-    void (*WaitDevice) (_THIS);
-    void (*PlayDevice) (_THIS);
-    Uint8 *(*GetDeviceBuf) (_THIS);
-    int (*CaptureFromDevice) (_THIS, void *buffer, int buflen);
-    void (*FlushCapture) (_THIS);
-    void (*CloseDevice) (_THIS);
-    void (*LockDevice) (_THIS);
-    void (*UnlockDevice) (_THIS);
-    void (*FreeDeviceHandle) (void *handle);  /**< SDL is done with handle from SDL_AddAudioDevice() */
-    void (*Deinitialize) (void);
-    int (*GetDefaultAudioInfo) (char **name, SDL_AudioSpec *spec, int iscapture);
+    void (*DetectDevices)(void);
+    int (*OpenDevice)(_THIS, const char *devname);
+    void (*ThreadInit)(_THIS);   /* Called by audio thread at start */
+    void (*ThreadDeinit)(_THIS); /* Called by audio thread at end */
+    void (*WaitDevice)(_THIS);
+    void (*PlayDevice)(_THIS);
+    Uint8 *(*GetDeviceBuf)(_THIS);
+    int (*CaptureFromDevice)(_THIS, void *buffer, int buflen);
+    void (*FlushCapture)(_THIS);
+    void (*CloseDevice)(_THIS);
+    void (*LockDevice)(_THIS);
+    void (*UnlockDevice)(_THIS);
+    void (*FreeDeviceHandle)(void *handle); /**< SDL is done with handle from SDL_AddAudioDevice() */
+    void (*Deinitialize)(void);
+    int (*GetDefaultAudioInfo)(char **name, SDL_AudioSpec *spec, int iscapture);
 
     /* !!! FIXME: add pause(), so we can optimize instead of mixing silence. */
 
@@ -89,7 +89,6 @@ typedef struct SDL_AudioDriverImpl
     SDL_bool SupportsNonPow2Samples;
 } SDL_AudioDriverImpl;
 
-
 typedef struct SDL_AudioDeviceItem
 {
     void *handle;
@@ -100,7 +99,6 @@ typedef struct SDL_AudioDeviceItem
     struct SDL_AudioDeviceItem *next;
 } SDL_AudioDeviceItem;
 
-
 typedef struct SDL_AudioDriver
 {
     /* * * */
@@ -123,7 +121,6 @@ typedef struct SDL_AudioDriver
     SDL_AudioDeviceItem *inputDevices;
 } SDL_AudioDriver;
 
-
 /* Define the SDL audio driver structure */
 struct SDL_AudioDevice
 {
@@ -174,8 +171,8 @@ typedef struct AudioBootStrap
 {
     const char *name;
     const char *desc;
-    SDL_bool (*init) (SDL_AudioDriverImpl * impl);
-    SDL_bool demand_only;  /* 1==request explicitly, or it won't be available. */
+    SDL_bool (*init)(SDL_AudioDriverImpl *impl);
+    SDL_bool demand_only; /* 1==request explicitly, or it won't be available. */
 } AudioBootStrap;
 
 /* Not all of these are available in a given build. Use #ifdefs, etc. */

src/audio/SDL_wave.c

@@ -41,8 +41,7 @@
  * Returns 0 on success, or -1 if the multiplication overflows, in which case f1
  * does not get modified.
  */
-static int
-SafeMult(size_t *f1, size_t f2)
+static int SafeMult(size_t *f1, size_t f2)
 {
     if (*f1 > 0 && SIZE_MAX / *f1 <= f2) {
         return -1;
@@ -64,21 +63,24 @@ typedef struct ADPCM_DecoderState
     void *cstate;           /* Decoding state for each channel. */
 
     /* ADPCM data. */
-    struct {
+    struct
+    {
         Uint8 *data;
         size_t size;
         size_t pos;
     } input;
 
     /* Current ADPCM block in the ADPCM data above. */
-    struct {
+    struct
+    {
         Uint8 *data;
         size_t size;
         size_t pos;
     } block;
 
     /* Decoded 16-bit PCM data. */
-    struct {
+    struct
+    {
         Sint16 *data;
         size_t size;
         size_t pos;
@@ -100,8 +102,7 @@ typedef struct MS_ADPCM_ChannelState
 } MS_ADPCM_ChannelState;
 
 #ifdef SDL_WAVE_DEBUG_LOG_FORMAT
-static void
-WaveDebugLogFormat(WaveFile *file)
+static void WaveDebugLogFormat(WaveFile *file)
 {
     WaveFormat *format = &file->format;
     const char *fmtstr = "WAVE file: %s, %u Hz, %s, %u bits, %u %s/s";
@@ -135,55 +136,60 @@ WaveDebugLogFormat(WaveFile *file)
         break;
     }
 
-#define SDL_WAVE_DEBUG_CHANNELCFG(STR, CODE) case CODE: wavechannel = STR; break;
-#define SDL_WAVE_DEBUG_CHANNELSTR(STR, CODE) if (format->channelmask & CODE) { \
-    SDL_strlcat(channelstr, channelstr[0] ? "-" STR : STR, sizeof(channelstr));}
+#define SDL_WAVE_DEBUG_CHANNELCFG(STR, CODE) \
+    case CODE:                               \
+        wavechannel = STR;                   \
+        break;
+#define SDL_WAVE_DEBUG_CHANNELSTR(STR, CODE)                                        \
+    if (format->channelmask & CODE) {                                               \
+        SDL_strlcat(channelstr, channelstr[0] ? "-" STR : STR, sizeof(channelstr)); \
+    }
 
     if (format->formattag == EXTENSIBLE_CODE && format->channelmask > 0) {
         switch (format->channelmask) {
-            SDL_WAVE_DEBUG_CHANNELCFG("1.0 Mono",         0x4)
-            SDL_WAVE_DEBUG_CHANNELCFG("1.1 Mono",         0xc)
-            SDL_WAVE_DEBUG_CHANNELCFG("2.0 Stereo",       0x3)
-            SDL_WAVE_DEBUG_CHANNELCFG("2.1 Stereo",       0xb)
-            SDL_WAVE_DEBUG_CHANNELCFG("3.0 Stereo",       0x7)
-            SDL_WAVE_DEBUG_CHANNELCFG("3.1 Stereo",       0xf)
-            SDL_WAVE_DEBUG_CHANNELCFG("3.0 Surround",     0x103)
-            SDL_WAVE_DEBUG_CHANNELCFG("3.1 Surround",     0x10b)
-            SDL_WAVE_DEBUG_CHANNELCFG("4.0 Quad",         0x33)
-            SDL_WAVE_DEBUG_CHANNELCFG("4.1 Quad",         0x3b)
-            SDL_WAVE_DEBUG_CHANNELCFG("4.0 Surround",     0x107)
-            SDL_WAVE_DEBUG_CHANNELCFG("4.1 Surround",     0x10f)
-            SDL_WAVE_DEBUG_CHANNELCFG("5.0",              0x37)
-            SDL_WAVE_DEBUG_CHANNELCFG("5.1",              0x3f)
-            SDL_WAVE_DEBUG_CHANNELCFG("5.0 Side",         0x607)
-            SDL_WAVE_DEBUG_CHANNELCFG("5.1 Side",         0x60f)
-            SDL_WAVE_DEBUG_CHANNELCFG("6.0",              0x137)
-            SDL_WAVE_DEBUG_CHANNELCFG("6.1",              0x13f)
-            SDL_WAVE_DEBUG_CHANNELCFG("6.0 Side",         0x707)
-            SDL_WAVE_DEBUG_CHANNELCFG("6.1 Side",         0x70f)
-            SDL_WAVE_DEBUG_CHANNELCFG("7.0",              0xf7)
-            SDL_WAVE_DEBUG_CHANNELCFG("7.1",              0xff)
-            SDL_WAVE_DEBUG_CHANNELCFG("7.0 Side",         0x6c7)
-            SDL_WAVE_DEBUG_CHANNELCFG("7.1 Side",         0x6cf)
-            SDL_WAVE_DEBUG_CHANNELCFG("7.0 Surround",     0x637)
-            SDL_WAVE_DEBUG_CHANNELCFG("7.1 Surround",     0x63f)
-            SDL_WAVE_DEBUG_CHANNELCFG("9.0 Surround",     0x5637)
-            SDL_WAVE_DEBUG_CHANNELCFG("9.1 Surround",     0x563f)
-            SDL_WAVE_DEBUG_CHANNELCFG("11.0 Surround",    0x56f7)
-            SDL_WAVE_DEBUG_CHANNELCFG("11.1 Surround",    0x56ff)
+            SDL_WAVE_DEBUG_CHANNELCFG("1.0 Mono", 0x4)
+            SDL_WAVE_DEBUG_CHANNELCFG("1.1 Mono", 0xc)
+            SDL_WAVE_DEBUG_CHANNELCFG("2.0 Stereo", 0x3)
+            SDL_WAVE_DEBUG_CHANNELCFG("2.1 Stereo", 0xb)
+            SDL_WAVE_DEBUG_CHANNELCFG("3.0 Stereo", 0x7)
+            SDL_WAVE_DEBUG_CHANNELCFG("3.1 Stereo", 0xf)
+            SDL_WAVE_DEBUG_CHANNELCFG("3.0 Surround", 0x103)
+            SDL_WAVE_DEBUG_CHANNELCFG("3.1 Surround", 0x10b)
+            SDL_WAVE_DEBUG_CHANNELCFG("4.0 Quad", 0x33)
+            SDL_WAVE_DEBUG_CHANNELCFG("4.1 Quad", 0x3b)
+            SDL_WAVE_DEBUG_CHANNELCFG("4.0 Surround", 0x107)
+            SDL_WAVE_DEBUG_CHANNELCFG("4.1 Surround", 0x10f)
+            SDL_WAVE_DEBUG_CHANNELCFG("5.0", 0x37)
+            SDL_WAVE_DEBUG_CHANNELCFG("5.1", 0x3f)
+            SDL_WAVE_DEBUG_CHANNELCFG("5.0 Side", 0x607)
+            SDL_WAVE_DEBUG_CHANNELCFG("5.1 Side", 0x60f)
+            SDL_WAVE_DEBUG_CHANNELCFG("6.0", 0x137)
+            SDL_WAVE_DEBUG_CHANNELCFG("6.1", 0x13f)
+            SDL_WAVE_DEBUG_CHANNELCFG("6.0 Side", 0x707)
+            SDL_WAVE_DEBUG_CHANNELCFG("6.1 Side", 0x70f)
+            SDL_WAVE_DEBUG_CHANNELCFG("7.0", 0xf7)
+            SDL_WAVE_DEBUG_CHANNELCFG("7.1", 0xff)
+            SDL_WAVE_DEBUG_CHANNELCFG("7.0 Side", 0x6c7)
+            SDL_WAVE_DEBUG_CHANNELCFG("7.1 Side", 0x6cf)
+            SDL_WAVE_DEBUG_CHANNELCFG("7.0 Surround", 0x637)
+            SDL_WAVE_DEBUG_CHANNELCFG("7.1 Surround", 0x63f)
+            SDL_WAVE_DEBUG_CHANNELCFG("9.0 Surround", 0x5637)
+            SDL_WAVE_DEBUG_CHANNELCFG("9.1 Surround", 0x563f)
+            SDL_WAVE_DEBUG_CHANNELCFG("11.0 Surround", 0x56f7)
+            SDL_WAVE_DEBUG_CHANNELCFG("11.1 Surround", 0x56ff)
         default:
-            SDL_WAVE_DEBUG_CHANNELSTR("FL",  0x1)
-            SDL_WAVE_DEBUG_CHANNELSTR("FR",  0x2)
-            SDL_WAVE_DEBUG_CHANNELSTR("FC",  0x4)
-            SDL_WAVE_DEBUG_CHANNELSTR("LF",  0x8)
-            SDL_WAVE_DEBUG_CHANNELSTR("BL",  0x10)
-            SDL_WAVE_DEBUG_CHANNELSTR("BR",  0x20)
+            SDL_WAVE_DEBUG_CHANNELSTR("FL", 0x1)
+            SDL_WAVE_DEBUG_CHANNELSTR("FR", 0x2)
+            SDL_WAVE_DEBUG_CHANNELSTR("FC", 0x4)
+            SDL_WAVE_DEBUG_CHANNELSTR("LF", 0x8)
+            SDL_WAVE_DEBUG_CHANNELSTR("BL", 0x10)
+            SDL_WAVE_DEBUG_CHANNELSTR("BR", 0x20)
             SDL_WAVE_DEBUG_CHANNELSTR("FLC", 0x40)
             SDL_WAVE_DEBUG_CHANNELSTR("FRC", 0x80)
-            SDL_WAVE_DEBUG_CHANNELSTR("BC",  0x100)
-            SDL_WAVE_DEBUG_CHANNELSTR("SL",  0x200)
-            SDL_WAVE_DEBUG_CHANNELSTR("SR",  0x400)
-            SDL_WAVE_DEBUG_CHANNELSTR("TC",  0x800)
+            SDL_WAVE_DEBUG_CHANNELSTR("BC", 0x100)
+            SDL_WAVE_DEBUG_CHANNELSTR("SL", 0x200)
+            SDL_WAVE_DEBUG_CHANNELSTR("SR", 0x400)
+            SDL_WAVE_DEBUG_CHANNELSTR("TC", 0x800)
             SDL_WAVE_DEBUG_CHANNELSTR("TFL", 0x1000)
             SDL_WAVE_DEBUG_CHANNELSTR("TFC", 0x2000)
             SDL_WAVE_DEBUG_CHANNELSTR("TFR", 0x4000)
@@ -224,33 +230,32 @@ WaveDebugLogFormat(WaveFile *file)
 #endif
 
 #ifdef SDL_WAVE_DEBUG_DUMP_FORMAT
-static void
-WaveDebugDumpFormat(WaveFile *file, Uint32 rifflen, Uint32 fmtlen, Uint32 datalen)
+static void WaveDebugDumpFormat(WaveFile *file, Uint32 rifflen, Uint32 fmtlen, Uint32 datalen)
 {
     WaveFormat *format = &file->format;
     const char *fmtstr1 = "WAVE chunk dump:\n"
-        "-------------------------------------------\n"
-        "RIFF                            %11u\n"
-        "-------------------------------------------\n"
-        "    fmt                         %11u\n"
-        "        wFormatTag                   0x%04x\n"
-        "        nChannels               %11u\n"
-        "        nSamplesPerSec          %11u\n"
-        "        nAvgBytesPerSec         %11u\n"
-        "        nBlockAlign             %11u\n";
+                          "-------------------------------------------\n"
+                          "RIFF                            %11u\n"
+                          "-------------------------------------------\n"
+                          "    fmt                         %11u\n"
+                          "        wFormatTag                   0x%04x\n"
+                          "        nChannels               %11u\n"
+                          "        nSamplesPerSec          %11u\n"
+                          "        nAvgBytesPerSec         %11u\n"
+                          "        nBlockAlign             %11u\n";
     const char *fmtstr2 = "        wBitsPerSample          %11u\n";
     const char *fmtstr3 = "        cbSize                  %11u\n";
     const char *fmtstr4a = "        wValidBitsPerSample     %11u\n";
     const char *fmtstr4b = "        wSamplesPerBlock        %11u\n";
     const char *fmtstr5 = "        dwChannelMask            0x%08x\n"
-        "        SubFormat\n"
-        "        %08x-%04x-%04x-%02x%02x%02x%02x%02x%02x%02x%02x\n";
+                          "        SubFormat\n"
+                          "        %08x-%04x-%04x-%02x%02x%02x%02x%02x%02x%02x%02x\n";
     const char *fmtstr6 = "-------------------------------------------\n"
-        " fact\n"
-        "  dwSampleLength                %11u\n";
+                          " fact\n"
+                          "  dwSampleLength                %11u\n";
     const char *fmtstr7 = "-------------------------------------------\n"
-        " data                           %11u\n"
-        "-------------------------------------------\n";
+                          " data                           %11u\n"
+                          "-------------------------------------------\n";
     char *dumpstr;
     size_t dumppos = 0;
     const size_t bufsize = 1024;
@@ -315,8 +320,7 @@ WaveDebugDumpFormat(WaveFile *file, Uint32 rifflen, Uint32 fmtlen, Uint32 datale
 }
 #endif
 
-static Sint64
-WaveAdjustToFactValue(WaveFile *file, Sint64 sampleframes)
+static Sint64 WaveAdjustToFactValue(WaveFile *file, Sint64 sampleframes)
 {
     if (file->fact.status == 2) {
         if (file->facthint == FactStrict && sampleframes < file->fact.samplelength) {
@@ -329,8 +333,7 @@ WaveAdjustToFactValue(WaveFile *file, Sint64 sampleframes)
     return sampleframes;
 }
 
-static int
-MS_ADPCM_CalculateSampleFrames(WaveFile *file, size_t datalength)
+static int MS_ADPCM_CalculateSampleFrames(WaveFile *file, size_t datalength)
 {
     WaveFormat *format = &file->format;
     const size_t blockheadersize = (size_t)file->format.channels * 7;
@@ -369,8 +372,7 @@ MS_ADPCM_CalculateSampleFrames(WaveFile *file, size_t datalength)
     return 0;
 }
 
-static int
-MS_ADPCM_Init(WaveFile *file, size_t datalength)
+static int MS_ADPCM_Init(WaveFile *file, size_t datalength)
 {
     WaveFormat *format = &file->format;
     WaveChunk *chunk = &file->chunk;
@@ -378,7 +380,7 @@ MS_ADPCM_Init(WaveFile *file, size_t datalength)
     const size_t blockdatasize = (size_t)format->blockalign - blockheadersize;
     const size_t blockframebitsize = (size_t)format->bitspersample * format->channels;
     const size_t blockdatasamples = (blockdatasize * 8) / blockframebitsize;
-    const Sint16 presetcoeffs[14] = {256, 0, 512, -256, 0, 0, 192, 64, 240, 0, 460, -208, 392, -232};
+    const Sint16 presetcoeffs[14] = { 256, 0, 512, -256, 0, 0, 192, 64, 240, 0, 460, -208, 392, -232 };
     size_t i, coeffcount;
     MS_ADPCM_CoeffData *coeffdata;
 
@@ -488,8 +490,7 @@ MS_ADPCM_Init(WaveFile *file, size_t datalength)
     return 0;
 }
 
-static Sint16
-MS_ADPCM_ProcessNibble(MS_ADPCM_ChannelState *cstate, Sint32 sample1, Sint32 sample2, Uint8 nybble)
+static Sint16 MS_ADPCM_ProcessNibble(MS_ADPCM_ChannelState *cstate, Sint32 sample1, Sint32 sample2, Uint8 nybble)
 {
     const Sint32 max_audioval = 32767;
     const Sint32 min_audioval = -32768;
@@ -525,8 +526,7 @@ MS_ADPCM_ProcessNibble(MS_ADPCM_ChannelState *cstate, Sint32 sample1, Sint32 sam
     return (Sint16)new_sample;
 }
 
-static int
-MS_ADPCM_DecodeBlockHeader(ADPCM_DecoderState *state)
+static int MS_ADPCM_DecodeBlockHeader(ADPCM_DecoderState *state)
 {
     Uint8 coeffindex;
     const Uint32 channels = state->channels;
@@ -586,8 +586,7 @@ MS_ADPCM_DecodeBlockHeader(ADPCM_DecoderState *state)
  * will always contain full sample frames (same sample count for each channel).
  * Incomplete sample frames are discarded.
  */
-static int
-MS_ADPCM_DecodeBlockData(ADPCM_DecoderState *state)
+static int MS_ADPCM_DecodeBlockData(ADPCM_DecoderState *state)
 {
     Uint16 nybble = 0;
     Sint16 sample1, sample2;
@@ -634,8 +633,7 @@ MS_ADPCM_DecodeBlockData(ADPCM_DecoderState *state)
     return 0;
 }
 
-static int
-MS_ADPCM_Decode(WaveFile *file, Uint8 **audio_buf, Uint32 *audio_len)
+static int MS_ADPCM_Decode(WaveFile *file, Uint8 **audio_buf, Uint32 *audio_len)
 {
     int result;
     size_t bytesleft, outputsize;
@@ -734,8 +732,7 @@ MS_ADPCM_Decode(WaveFile *file, Uint8 **audio_buf, Uint32 *audio_len)
     return 0;
 }
 
-static int
-IMA_ADPCM_CalculateSampleFrames(WaveFile *file, size_t datalength)
+static int IMA_ADPCM_CalculateSampleFrames(WaveFile *file, size_t datalength)
 {
     WaveFormat *format = &file->format;
     const size_t blockheadersize = (size_t)format->channels * 4;
@@ -788,8 +785,7 @@ IMA_ADPCM_CalculateSampleFrames(WaveFile *file, size_t datalength)
     return 0;
 }
 
-static int
-IMA_ADPCM_Init(WaveFile *file, size_t datalength)
+static int IMA_ADPCM_Init(WaveFile *file, size_t datalength)
 {
     WaveFormat *format = &file->format;
     WaveChunk *chunk = &file->chunk;
@@ -854,8 +850,7 @@ IMA_ADPCM_Init(WaveFile *file, size_t datalength)
     return 0;
 }
 
-static Sint16
-IMA_ADPCM_ProcessNibble(Sint8 *cindex, Sint16 lastsample, Uint8 nybble)
+static Sint16 IMA_ADPCM_ProcessNibble(Sint8 *cindex, Sint16 lastsample, Uint8 nybble)
 {
     const Sint32 max_audioval = 32767;
     const Sint32 min_audioval = -32768;
@@ -924,12 +919,11 @@ IMA_ADPCM_ProcessNibble(Sint8 *cindex, Sint16 lastsample, Uint8 nybble)
     return (Sint16)sample;
 }
 
-static int
-IMA_ADPCM_DecodeBlockHeader(ADPCM_DecoderState *state)
+static int IMA_ADPCM_DecodeBlockHeader(ADPCM_DecoderState *state)
 {
     Sint16 step;
     Uint32 c;
-    Uint8 *cstate = (Uint8 *) state->cstate;
+    Uint8 *cstate = (Uint8 *)state->cstate;
 
     for (c = 0; c < state->channels; c++) {
         size_t o = state->block.pos + c * 4;
@@ -947,7 +941,7 @@ IMA_ADPCM_DecodeBlockHeader(ADPCM_DecoderState *state)
 
         /* Reserved byte in block header, should be 0. */
         if (state->block.data[o + 3] != 0) {
-            /* Uh oh, corrupt data?  Buggy code? */ ;
+            /* Uh oh, corrupt data?  Buggy code? */;
         }
     }
 
@@ -964,8 +958,7 @@ IMA_ADPCM_DecodeBlockHeader(ADPCM_DecoderState *state)
  * contains full sample frames (same sample count for each channel).
  * Incomplete sample frames are discarded.
  */
-static int
-IMA_ADPCM_DecodeBlockData(ADPCM_DecoderState *state)
+static int IMA_ADPCM_DecodeBlockData(ADPCM_DecoderState *state)
 {
     size_t i;
     int retval = 0;
@@ -1034,8 +1027,7 @@ IMA_ADPCM_DecodeBlockData(ADPCM_DecoderState *state)
     return retval;
 }
 
-static int
-IMA_ADPCM_Decode(WaveFile *file, Uint8 **audio_buf, Uint32 *audio_len)
+static int IMA_ADPCM_Decode(WaveFile *file, Uint8 **audio_buf, Uint32 *audio_len)
 {
     int result;
     size_t bytesleft, outputsize;
@@ -1138,8 +1130,7 @@ IMA_ADPCM_Decode(WaveFile *file, Uint8 **audio_buf, Uint32 *audio_len)
     return 0;
 }
 
-static int
-LAW_Init(WaveFile *file, size_t datalength)
+static int LAW_Init(WaveFile *file, size_t datalength)
 {
     WaveFormat *format = &file->format;
 
@@ -1167,8 +1158,7 @@ LAW_Init(WaveFile *file, size_t datalength)
     return 0;
 }
 
-static int
-LAW_Decode(WaveFile *file, Uint8 **audio_buf, Uint32 *audio_len)
+static int LAW_Decode(WaveFile *file, Uint8 **audio_buf, Uint32 *audio_len)
 {
 #ifdef SDL_WAVE_LAW_LUT
     const Sint16 alaw_lut[256] = {
@@ -1310,8 +1300,7 @@ LAW_Decode(WaveFile *file, Uint8 **audio_buf, Uint32 *audio_len)
     return 0;
 }
 
-static int
-PCM_Init(WaveFile *file, size_t datalength)
+static int PCM_Init(WaveFile *file, size_t datalength)
 {
     WaveFormat *format = &file->format;
 
@@ -1354,8 +1343,7 @@ PCM_Init(WaveFile *file, size_t datalength)
     return 0;
 }
 
-static int
-PCM_ConvertSint24ToSint32(WaveFile *file, Uint8 **audio_buf, Uint32 *audio_len)
+static int PCM_ConvertSint24ToSint32(WaveFile *file, Uint8 **audio_buf, Uint32 *audio_len)
 {
     WaveFormat *format = &file->format;
     WaveChunk *chunk = &file->chunk;
@@ -1406,8 +1394,7 @@ PCM_ConvertSint24ToSint32(WaveFile *file, Uint8 **audio_buf, Uint32 *audio_len)
     return 0;
 }
 
-static int
-PCM_Decode(WaveFile *file, Uint8 **audio_buf, Uint32 *audio_len)
+static int PCM_Decode(WaveFile *file, Uint8 **audio_buf, Uint32 *audio_len)
 {
     WaveFormat *format = &file->format;
     WaveChunk *chunk = &file->chunk;
@@ -1449,8 +1436,7 @@ PCM_Decode(WaveFile *file, Uint8 **audio_buf, Uint32 *audio_len)
     return 0;
 }
 
-static WaveRiffSizeHint
-WaveGetRiffSizeHint()
+static WaveRiffSizeHint WaveGetRiffSizeHint()
 {
     const char *hint = SDL_GetHint(SDL_HINT_WAVE_RIFF_CHUNK_SIZE);
 
@@ -1469,8 +1455,7 @@ WaveGetRiffSizeHint()
     return RiffSizeNoHint;
 }
 
-static WaveTruncationHint
-WaveGetTruncationHint()
+static WaveTruncationHint WaveGetTruncationHint()
 {
     const char *hint = SDL_GetHint(SDL_HINT_WAVE_TRUNCATION);
 
@@ -1489,8 +1474,7 @@ WaveGetTruncationHint()
     return TruncNoHint;
 }
 
-static WaveFactChunkHint
-WaveGetFactChunkHint()
+static WaveFactChunkHint WaveGetFactChunkHint()
 {
     const char *hint = SDL_GetHint(SDL_HINT_WAVE_FACT_CHUNK);
 
@@ -1509,8 +1493,7 @@ WaveGetFactChunkHint()
     return FactNoHint;
 }
 
-static void
-WaveFreeChunkData(WaveChunk *chunk)
+static void WaveFreeChunkData(WaveChunk *chunk)
 {
     if (chunk->data != NULL) {
         SDL_free(chunk->data);
@@ -1519,8 +1502,7 @@ WaveFreeChunkData(WaveChunk *chunk)
     chunk->size = 0;
 }
 
-static int
-WaveNextChunk(SDL_RWops *src, WaveChunk *chunk)
+static int WaveNextChunk(SDL_RWops *src, WaveChunk *chunk)
 {
     Uint32 chunkheader[2];
     Sint64 nextposition = chunk->position + chunk->length;
@@ -1552,8 +1534,7 @@ WaveNextChunk(SDL_RWops *src, WaveChunk *chunk)
     return 0;
 }
 
-static int
-WaveReadPartialChunkData(SDL_RWops *src, WaveChunk *chunk, size_t length)
+static int WaveReadPartialChunkData(SDL_RWops *src, WaveChunk *chunk, size_t length)
 {
     WaveFreeChunkData(chunk);
 
@@ -1562,7 +1543,7 @@ WaveReadPartialChunkData(SDL_RWops *src, WaveChunk *chunk, size_t length)
     }
 
     if (length > 0) {
-        chunk->data = (Uint8 *) SDL_malloc(length);
+        chunk->data = (Uint8 *)SDL_malloc(length);
         if (chunk->data == NULL) {
             return SDL_OutOfMemory();
         }
@@ -1581,30 +1562,32 @@ WaveReadPartialChunkData(SDL_RWops *src, WaveChunk *chunk, size_t length)
     return 0;
 }
 
-static int
-WaveReadChunkData(SDL_RWops *src, WaveChunk *chunk)
+static int WaveReadChunkData(SDL_RWops *src, WaveChunk *chunk)
 {
     return WaveReadPartialChunkData(src, chunk, chunk->length);
 }
 
-typedef struct WaveExtensibleGUID {
+typedef struct WaveExtensibleGUID
+{
     Uint16 encoding;
     Uint8 guid[16];
 } WaveExtensibleGUID;
 
 /* Some of the GUIDs that are used by WAVEFORMATEXTENSIBLE. */
-#define WAVE_FORMATTAG_GUID(tag) {(tag) & 0xff, (tag) >> 8, 0, 0, 0, 0, 16, 0, 128, 0, 0, 170, 0, 56, 155, 113}
+#define WAVE_FORMATTAG_GUID(tag)                                                     \
+    {                                                                                \
+        (tag) & 0xff, (tag) >> 8, 0, 0, 0, 0, 16, 0, 128, 0, 0, 170, 0, 56, 155, 113 \
+    }
 static WaveExtensibleGUID extensible_guids[] = {
-    {PCM_CODE,        WAVE_FORMATTAG_GUID(PCM_CODE)},
-    {MS_ADPCM_CODE,   WAVE_FORMATTAG_GUID(MS_ADPCM_CODE)},
-    {IEEE_FLOAT_CODE, WAVE_FORMATTAG_GUID(IEEE_FLOAT_CODE)},
-    {ALAW_CODE,       WAVE_FORMATTAG_GUID(ALAW_CODE)},
-    {MULAW_CODE,      WAVE_FORMATTAG_GUID(MULAW_CODE)},
-    {IMA_ADPCM_CODE,  WAVE_FORMATTAG_GUID(IMA_ADPCM_CODE)}
+    { PCM_CODE, WAVE_FORMATTAG_GUID(PCM_CODE) },
+    { MS_ADPCM_CODE, WAVE_FORMATTAG_GUID(MS_ADPCM_CODE) },
+    { IEEE_FLOAT_CODE, WAVE_FORMATTAG_GUID(IEEE_FLOAT_CODE) },
+    { ALAW_CODE, WAVE_FORMATTAG_GUID(ALAW_CODE) },
+    { MULAW_CODE, WAVE_FORMATTAG_GUID(MULAW_CODE) },
+    { IMA_ADPCM_CODE, WAVE_FORMATTAG_GUID(IMA_ADPCM_CODE) }
 };
 
-static Uint16
-WaveGetFormatGUIDEncoding(WaveFormat *format)
+static Uint16 WaveGetFormatGUIDEncoding(WaveFormat *format)
 {
     size_t i;
     for (i = 0; i < SDL_arraysize(extensible_guids); i++) {
@@ -1615,8 +1598,7 @@ WaveGetFormatGUIDEncoding(WaveFormat *format)
     return UNKNOWN_CODE;
 }
 
-static int
-WaveReadFormat(WaveFile *file)
+static int WaveReadFormat(WaveFile *file)
 {
     WaveChunk *chunk = &file->chunk;
     WaveFormat *format = &file->format;
@@ -1677,8 +1659,7 @@ WaveReadFormat(WaveFile *file)
     return 0;
 }
 
-static int
-WaveCheckFormat(WaveFile *file, size_t datalength)
+static int WaveCheckFormat(WaveFile *file, size_t datalength)
 {
     WaveFormat *format = &file->format;
 
@@ -1785,8 +1766,7 @@ WaveCheckFormat(WaveFile *file, size_t datalength)
     return 0;
 }
 
-static int
-WaveLoad(SDL_RWops *src, WaveFile *file, SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len)
+static int WaveLoad(SDL_RWops *src, WaveFile *file, SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len)
 {
     int result;
     Uint32 chunkcount = 0;
@@ -2051,7 +2031,7 @@ WaveLoad(SDL_RWops *src, WaveFile *file, SDL_AudioSpec *spec, Uint8 **audio_buf,
     SDL_zerop(spec);
     spec->freq = format->frequency;
     spec->channels = (Uint8)format->channels;
-    spec->samples = 4096;       /* Good default buffer size */
+    spec->samples = 4096; /* Good default buffer size */
 
     switch (format->encoding) {
     case MS_ADPCM_CODE:
@@ -2148,8 +2128,7 @@ SDL_LoadWAV_RW(SDL_RWops *src, int freesrc, SDL_AudioSpec *spec, Uint8 **audio_b
 /* Since the WAV memory is allocated in the shared library, it must also
    be freed here.  (Necessary under Win32, VC++)
  */
-void
-SDL_FreeWAV(Uint8 *audio_buf)
+void SDL_FreeWAV(Uint8 *audio_buf)
 {
     SDL_free(audio_buf);
 }

src/audio/SDL_wave.h

@@ -26,14 +26,14 @@
 /* Define values for Microsoft WAVE format */
 /*******************************************/
 /* FOURCC */
-#define RIFF            0x46464952      /* "RIFF" */
-#define WAVE            0x45564157      /* "WAVE" */
-#define FACT            0x74636166      /* "fact" */
-#define LIST            0x5453494c      /* "LIST" */
-#define BEXT            0x74786562      /* "bext" */
-#define JUNK            0x4B4E554A      /* "JUNK" */
-#define FMT             0x20746D66      /* "fmt " */
-#define DATA            0x61746164      /* "data" */
+#define RIFF 0x46464952 /* "RIFF" */
+#define WAVE 0x45564157 /* "WAVE" */
+#define FACT 0x74636166 /* "fact" */
+#define LIST 0x5453494c /* "LIST" */
+#define BEXT 0x74786562 /* "bext" */
+#define JUNK 0x4B4E554A /* "JUNK" */
+#define FMT  0x20746D66 /* "fmt " */
+#define DATA 0x61746164 /* "data" */
 /* Format tags */
 #define UNKNOWN_CODE    0x0000
 #define PCM_CODE        0x0001
@@ -49,13 +49,13 @@
 /* Stores the WAVE format information. */
 typedef struct WaveFormat
 {
-    Uint16 formattag;       /* Raw value of the first field in the fmt chunk data. */
-    Uint16 encoding;        /* Actual encoding, possibly from the extensible header. */
-    Uint16 channels;        /* Number of channels. */
-    Uint32 frequency;       /* Sampling rate in Hz. */
-    Uint32 byterate;        /* Average bytes per second. */
-    Uint16 blockalign;      /* Bytes per block. */
-    Uint16 bitspersample;   /* Currently supported are 8, 16, 24, 32, and 4 for ADPCM. */
+    Uint16 formattag;     /* Raw value of the first field in the fmt chunk data. */
+    Uint16 encoding;      /* Actual encoding, possibly from the extensible header. */
+    Uint16 channels;      /* Number of channels. */
+    Uint32 frequency;     /* Sampling rate in Hz. */
+    Uint32 byterate;      /* Average bytes per second. */
+    Uint16 blockalign;    /* Bytes per block. */
+    Uint16 bitspersample; /* Currently supported are 8, 16, 24, 32, and 4 for ADPCM. */
 
     /* Extra information size. Number of extra bytes starting at byte 18 in the
      * fmt chunk data. This is at least 22 for the extensible header.
@@ -66,11 +66,12 @@ typedef struct WaveFormat
     Uint16 validsamplebits;
     Uint32 samplesperblock; /* For compressed formats. Can be zero. Actually 16 bits in the header. */
     Uint32 channelmask;
-    Uint8 subformat[16];    /* A format GUID. */
+    Uint8 subformat[16]; /* A format GUID. */
 } WaveFormat;
 
 /* Stores information on the fact chunk. */
-typedef struct WaveFact {
+typedef struct WaveFact
+{
     /* Represents the state of the fact chunk in the WAVE file.
      * Set to -1 if the fact chunk is invalid.
      * Set to 0 if the fact chunk is not present
@@ -101,7 +102,8 @@ typedef struct WaveChunk
 } WaveChunk;
 
 /* Controls how the size of the RIFF chunk affects the loading of a WAVE file. */
-typedef enum WaveRiffSizeHint {
+typedef enum WaveRiffSizeHint
+{
     RiffSizeNoHint,
     RiffSizeForce,
     RiffSizeIgnoreZero,
@@ -110,7 +112,8 @@ typedef enum WaveRiffSizeHint {
 } WaveRiffSizeHint;
 
 /* Controls how a truncated WAVE file is handled. */
-typedef enum WaveTruncationHint {
+typedef enum WaveTruncationHint
+{
     TruncNoHint,
     TruncVeryStrict,
     TruncStrict,
@@ -119,7 +122,8 @@ typedef enum WaveTruncationHint {
 } WaveTruncationHint;
 
 /* Controls how the fact chunk affects the loading of a WAVE file. */
-typedef enum WaveFactChunkHint {
+typedef enum WaveFactChunkHint
+{
     FactNoHint,
     FactTruncate,
     FactStrict,
@@ -139,7 +143,7 @@ typedef struct WaveFile
      */
     Sint64 sampleframes;
 
-    void *decoderdata;   /* Some decoders require extra data for a state. */
+    void *decoderdata; /* Some decoders require extra data for a state. */
 
     WaveRiffSizeHint riffhint;
     WaveTruncationHint trunchint;

src/audio/aaudio/SDL_aaudio.c

@@ -28,17 +28,17 @@
 
 /* Debug */
 #if 0
-#  define LOGI(...) SDL_Log(__VA_ARGS__);
+#define LOGI(...) SDL_Log(__VA_ARGS__);
 #else
-#  define LOGI(...)
+#define LOGI(...)
 #endif
 
 typedef struct AAUDIO_Data
 {
     AAudioStreamBuilder *builder;
     void *handle;
-#define SDL_PROC(ret,func,params) ret (*func) params;
-#  include "SDL_aaudiofuncs.h"
+#define SDL_PROC(ret, func, params) ret(*func) params;
+#include "SDL_aaudiofuncs.h"
 #undef SDL_PROC
 } AAUDIO_Data;
 static AAUDIO_Data ctx;
@@ -48,28 +48,27 @@ static SDL_AudioDevice *captureDevice = NULL;
 
 static int aaudio_LoadFunctions(AAUDIO_Data *data)
 {
-#define SDL_PROC(ret,func,params)                                                                   \
-    do {                                                                                            \
-        data->func = SDL_LoadFunction(data->handle, #func);                                         \
-        if (! data->func) {                                                                         \
-            return SDL_SetError("Couldn't load AAUDIO function %s: %s", #func, SDL_GetError());     \
-        }                                                                                           \
+#define SDL_PROC(ret, func, params)                                                             \
+    do {                                                                                        \
+        data->func = SDL_LoadFunction(data->handle, #func);                                     \
+        if (!data->func) {                                                                      \
+            return SDL_SetError("Couldn't load AAUDIO function %s: %s", #func, SDL_GetError()); \
+        }                                                                                       \
     } while (0);
 #include "SDL_aaudiofuncs.h"
 #undef SDL_PROC
     return 0;
 }
 
-void aaudio_errorCallback( AAudioStream *stream, void *userData, aaudio_result_t error );
-void aaudio_errorCallback( AAudioStream *stream, void *userData, aaudio_result_t error )
+void aaudio_errorCallback(AAudioStream *stream, void *userData, aaudio_result_t error);
+void aaudio_errorCallback(AAudioStream *stream, void *userData, aaudio_result_t error)
 {
-    LOGI( "SDL aaudio_errorCallback: %d - %s", error, ctx.AAudio_convertResultToText( error ) );
+    LOGI("SDL aaudio_errorCallback: %d - %s", error, ctx.AAudio_convertResultToText(error));
 }
 
 #define LIB_AAUDIO_SO "libaaudio.so"
 
-static int
-aaudio_OpenDevice(_THIS, const char *devname)
+static int aaudio_OpenDevice(_THIS, const char *devname)
 {
     struct SDL_PrivateAudioData *private;
     SDL_bool iscapture = this->iscapture;
@@ -92,7 +91,7 @@ aaudio_OpenDevice(_THIS, const char *devname)
         audioDevice = this;
     }
 
-    this->hidden = (struct SDL_PrivateAudioData *) SDL_calloc(1, (sizeof *this->hidden));
+    this->hidden = (struct SDL_PrivateAudioData *)SDL_calloc(1, (sizeof *this->hidden));
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
@@ -114,11 +113,11 @@ aaudio_OpenDevice(_THIS, const char *devname)
         ctx.AAudioStreamBuilder_setFormat(ctx.builder, format);
     }
 
-    ctx.AAudioStreamBuilder_setErrorCallback( ctx.builder, aaudio_errorCallback, private );
+    ctx.AAudioStreamBuilder_setErrorCallback(ctx.builder, aaudio_errorCallback, private);
 
     LOGI("AAudio Try to open %u hz %u bit chan %u %s samples %u",
-          this->spec.freq, SDL_AUDIO_BITSIZE(this->spec.format),
-          this->spec.channels, (this->spec.format & 0x1000) ? "BE" : "LE", this->spec.samples);
+         this->spec.freq, SDL_AUDIO_BITSIZE(this->spec.format),
+         this->spec.channels, (this->spec.format & 0x1000) ? "BE" : "LE", this->spec.samples);
 
     res = ctx.AAudioStreamBuilder_openStream(ctx.builder, &private->stream);
     if (res != AAUDIO_OK) {
@@ -138,15 +137,15 @@ aaudio_OpenDevice(_THIS, const char *devname)
     }
 
     LOGI("AAudio Try to open %u hz %u bit chan %u %s samples %u",
-          this->spec.freq, SDL_AUDIO_BITSIZE(this->spec.format),
-          this->spec.channels, (this->spec.format & 0x1000) ? "BE" : "LE", this->spec.samples);
+         this->spec.freq, SDL_AUDIO_BITSIZE(this->spec.format),
+         this->spec.channels, (this->spec.format & 0x1000) ? "BE" : "LE", this->spec.samples);
 
     SDL_CalculateAudioSpec(&this->spec);
 
     /* Allocate mixing buffer */
     if (!iscapture) {
         private->mixlen = this->spec.size;
-        private->mixbuf = (Uint8 *) SDL_malloc(private->mixlen);
+        private->mixbuf = (Uint8 *)SDL_malloc(private->mixlen);
         if (private->mixbuf == NULL) {
             return SDL_OutOfMemory();
         }
@@ -165,8 +164,7 @@ aaudio_OpenDevice(_THIS, const char *devname)
     return 0;
 }
 
-static void
-aaudio_CloseDevice(_THIS)
+static void aaudio_CloseDevice(_THIS)
 {
     struct SDL_PrivateAudioData *private = this->hidden;
     aaudio_result_t res;
@@ -200,20 +198,18 @@ aaudio_CloseDevice(_THIS)
     SDL_free(this->hidden);
 }
 
-static Uint8 *
-aaudio_GetDeviceBuf(_THIS)
+static Uint8 *aaudio_GetDeviceBuf(_THIS)
 {
     struct SDL_PrivateAudioData *private = this->hidden;
     return private->mixbuf;
 }
 
-static void
-aaudio_PlayDevice(_THIS)
+static void aaudio_PlayDevice(_THIS)
 {
     struct SDL_PrivateAudioData *private = this->hidden;
     aaudio_result_t res;
     int64_t timeoutNanoseconds = 1 * 1000 * 1000; /* 8 ms */
-    res = ctx.AAudioStream_write(private->stream,  private->mixbuf, private->mixlen / private->frame_size, timeoutNanoseconds);
+    res = ctx.AAudioStream_write(private->stream, private->mixbuf, private->mixlen / private->frame_size, timeoutNanoseconds);
     if (res < 0) {
         LOGI("%s : %s", __func__, ctx.AAudio_convertResultToText(res));
     } else {
@@ -233,13 +229,12 @@ aaudio_PlayDevice(_THIS)
 #endif
 }
 
-static int
-aaudio_CaptureFromDevice(_THIS, void *buffer, int buflen)
+static int aaudio_CaptureFromDevice(_THIS, void *buffer, int buflen)
 {
     struct SDL_PrivateAudioData *private = this->hidden;
     aaudio_result_t res;
     int64_t timeoutNanoseconds = 8 * 1000 * 1000; /* 8 ms */
-    res = ctx.AAudioStream_read(private->stream,  buffer, buflen / private->frame_size, timeoutNanoseconds);
+    res = ctx.AAudioStream_read(private->stream, buffer, buflen / private->frame_size, timeoutNanoseconds);
     if (res < 0) {
         LOGI("%s : %s", __func__, ctx.AAudio_convertResultToText(res));
         return -1;
@@ -248,8 +243,7 @@ aaudio_CaptureFromDevice(_THIS, void *buffer, int buflen)
     return res * private->frame_size;
 }
 
-static void
-aaudio_Deinitialize(void)
+static void aaudio_Deinitialize(void)
 {
     LOGI(__func__);
     if (ctx.handle) {
@@ -267,8 +261,7 @@ aaudio_Deinitialize(void)
     LOGI("End AAUDIO %s", SDL_GetError());
 }
 
-static SDL_bool
-aaudio_Init(SDL_AudioDriverImpl *impl)
+static SDL_bool aaudio_Init(SDL_AudioDriverImpl *impl)
 {
     aaudio_result_t res;
     LOGI(__func__);
@@ -343,7 +336,7 @@ void aaudio_PauseDevices(void)
     /* TODO: Handle multiple devices? */
     struct SDL_PrivateAudioData *private;
     if (audioDevice != NULL && audioDevice->hidden != NULL) {
-        private = (struct SDL_PrivateAudioData *) audioDevice->hidden;
+        private = (struct SDL_PrivateAudioData *)audioDevice->hidden;
 
         if (private->stream) {
             aaudio_result_t res = ctx.AAudioStream_requestPause(private->stream);
@@ -364,7 +357,7 @@ void aaudio_PauseDevices(void)
     }
 
     if (captureDevice != NULL && captureDevice->hidden != NULL) {
-        private = (struct SDL_PrivateAudioData *) captureDevice->hidden;
+        private = (struct SDL_PrivateAudioData *)captureDevice->hidden;
 
         if (private->stream) {
             /* Pause() isn't implemented for 'capture', use Stop() */
@@ -392,7 +385,7 @@ void aaudio_ResumeDevices(void)
     /* TODO: Handle multiple devices? */
     struct SDL_PrivateAudioData *private;
     if (audioDevice != NULL && audioDevice->hidden != NULL) {
-        private = (struct SDL_PrivateAudioData *) audioDevice->hidden;
+        private = (struct SDL_PrivateAudioData *)audioDevice->hidden;
 
         if (private->resume) {
             SDL_AtomicSet(&audioDevice->paused, 0);
@@ -410,7 +403,7 @@ void aaudio_ResumeDevices(void)
     }
 
     if (captureDevice != NULL && captureDevice->hidden != NULL) {
-        private = (struct SDL_PrivateAudioData *) captureDevice->hidden;
+        private = (struct SDL_PrivateAudioData *)captureDevice->hidden;
 
         if (private->resume) {
             SDL_AtomicSet(&captureDevice->paused, 0);
@@ -433,24 +426,24 @@ void aaudio_ResumeDevices(void)
  None of the standard state queries indicate any problem in my testing. And the error callback doesn't actually get called.
  But, AAudioStream_getTimestamp() does return AAUDIO_ERROR_INVALID_STATE
 */
-SDL_bool aaudio_DetectBrokenPlayState( void )
+SDL_bool aaudio_DetectBrokenPlayState(void)
 {
     struct SDL_PrivateAudioData *private;
     int64_t framePosition, timeNanoseconds;
     aaudio_result_t res;
 
-    if (audioDevice == NULL || !audioDevice->hidden ) {
+    if (audioDevice == NULL || !audioDevice->hidden) {
         return SDL_FALSE;
     }
 
     private = audioDevice->hidden;
 
-    res = ctx.AAudioStream_getTimestamp( private->stream, CLOCK_MONOTONIC, &framePosition, &timeNanoseconds );
-    if ( res == AAUDIO_ERROR_INVALID_STATE ) {
-        aaudio_stream_state_t currentState = ctx.AAudioStream_getState( private->stream );
+    res = ctx.AAudioStream_getTimestamp(private->stream, CLOCK_MONOTONIC, &framePosition, &timeNanoseconds);
+    if (res == AAUDIO_ERROR_INVALID_STATE) {
+        aaudio_stream_state_t currentState = ctx.AAudioStream_getState(private->stream);
         /* AAudioStream_getTimestamp() will also return AAUDIO_ERROR_INVALID_STATE while the stream is still initially starting. But we only care if it silently went invalid while playing. */
-        if ( currentState == AAUDIO_STREAM_STATE_STARTED ) {
-            LOGI( "SDL aaudio_DetectBrokenPlayState: detected invalid audio device state: AAudioStream_getTimestamp result=%d, framePosition=%lld, timeNanoseconds=%lld, getState=%d", (int)res, (long long)framePosition, (long long)timeNanoseconds, (int)currentState );
+        if (currentState == AAUDIO_STREAM_STATE_STARTED) {
+            LOGI("SDL aaudio_DetectBrokenPlayState: detected invalid audio device state: AAudioStream_getTimestamp result=%d, framePosition=%lld, timeNanoseconds=%lld, getState=%d", (int)res, (long long)framePosition, (long long)timeNanoseconds, (int)currentState);
             return SDL_TRUE;
         }
     }

src/audio/aaudio/SDL_aaudio.h

@@ -28,7 +28,7 @@
 #include <aaudio/AAudio.h>
 
 /* Hidden "this" pointer for the audio functions */
-#define _THIS   SDL_AudioDevice *this
+#define _THIS SDL_AudioDevice *this
 
 struct SDL_PrivateAudioData
 {
@@ -42,12 +42,11 @@ struct SDL_PrivateAudioData
     /* Resume device if it was paused automatically */
     int resume;
 };
- 
+
 void aaudio_ResumeDevices(void);
 void aaudio_PauseDevices(void);
 SDL_bool aaudio_DetectBrokenPlayState(void);
 
-
 #endif /* _SDL_aaudio_h */
 
 /* vi: set ts=4 sw=4 expandtab: */

src/audio/aaudio/SDL_aaudiofuncs.h

@@ -19,62 +19,61 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#define SDL_PROC_UNUSED(ret,func,params)
+#define SDL_PROC_UNUSED(ret, func, params)
 
 SDL_PROC(const char *, AAudio_convertResultToText, (aaudio_result_t returnCode))
 SDL_PROC(const char *, AAudio_convertStreamStateToText, (aaudio_stream_state_t state))
-SDL_PROC(aaudio_result_t, AAudio_createStreamBuilder, (AAudioStreamBuilder** builder))
-SDL_PROC_UNUSED(void, AAudioStreamBuilder_setDeviceId, (AAudioStreamBuilder* builder, int32_t deviceId))
-SDL_PROC(void, AAudioStreamBuilder_setSampleRate, (AAudioStreamBuilder* builder, int32_t sampleRate))
-SDL_PROC(void, AAudioStreamBuilder_setChannelCount, (AAudioStreamBuilder* builder, int32_t channelCount))
-SDL_PROC_UNUSED(void, AAudioStreamBuilder_setSamplesPerFrame, (AAudioStreamBuilder* builder, int32_t samplesPerFrame))
-SDL_PROC(void, AAudioStreamBuilder_setFormat, (AAudioStreamBuilder* builder, aaudio_format_t format))
-SDL_PROC_UNUSED(void, AAudioStreamBuilder_setSharingMode, (AAudioStreamBuilder* builder, aaudio_sharing_mode_t sharingMode))
-SDL_PROC(void, AAudioStreamBuilder_setDirection, (AAudioStreamBuilder* builder, aaudio_direction_t direction))
-SDL_PROC_UNUSED(void, AAudioStreamBuilder_setBufferCapacityInFrames, (AAudioStreamBuilder* builder, int32_t numFrames))
-SDL_PROC_UNUSED(void, AAudioStreamBuilder_setPerformanceMode, (AAudioStreamBuilder* builder, aaudio_performance_mode_t mode))
-SDL_PROC_UNUSED(void, AAudioStreamBuilder_setUsage, (AAudioStreamBuilder* builder, aaudio_usage_t usage)) /* API 28 */
-SDL_PROC_UNUSED(void, AAudioStreamBuilder_setContentType, (AAudioStreamBuilder* builder, aaudio_content_type_t contentType)) /* API 28 */
-SDL_PROC_UNUSED(void, AAudioStreamBuilder_setInputPreset, (AAudioStreamBuilder* builder, aaudio_input_preset_t inputPreset)) /* API 28 */
-SDL_PROC_UNUSED(void, AAudioStreamBuilder_setAllowedCapturePolicy, (AAudioStreamBuilder* builder, aaudio_allowed_capture_policy_t capturePolicy)) /* API 29 */
-SDL_PROC_UNUSED(void, AAudioStreamBuilder_setSessionId, (AAudioStreamBuilder* builder, aaudio_session_id_t sessionId)) /* API 28 */
-SDL_PROC_UNUSED(void, AAudioStreamBuilder_setPrivacySensitive, (AAudioStreamBuilder* builder, bool privacySensitive)) /* API 30 */
-SDL_PROC_UNUSED(void, AAudioStreamBuilder_setDataCallback, (AAudioStreamBuilder* builder, AAudioStream_dataCallback callback, void *userData))
-SDL_PROC_UNUSED(void, AAudioStreamBuilder_setFramesPerDataCallback, (AAudioStreamBuilder* builder, int32_t numFrames))
-SDL_PROC(void, AAudioStreamBuilder_setErrorCallback, (AAudioStreamBuilder* builder, AAudioStream_errorCallback callback, void *userData))
-SDL_PROC(aaudio_result_t , AAudioStreamBuilder_openStream, (AAudioStreamBuilder* builder, AAudioStream** stream))
-SDL_PROC(aaudio_result_t , AAudioStreamBuilder_delete, (AAudioStreamBuilder* builder))
-SDL_PROC_UNUSED(aaudio_result_t , AAudioStream_release, (AAudioStream* stream)) /* API 30 */
-SDL_PROC(aaudio_result_t , AAudioStream_close, (AAudioStream* stream))
-SDL_PROC(aaudio_result_t , AAudioStream_requestStart, (AAudioStream* stream))
-SDL_PROC(aaudio_result_t , AAudioStream_requestPause, (AAudioStream* stream))
-SDL_PROC_UNUSED(aaudio_result_t , AAudioStream_requestFlush, (AAudioStream* stream))
-SDL_PROC(aaudio_result_t , AAudioStream_requestStop, (AAudioStream* stream))
-SDL_PROC(aaudio_stream_state_t, AAudioStream_getState, (AAudioStream* stream))
-SDL_PROC_UNUSED(aaudio_result_t, AAudioStream_waitForStateChange, (AAudioStream* stream, aaudio_stream_state_t inputState, aaudio_stream_state_t *nextState, int64_t timeoutNanoseconds))
-SDL_PROC(aaudio_result_t, AAudioStream_read, (AAudioStream* stream, void *buffer, int32_t numFrames, int64_t timeoutNanoseconds))
-SDL_PROC(aaudio_result_t, AAudioStream_write, (AAudioStream* stream, const void *buffer, int32_t numFrames, int64_t timeoutNanoseconds))
-SDL_PROC_UNUSED(aaudio_result_t, AAudioStream_setBufferSizeInFrames, (AAudioStream* stream, int32_t numFrames))
-SDL_PROC_UNUSED(int32_t, AAudioStream_getBufferSizeInFrames, (AAudioStream* stream))
-SDL_PROC_UNUSED(int32_t, AAudioStream_getFramesPerBurst, (AAudioStream* stream))
-SDL_PROC_UNUSED(int32_t, AAudioStream_getBufferCapacityInFrames, (AAudioStream* stream))
-SDL_PROC_UNUSED(int32_t, AAudioStream_getFramesPerDataCallback, (AAudioStream* stream))
-SDL_PROC(int32_t, AAudioStream_getXRunCount, (AAudioStream* stream))
-SDL_PROC(int32_t, AAudioStream_getSampleRate, (AAudioStream* stream))
-SDL_PROC(int32_t, AAudioStream_getChannelCount, (AAudioStream* stream))
-SDL_PROC_UNUSED(int32_t, AAudioStream_getSamplesPerFrame, (AAudioStream* stream))
-SDL_PROC_UNUSED(int32_t, AAudioStream_getDeviceId, (AAudioStream* stream))
-SDL_PROC(aaudio_format_t, AAudioStream_getFormat, (AAudioStream* stream))
-SDL_PROC_UNUSED(aaudio_sharing_mode_t, AAudioStream_getSharingMode, (AAudioStream* stream))
-SDL_PROC_UNUSED(aaudio_performance_mode_t, AAudioStream_getPerformanceMode, (AAudioStream* stream))
-SDL_PROC_UNUSED(aaudio_direction_t, AAudioStream_getDirection, (AAudioStream* stream))
-SDL_PROC_UNUSED(int64_t, AAudioStream_getFramesWritten, (AAudioStream* stream))
-SDL_PROC_UNUSED(int64_t, AAudioStream_getFramesRead, (AAudioStream* stream))
-SDL_PROC_UNUSED(aaudio_session_id_t, AAudioStream_getSessionId, (AAudioStream* stream)) /* API 28 */
-SDL_PROC(aaudio_result_t, AAudioStream_getTimestamp, (AAudioStream* stream, clockid_t clockid, int64_t *framePosition, int64_t *timeNanoseconds))
-SDL_PROC_UNUSED(aaudio_usage_t, AAudioStream_getUsage, (AAudioStream* stream)) /* API 28 */
-SDL_PROC_UNUSED(aaudio_content_type_t, AAudioStream_getContentType, (AAudioStream* stream)) /* API 28 */
-SDL_PROC_UNUSED(aaudio_input_preset_t, AAudioStream_getInputPreset, (AAudioStream* stream)) /* API 28 */
-SDL_PROC_UNUSED(aaudio_allowed_capture_policy_t, AAudioStream_getAllowedCapturePolicy, ( AAudioStream* stream)) /* API 29 */
-SDL_PROC_UNUSED(bool, AAudioStream_isPrivacySensitive, (AAudioStream* stream)) /* API 30 */
-
+SDL_PROC(aaudio_result_t, AAudio_createStreamBuilder, (AAudioStreamBuilder * *builder))
+SDL_PROC_UNUSED(void, AAudioStreamBuilder_setDeviceId, (AAudioStreamBuilder * builder, int32_t deviceId))
+SDL_PROC(void, AAudioStreamBuilder_setSampleRate, (AAudioStreamBuilder * builder, int32_t sampleRate))
+SDL_PROC(void, AAudioStreamBuilder_setChannelCount, (AAudioStreamBuilder * builder, int32_t channelCount))
+SDL_PROC_UNUSED(void, AAudioStreamBuilder_setSamplesPerFrame, (AAudioStreamBuilder * builder, int32_t samplesPerFrame))
+SDL_PROC(void, AAudioStreamBuilder_setFormat, (AAudioStreamBuilder * builder, aaudio_format_t format))
+SDL_PROC_UNUSED(void, AAudioStreamBuilder_setSharingMode, (AAudioStreamBuilder * builder, aaudio_sharing_mode_t sharingMode))
+SDL_PROC(void, AAudioStreamBuilder_setDirection, (AAudioStreamBuilder * builder, aaudio_direction_t direction))
+SDL_PROC_UNUSED(void, AAudioStreamBuilder_setBufferCapacityInFrames, (AAudioStreamBuilder * builder, int32_t numFrames))
+SDL_PROC_UNUSED(void, AAudioStreamBuilder_setPerformanceMode, (AAudioStreamBuilder * builder, aaudio_performance_mode_t mode))
+SDL_PROC_UNUSED(void, AAudioStreamBuilder_setUsage, (AAudioStreamBuilder * builder, aaudio_usage_t usage))                                         /* API 28 */
+SDL_PROC_UNUSED(void, AAudioStreamBuilder_setContentType, (AAudioStreamBuilder * builder, aaudio_content_type_t contentType))                      /* API 28 */
+SDL_PROC_UNUSED(void, AAudioStreamBuilder_setInputPreset, (AAudioStreamBuilder * builder, aaudio_input_preset_t inputPreset))                      /* API 28 */
+SDL_PROC_UNUSED(void, AAudioStreamBuilder_setAllowedCapturePolicy, (AAudioStreamBuilder * builder, aaudio_allowed_capture_policy_t capturePolicy)) /* API 29 */
+SDL_PROC_UNUSED(void, AAudioStreamBuilder_setSessionId, (AAudioStreamBuilder * builder, aaudio_session_id_t sessionId))                            /* API 28 */
+SDL_PROC_UNUSED(void, AAudioStreamBuilder_setPrivacySensitive, (AAudioStreamBuilder * builder, bool privacySensitive))                             /* API 30 */
+SDL_PROC_UNUSED(void, AAudioStreamBuilder_setDataCallback, (AAudioStreamBuilder * builder, AAudioStream_dataCallback callback, void *userData))
+SDL_PROC_UNUSED(void, AAudioStreamBuilder_setFramesPerDataCallback, (AAudioStreamBuilder * builder, int32_t numFrames))
+SDL_PROC(void, AAudioStreamBuilder_setErrorCallback, (AAudioStreamBuilder * builder, AAudioStream_errorCallback callback, void *userData))
+SDL_PROC(aaudio_result_t, AAudioStreamBuilder_openStream, (AAudioStreamBuilder * builder, AAudioStream **stream))
+SDL_PROC(aaudio_result_t, AAudioStreamBuilder_delete, (AAudioStreamBuilder * builder))
+SDL_PROC_UNUSED(aaudio_result_t, AAudioStream_release, (AAudioStream * stream)) /* API 30 */
+SDL_PROC(aaudio_result_t, AAudioStream_close, (AAudioStream * stream))
+SDL_PROC(aaudio_result_t, AAudioStream_requestStart, (AAudioStream * stream))
+SDL_PROC(aaudio_result_t, AAudioStream_requestPause, (AAudioStream * stream))
+SDL_PROC_UNUSED(aaudio_result_t, AAudioStream_requestFlush, (AAudioStream * stream))
+SDL_PROC(aaudio_result_t, AAudioStream_requestStop, (AAudioStream * stream))
+SDL_PROC(aaudio_stream_state_t, AAudioStream_getState, (AAudioStream * stream))
+SDL_PROC_UNUSED(aaudio_result_t, AAudioStream_waitForStateChange, (AAudioStream * stream, aaudio_stream_state_t inputState, aaudio_stream_state_t *nextState, int64_t timeoutNanoseconds))
+SDL_PROC(aaudio_result_t, AAudioStream_read, (AAudioStream * stream, void *buffer, int32_t numFrames, int64_t timeoutNanoseconds))
+SDL_PROC(aaudio_result_t, AAudioStream_write, (AAudioStream * stream, const void *buffer, int32_t numFrames, int64_t timeoutNanoseconds))
+SDL_PROC_UNUSED(aaudio_result_t, AAudioStream_setBufferSizeInFrames, (AAudioStream * stream, int32_t numFrames))
+SDL_PROC_UNUSED(int32_t, AAudioStream_getBufferSizeInFrames, (AAudioStream * stream))
+SDL_PROC_UNUSED(int32_t, AAudioStream_getFramesPerBurst, (AAudioStream * stream))
+SDL_PROC_UNUSED(int32_t, AAudioStream_getBufferCapacityInFrames, (AAudioStream * stream))
+SDL_PROC_UNUSED(int32_t, AAudioStream_getFramesPerDataCallback, (AAudioStream * stream))
+SDL_PROC(int32_t, AAudioStream_getXRunCount, (AAudioStream * stream))
+SDL_PROC(int32_t, AAudioStream_getSampleRate, (AAudioStream * stream))
+SDL_PROC(int32_t, AAudioStream_getChannelCount, (AAudioStream * stream))
+SDL_PROC_UNUSED(int32_t, AAudioStream_getSamplesPerFrame, (AAudioStream * stream))
+SDL_PROC_UNUSED(int32_t, AAudioStream_getDeviceId, (AAudioStream * stream))
+SDL_PROC(aaudio_format_t, AAudioStream_getFormat, (AAudioStream * stream))
+SDL_PROC_UNUSED(aaudio_sharing_mode_t, AAudioStream_getSharingMode, (AAudioStream * stream))
+SDL_PROC_UNUSED(aaudio_performance_mode_t, AAudioStream_getPerformanceMode, (AAudioStream * stream))
+SDL_PROC_UNUSED(aaudio_direction_t, AAudioStream_getDirection, (AAudioStream * stream))
+SDL_PROC_UNUSED(int64_t, AAudioStream_getFramesWritten, (AAudioStream * stream))
+SDL_PROC_UNUSED(int64_t, AAudioStream_getFramesRead, (AAudioStream * stream))
+SDL_PROC_UNUSED(aaudio_session_id_t, AAudioStream_getSessionId, (AAudioStream * stream)) /* API 28 */
+SDL_PROC(aaudio_result_t, AAudioStream_getTimestamp, (AAudioStream * stream, clockid_t clockid, int64_t *framePosition, int64_t *timeNanoseconds))
+SDL_PROC_UNUSED(aaudio_usage_t, AAudioStream_getUsage, (AAudioStream * stream))                                 /* API 28 */
+SDL_PROC_UNUSED(aaudio_content_type_t, AAudioStream_getContentType, (AAudioStream * stream))                    /* API 28 */
+SDL_PROC_UNUSED(aaudio_input_preset_t, AAudioStream_getInputPreset, (AAudioStream * stream))                    /* API 28 */
+SDL_PROC_UNUSED(aaudio_allowed_capture_policy_t, AAudioStream_getAllowedCapturePolicy, (AAudioStream * stream)) /* API 29 */
+SDL_PROC_UNUSED(bool, AAudioStream_isPrivacySensitive, (AAudioStream * stream))                                 /* API 30 */

src/audio/alsa/SDL_alsa_audio.c

@@ -34,7 +34,7 @@
 /* Allow access to a raw mixing buffer */
 
 #include <sys/types.h>
-#include <signal.h>             /* For kill() */
+#include <signal.h> /* For kill() */
 #include <string.h>
 
 #include "../SDL_audio_c.h"
@@ -43,64 +43,46 @@
 #ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC
 #endif
 
-static int (*ALSA_snd_pcm_open)
-  (snd_pcm_t **, const char *, snd_pcm_stream_t, int);
-static int (*ALSA_snd_pcm_close) (snd_pcm_t * pcm);
-static snd_pcm_sframes_t (*ALSA_snd_pcm_writei)
-  (snd_pcm_t *, const void *, snd_pcm_uframes_t);
-static snd_pcm_sframes_t (*ALSA_snd_pcm_readi)
-  (snd_pcm_t *, void *, snd_pcm_uframes_t);
-static int (*ALSA_snd_pcm_recover) (snd_pcm_t *, int, int);
-static int (*ALSA_snd_pcm_prepare) (snd_pcm_t *);
-static int (*ALSA_snd_pcm_drain) (snd_pcm_t *);
-static const char *(*ALSA_snd_strerror) (int);
-static size_t(*ALSA_snd_pcm_hw_params_sizeof) (void);
-static size_t(*ALSA_snd_pcm_sw_params_sizeof) (void);
-static void (*ALSA_snd_pcm_hw_params_copy)
-  (snd_pcm_hw_params_t *, const snd_pcm_hw_params_t *);
-static int (*ALSA_snd_pcm_hw_params_any) (snd_pcm_t *, snd_pcm_hw_params_t *);
-static int (*ALSA_snd_pcm_hw_params_set_access)
-  (snd_pcm_t *, snd_pcm_hw_params_t *, snd_pcm_access_t);
-static int (*ALSA_snd_pcm_hw_params_set_format)
-  (snd_pcm_t *, snd_pcm_hw_params_t *, snd_pcm_format_t);
-static int (*ALSA_snd_pcm_hw_params_set_channels)
-  (snd_pcm_t *, snd_pcm_hw_params_t *, unsigned int);
-static int (*ALSA_snd_pcm_hw_params_get_channels)
-  (const snd_pcm_hw_params_t *, unsigned int *);
-static int (*ALSA_snd_pcm_hw_params_set_rate_near)
-  (snd_pcm_t *, snd_pcm_hw_params_t *, unsigned int *, int *);
-static int (*ALSA_snd_pcm_hw_params_set_period_size_near)
-  (snd_pcm_t *, snd_pcm_hw_params_t *, snd_pcm_uframes_t *, int *);
-static int (*ALSA_snd_pcm_hw_params_get_period_size)
-  (const snd_pcm_hw_params_t *, snd_pcm_uframes_t *, int *);
-static int (*ALSA_snd_pcm_hw_params_set_periods_min)
-  (snd_pcm_t *, snd_pcm_hw_params_t *, unsigned int *, int *);
-static int (*ALSA_snd_pcm_hw_params_set_periods_first)
-  (snd_pcm_t *, snd_pcm_hw_params_t *, unsigned int *, int *);
-static int (*ALSA_snd_pcm_hw_params_get_periods)
-  (const snd_pcm_hw_params_t *, unsigned int *, int *);
-static int (*ALSA_snd_pcm_hw_params_set_buffer_size_near)
-  (snd_pcm_t *pcm, snd_pcm_hw_params_t *, snd_pcm_uframes_t *);
-static int (*ALSA_snd_pcm_hw_params_get_buffer_size)
-  (const snd_pcm_hw_params_t *, snd_pcm_uframes_t *);
-static int (*ALSA_snd_pcm_hw_params) (snd_pcm_t *, snd_pcm_hw_params_t *);
-static int (*ALSA_snd_pcm_sw_params_current) (snd_pcm_t *,
-                                              snd_pcm_sw_params_t *);
-static int (*ALSA_snd_pcm_sw_params_set_start_threshold)
-  (snd_pcm_t *, snd_pcm_sw_params_t *, snd_pcm_uframes_t);
-static int (*ALSA_snd_pcm_sw_params) (snd_pcm_t *, snd_pcm_sw_params_t *);
-static int (*ALSA_snd_pcm_nonblock) (snd_pcm_t *, int);
+static int (*ALSA_snd_pcm_open)(snd_pcm_t **, const char *, snd_pcm_stream_t, int);
+static int (*ALSA_snd_pcm_close)(snd_pcm_t *pcm);
+static snd_pcm_sframes_t (*ALSA_snd_pcm_writei)(snd_pcm_t *, const void *, snd_pcm_uframes_t);
+static snd_pcm_sframes_t (*ALSA_snd_pcm_readi)(snd_pcm_t *, void *, snd_pcm_uframes_t);
+static int (*ALSA_snd_pcm_recover)(snd_pcm_t *, int, int);
+static int (*ALSA_snd_pcm_prepare)(snd_pcm_t *);
+static int (*ALSA_snd_pcm_drain)(snd_pcm_t *);
+static const char *(*ALSA_snd_strerror)(int);
+static size_t (*ALSA_snd_pcm_hw_params_sizeof)(void);
+static size_t (*ALSA_snd_pcm_sw_params_sizeof)(void);
+static void (*ALSA_snd_pcm_hw_params_copy)(snd_pcm_hw_params_t *, const snd_pcm_hw_params_t *);
+static int (*ALSA_snd_pcm_hw_params_any)(snd_pcm_t *, snd_pcm_hw_params_t *);
+static int (*ALSA_snd_pcm_hw_params_set_access)(snd_pcm_t *, snd_pcm_hw_params_t *, snd_pcm_access_t);
+static int (*ALSA_snd_pcm_hw_params_set_format)(snd_pcm_t *, snd_pcm_hw_params_t *, snd_pcm_format_t);
+static int (*ALSA_snd_pcm_hw_params_set_channels)(snd_pcm_t *, snd_pcm_hw_params_t *, unsigned int);
+static int (*ALSA_snd_pcm_hw_params_get_channels)(const snd_pcm_hw_params_t *, unsigned int *);
+static int (*ALSA_snd_pcm_hw_params_set_rate_near)(snd_pcm_t *, snd_pcm_hw_params_t *, unsigned int *, int *);
+static int (*ALSA_snd_pcm_hw_params_set_period_size_near)(snd_pcm_t *, snd_pcm_hw_params_t *, snd_pcm_uframes_t *, int *);
+static int (*ALSA_snd_pcm_hw_params_get_period_size)(const snd_pcm_hw_params_t *, snd_pcm_uframes_t *, int *);
+static int (*ALSA_snd_pcm_hw_params_set_periods_min)(snd_pcm_t *, snd_pcm_hw_params_t *, unsigned int *, int *);
+static int (*ALSA_snd_pcm_hw_params_set_periods_first)(snd_pcm_t *, snd_pcm_hw_params_t *, unsigned int *, int *);
+static int (*ALSA_snd_pcm_hw_params_get_periods)(const snd_pcm_hw_params_t *, unsigned int *, int *);
+static int (*ALSA_snd_pcm_hw_params_set_buffer_size_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *, snd_pcm_uframes_t *);
+static int (*ALSA_snd_pcm_hw_params_get_buffer_size)(const snd_pcm_hw_params_t *, snd_pcm_uframes_t *);
+static int (*ALSA_snd_pcm_hw_params)(snd_pcm_t *, snd_pcm_hw_params_t *);
+static int (*ALSA_snd_pcm_sw_params_current)(snd_pcm_t *,
+                                             snd_pcm_sw_params_t *);
+static int (*ALSA_snd_pcm_sw_params_set_start_threshold)(snd_pcm_t *, snd_pcm_sw_params_t *, snd_pcm_uframes_t);
+static int (*ALSA_snd_pcm_sw_params)(snd_pcm_t *, snd_pcm_sw_params_t *);
+static int (*ALSA_snd_pcm_nonblock)(snd_pcm_t *, int);
 static int (*ALSA_snd_pcm_wait)(snd_pcm_t *, int);
-static int (*ALSA_snd_pcm_sw_params_set_avail_min)
-  (snd_pcm_t *, snd_pcm_sw_params_t *, snd_pcm_uframes_t);
+static int (*ALSA_snd_pcm_sw_params_set_avail_min)(snd_pcm_t *, snd_pcm_sw_params_t *, snd_pcm_uframes_t);
 static int (*ALSA_snd_pcm_reset)(snd_pcm_t *);
-static int (*ALSA_snd_device_name_hint) (int, const char *, void ***);
-static char* (*ALSA_snd_device_name_get_hint) (const void *, const char *);
-static int (*ALSA_snd_device_name_free_hint) (void **);
+static int (*ALSA_snd_device_name_hint)(int, const char *, void ***);
+static char *(*ALSA_snd_device_name_get_hint)(const void *, const char *);
+static int (*ALSA_snd_device_name_free_hint)(void **);
 static snd_pcm_sframes_t (*ALSA_snd_pcm_avail)(snd_pcm_t *);
 #ifdef SND_CHMAP_API_VERSION
-static snd_pcm_chmap_t* (*ALSA_snd_pcm_get_chmap) (snd_pcm_t *);
-static int (*ALSA_snd_pcm_chmap_print) (const snd_pcm_chmap_t *map, size_t maxlen, char *buf);
+static snd_pcm_chmap_t *(*ALSA_snd_pcm_get_chmap)(snd_pcm_t *);
+static int (*ALSA_snd_pcm_chmap_print)(const snd_pcm_chmap_t *map, size_t maxlen, char *buf);
 #endif
 
 #ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC
@@ -110,8 +92,7 @@ static int (*ALSA_snd_pcm_chmap_print) (const snd_pcm_chmap_t *map, size_t maxle
 static const char *alsa_library = SDL_AUDIO_DRIVER_ALSA_DYNAMIC;
 static void *alsa_handle = NULL;
 
-static int
-load_alsa_sym(const char *fn, void **addr)
+static int load_alsa_sym(const char *fn, void **addr)
 {
     *addr = SDL_LoadFunction(alsa_handle, fn);
     if (*addr == NULL) {
@@ -123,14 +104,14 @@ load_alsa_sym(const char *fn, void **addr)
 }
 
 /* cast funcs to char* first, to please GCC's strict aliasing rules. */
-#define SDL_ALSA_SYM(x) \
-    if (!load_alsa_sym(#x, (void **) (char *) &ALSA_##x)) return -1
+#define SDL_ALSA_SYM(x)                                 \
+    if (!load_alsa_sym(#x, (void **)(char *)&ALSA_##x)) \
+    return -1
 #else
 #define SDL_ALSA_SYM(x) ALSA_##x = x
 #endif
 
-static int
-load_alsa_syms(void)
+static int load_alsa_syms(void)
 {
     SDL_ALSA_SYM(snd_pcm_open);
     SDL_ALSA_SYM(snd_pcm_close);
@@ -180,8 +161,7 @@ load_alsa_syms(void)
 
 #ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC
 
-static void
-UnloadALSALibrary(void)
+static void UnloadALSALibrary(void)
 {
     if (alsa_handle != NULL) {
         SDL_UnloadObject(alsa_handle);
@@ -189,8 +169,7 @@ UnloadALSALibrary(void)
     }
 }
 
-static int
-LoadALSALibrary(void)
+static int LoadALSALibrary(void)
 {
     int retval = 0;
     if (alsa_handle == NULL) {
@@ -210,13 +189,11 @@ LoadALSALibrary(void)
 
 #else
 
-static void
-UnloadALSALibrary(void)
+static void UnloadALSALibrary(void)
 {
 }
 
-static int
-LoadALSALibrary(void)
+static int LoadALSALibrary(void)
 {
     load_alsa_syms();
     return 0;
@@ -224,8 +201,7 @@ LoadALSALibrary(void)
 
 #endif /* SDL_AUDIO_DRIVER_ALSA_DYNAMIC */
 
-static const char *
-get_audio_device(void *handle, const int channels)
+static const char *get_audio_device(void *handle, const int channels)
 {
     const char *device;
 
@@ -234,7 +210,7 @@ get_audio_device(void *handle, const int channels)
     }
 
     /* !!! FIXME: we also check "SDL_AUDIO_DEVICE_NAME" at the higher level. */
-    device = SDL_getenv("AUDIODEV");    /* Is there a standard variable name? */
+    device = SDL_getenv("AUDIODEV"); /* Is there a standard variable name? */
     if (device != NULL) {
         return device;
     }
@@ -248,49 +224,50 @@ get_audio_device(void *handle, const int channels)
     return "default";
 }
 
-
 /* This function waits until it is possible to write a full sound buffer */
-static void
-ALSA_WaitDevice(_THIS)
+static void ALSA_WaitDevice(_THIS)
 {
 #if SDL_ALSA_NON_BLOCKING
-    const snd_pcm_sframes_t needed = (snd_pcm_sframes_t) this->spec.samples;
+    const snd_pcm_sframes_t needed = (snd_pcm_sframes_t)this->spec.samples;
     while (SDL_AtomicGet(&this->enabled)) {
         const snd_pcm_sframes_t rc = ALSA_snd_pcm_avail(this->hidden->pcm_handle);
         if ((rc < 0) && (rc != -EAGAIN)) {
             /* Hmm, not much we can do - abort */
             fprintf(stderr, "ALSA snd_pcm_avail failed (unrecoverable): %s\n",
-                        ALSA_snd_strerror(rc));
+                    ALSA_snd_strerror(rc));
             SDL_OpenedAudioDeviceDisconnected(this);
             return;
         } else if (rc < needed) {
             const Uint32 delay = ((needed - (SDL_max(rc, 0))) * 1000) / this->spec.freq;
             SDL_Delay(SDL_max(delay, 10));
         } else {
-            break;  /* ready to go! */
+            break; /* ready to go! */
         }
     }
 #endif
 }
 
-
 /* !!! FIXME: is there a channel swizzler in alsalib instead? */
 /*
  * https://bugzilla.libsdl.org/show_bug.cgi?id=110
  * "For Linux ALSA, this is FL-FR-RL-RR-C-LFE
  *  and for Windows DirectX [and CoreAudio], this is FL-FR-C-LFE-RL-RR"
  */
-#define SWIZ6(T) \
-static void swizzle_alsa_channels_6_##T(void *buffer, const Uint32 bufferlen) { \
-    T *ptr = (T *) buffer; \
-    Uint32 i; \
-    for (i = 0; i < bufferlen; i++, ptr += 6) { \
-        T tmp; \
-        tmp = ptr[2]; ptr[2] = ptr[4]; ptr[4] = tmp; \
-        tmp = ptr[3]; ptr[3] = ptr[5]; ptr[5] = tmp; \
-    } \
-}
-
+#define SWIZ6(T)                                                                  \
+    static void swizzle_alsa_channels_6_##T(void *buffer, const Uint32 bufferlen) \
+    {                                                                             \
+        T *ptr = (T *)buffer;                                                     \
+        Uint32 i;                                                                 \
+        for (i = 0; i < bufferlen; i++, ptr += 6) {                               \
+            T tmp;                                                                \
+            tmp = ptr[2];                                                         \
+            ptr[2] = ptr[4];                                                      \
+            ptr[4] = tmp;                                                         \
+            tmp = ptr[3];                                                         \
+            ptr[3] = ptr[5];                                                      \
+            ptr[5] = tmp;                                                         \
+        }                                                                         \
+    }
 
 /* !!! FIXME: is there a channel swizzler in alsalib instead? */
 /* !!! FIXME: this screams for a SIMD shuffle operation. */
@@ -299,31 +276,32 @@ static void swizzle_alsa_channels_6_##T(void *buffer, const Uint32 bufferlen) {
  * For Linux ALSA, this appears to be FL-FR-RL-RR-C-LFE-SL-SR
  *  and for Windows DirectX [and CoreAudio], this is FL-FR-C-LFE-SL-SR-RL-RR"
  */
-#define SWIZ8(T) \
-static void swizzle_alsa_channels_8_##T(void *buffer, const Uint32 bufferlen) { \
-    T *ptr = (T *) buffer; \
-    Uint32 i; \
-    for (i = 0; i < bufferlen; i++, ptr += 6) { \
-        const T center = ptr[2]; \
-        const T subwoofer = ptr[3]; \
-        const T side_left = ptr[4]; \
-        const T side_right = ptr[5]; \
-        const T rear_left = ptr[6]; \
-        const T rear_right = ptr[7]; \
-        ptr[2] = rear_left; \
-        ptr[3] = rear_right; \
-        ptr[4] = center; \
-        ptr[5] = subwoofer; \
-        ptr[6] = side_left; \
-        ptr[7] = side_right; \
-    } \
-}
+#define SWIZ8(T)                                                                  \
+    static void swizzle_alsa_channels_8_##T(void *buffer, const Uint32 bufferlen) \
+    {                                                                             \
+        T *ptr = (T *)buffer;                                                     \
+        Uint32 i;                                                                 \
+        for (i = 0; i < bufferlen; i++, ptr += 6) {                               \
+            const T center = ptr[2];                                              \
+            const T subwoofer = ptr[3];                                           \
+            const T side_left = ptr[4];                                           \
+            const T side_right = ptr[5];                                          \
+            const T rear_left = ptr[6];                                           \
+            const T rear_right = ptr[7];                                          \
+            ptr[2] = rear_left;                                                   \
+            ptr[3] = rear_right;                                                  \
+            ptr[4] = center;                                                      \
+            ptr[5] = subwoofer;                                                   \
+            ptr[6] = side_left;                                                   \
+            ptr[7] = side_right;                                                  \
+        }                                                                         \
+    }
 
 #define CHANNEL_SWIZZLE(x) \
-    x(Uint64) \
-    x(Uint32) \
-    x(Uint16) \
-    x(Uint8)
+    x(Uint64)              \
+        x(Uint32)          \
+            x(Uint16)      \
+                x(Uint8)
 
 CHANNEL_SWIZZLE(SWIZ6)
 CHANNEL_SWIZZLE(SWIZ8)
@@ -332,53 +310,59 @@ CHANNEL_SWIZZLE(SWIZ8)
 #undef SWIZ6
 #undef SWIZ8
 
-
 /*
  * Called right before feeding this->hidden->mixbuf to the hardware. Swizzle
  *  channels from Windows/Mac order to the format alsalib will want.
  */
-static void
-swizzle_alsa_channels(_THIS, void *buffer, Uint32 bufferlen)
+static void swizzle_alsa_channels(_THIS, void *buffer, Uint32 bufferlen)
 {
     switch (this->spec.channels) {
-        #define CHANSWIZ(chans) \
-        case chans: \
-            switch ((this->spec.format & (0xFF))) { \
-                case 8: swizzle_alsa_channels_##chans##_Uint8(buffer, bufferlen); break; \
-                case 16: swizzle_alsa_channels_##chans##_Uint16(buffer, bufferlen); break; \
-                case 32: swizzle_alsa_channels_##chans##_Uint32(buffer, bufferlen); break; \
-                case 64: swizzle_alsa_channels_##chans##_Uint64(buffer, bufferlen); break; \
-                default: SDL_assert(!"unhandled bitsize"); break; \
-            } \
-            return;
+#define CHANSWIZ(chans)                                                \
+    case chans:                                                        \
+        switch ((this->spec.format & (0xFF))) {                        \
+        case 8:                                                        \
+            swizzle_alsa_channels_##chans##_Uint8(buffer, bufferlen);  \
+            break;                                                     \
+        case 16:                                                       \
+            swizzle_alsa_channels_##chans##_Uint16(buffer, bufferlen); \
+            break;                                                     \
+        case 32:                                                       \
+            swizzle_alsa_channels_##chans##_Uint32(buffer, bufferlen); \
+            break;                                                     \
+        case 64:                                                       \
+            swizzle_alsa_channels_##chans##_Uint64(buffer, bufferlen); \
+            break;                                                     \
+        default:                                                       \
+            SDL_assert(!"unhandled bitsize");                          \
+            break;                                                     \
+        }                                                              \
+        return;
 
         CHANSWIZ(6);
         CHANSWIZ(8);
-        #undef CHANSWIZ
-        default: break;
+#undef CHANSWIZ
+    default:
+        break;
     }
 }
 
 #ifdef SND_CHMAP_API_VERSION
 /* Some devices have the right channel map, no swizzling necessary */
-static void
-no_swizzle(_THIS, void *buffer, Uint32 bufferlen)
+static void no_swizzle(_THIS, void *buffer, Uint32 bufferlen)
 {
 }
 #endif /* SND_CHMAP_API_VERSION */
 
-
-static void
-ALSA_PlayDevice(_THIS)
+static void ALSA_PlayDevice(_THIS)
 {
-    const Uint8 *sample_buf = (const Uint8 *) this->hidden->mixbuf;
+    const Uint8 *sample_buf = (const Uint8 *)this->hidden->mixbuf;
     const int frame_size = ((SDL_AUDIO_BITSIZE(this->spec.format)) / 8) *
-                                this->spec.channels;
-    snd_pcm_uframes_t frames_left = ((snd_pcm_uframes_t) this->spec.samples);
+                           this->spec.channels;
+    snd_pcm_uframes_t frames_left = ((snd_pcm_uframes_t)this->spec.samples);
 
     this->hidden->swizzle_func(this, this->hidden->mixbuf, frames_left);
 
-    while ( frames_left > 0 && SDL_AtomicGet(&this->enabled) ) {
+    while (frames_left > 0 && SDL_AtomicGet(&this->enabled)) {
         int status = ALSA_snd_pcm_writei(this->hidden->pcm_handle,
                                          sample_buf, frames_left);
 
@@ -410,29 +394,27 @@ ALSA_PlayDevice(_THIS)
     }
 }
 
-static Uint8 *
-ALSA_GetDeviceBuf(_THIS)
+static Uint8 *ALSA_GetDeviceBuf(_THIS)
 {
     return this->hidden->mixbuf;
 }
 
-static int
-ALSA_CaptureFromDevice(_THIS, void *buffer, int buflen)
+static int ALSA_CaptureFromDevice(_THIS, void *buffer, int buflen)
 {
-    Uint8 *sample_buf = (Uint8 *) buffer;
+    Uint8 *sample_buf = (Uint8 *)buffer;
     const int frame_size = ((SDL_AUDIO_BITSIZE(this->spec.format)) / 8) *
-                                this->spec.channels;
+                           this->spec.channels;
     const int total_frames = buflen / frame_size;
     snd_pcm_uframes_t frames_left = total_frames;
     snd_pcm_uframes_t wait_time = frame_size / 2;
 
     SDL_assert((buflen % frame_size) == 0);
 
-    while ( frames_left > 0 && SDL_AtomicGet(&this->enabled) ) {
+    while (frames_left > 0 && SDL_AtomicGet(&this->enabled)) {
         int status;
 
         status = ALSA_snd_pcm_readi(this->hidden->pcm_handle,
-                                        sample_buf, frames_left);
+                                    sample_buf, frames_left);
 
         if (status == -EAGAIN) {
             ALSA_snd_pcm_wait(this->hidden->pcm_handle, wait_time);
@@ -459,14 +441,12 @@ ALSA_CaptureFromDevice(_THIS, void *buffer, int buflen)
     return (total_frames - frames_left) * frame_size;
 }
 
-static void
-ALSA_FlushCapture(_THIS)
+static void ALSA_FlushCapture(_THIS)
 {
     ALSA_snd_pcm_reset(this->hidden->pcm_handle);
 }
 
-static void
-ALSA_CloseDevice(_THIS)
+static void ALSA_CloseDevice(_THIS)
 {
     if (this->hidden->pcm_handle) {
         /* Wait for the submitted audio to drain
@@ -481,8 +461,7 @@ ALSA_CloseDevice(_THIS)
     SDL_free(this->hidden);
 }
 
-static int
-ALSA_set_buffer_size(_THIS, snd_pcm_hw_params_t *params)
+static int ALSA_set_buffer_size(_THIS, snd_pcm_hw_params_t *params)
 {
     int status;
     snd_pcm_hw_params_t *hwparams;
@@ -496,49 +475,48 @@ ALSA_set_buffer_size(_THIS, snd_pcm_hw_params_t *params)
     /* Attempt to match the period size to the requested buffer size */
     persize = this->spec.samples;
     status = ALSA_snd_pcm_hw_params_set_period_size_near(
-                this->hidden->pcm_handle, hwparams, &persize, NULL);
-    if ( status < 0 ) {
+        this->hidden->pcm_handle, hwparams, &persize, NULL);
+    if (status < 0) {
         return -1;
     }
 
     /* Need to at least double buffer */
     periods = 2;
     status = ALSA_snd_pcm_hw_params_set_periods_min(
-                this->hidden->pcm_handle, hwparams, &periods, NULL);
-    if ( status < 0 ) {
+        this->hidden->pcm_handle, hwparams, &periods, NULL);
+    if (status < 0) {
         return -1;
     }
 
     status = ALSA_snd_pcm_hw_params_set_periods_first(
-                this->hidden->pcm_handle, hwparams, &periods, NULL);
-    if ( status < 0 ) {
+        this->hidden->pcm_handle, hwparams, &periods, NULL);
+    if (status < 0) {
         return -1;
     }
 
     /* "set" the hardware with the desired parameters */
     status = ALSA_snd_pcm_hw_params(this->hidden->pcm_handle, hwparams);
-    if ( status < 0 ) {
+    if (status < 0) {
         return -1;
     }
 
     this->spec.samples = persize;
 
     /* This is useful for debugging */
-    if ( SDL_getenv("SDL_AUDIO_ALSA_DEBUG") ) {
+    if (SDL_getenv("SDL_AUDIO_ALSA_DEBUG")) {
         snd_pcm_uframes_t bufsize;
 
         ALSA_snd_pcm_hw_params_get_buffer_size(hwparams, &bufsize);
 
         fprintf(stderr,
-            "ALSA: period size = %ld, periods = %u, buffer size = %lu\n",
-            persize, periods, bufsize);
+                "ALSA: period size = %ld, periods = %u, buffer size = %lu\n",
+                persize, periods, bufsize);
     }
 
     return 0;
 }
 
-static int
-ALSA_OpenDevice(_THIS, const char *devname)
+static int ALSA_OpenDevice(_THIS, const char *devname)
 {
     int status = 0;
     SDL_bool iscapture = this->iscapture;
@@ -565,9 +543,9 @@ ALSA_OpenDevice(_THIS, const char *devname)
     /* Open the audio device */
     /* Name of device should depend on # channels in spec */
     status = ALSA_snd_pcm_open(&pcm_handle,
-                get_audio_device(this->handle, this->spec.channels),
-                iscapture ? SND_PCM_STREAM_CAPTURE : SND_PCM_STREAM_PLAYBACK,
-                SND_PCM_NONBLOCK);
+                               get_audio_device(this->handle, this->spec.channels),
+                               iscapture ? SND_PCM_STREAM_CAPTURE : SND_PCM_STREAM_PLAYBACK,
+                               SND_PCM_NONBLOCK);
 
     if (status < 0) {
         return SDL_SetError("ALSA: Couldn't open audio device: %s", ALSA_snd_strerror(status));
@@ -704,18 +682,18 @@ ALSA_OpenDevice(_THIS, const char *devname)
     /* Allocate mixing buffer */
     if (!iscapture) {
         this->hidden->mixlen = this->spec.size;
-        this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
+        this->hidden->mixbuf = (Uint8 *)SDL_malloc(this->hidden->mixlen);
         if (this->hidden->mixbuf == NULL) {
             return SDL_OutOfMemory();
         }
         SDL_memset(this->hidden->mixbuf, this->spec.silence, this->hidden->mixlen);
     }
 
-    #if !SDL_ALSA_NON_BLOCKING
+#if !SDL_ALSA_NON_BLOCKING
     if (!iscapture) {
         ALSA_snd_pcm_nonblock(pcm_handle, 0);
     }
-    #endif
+#endif
 
     /* We're ready to rock and roll. :-) */
     return 0;
@@ -728,10 +706,9 @@ typedef struct ALSA_Device
     struct ALSA_Device *next;
 } ALSA_Device;
 
-static void
-add_device(const int iscapture, const char *name, void *hint, ALSA_Device **pSeen)
+static void add_device(const int iscapture, const char *name, void *hint, ALSA_Device **pSeen)
 {
-    ALSA_Device *dev = SDL_malloc(sizeof (ALSA_Device));
+    ALSA_Device *dev = SDL_malloc(sizeof(ALSA_Device));
     char *desc;
     char *handle = NULL;
     char *ptr;
@@ -751,7 +728,7 @@ add_device(const int iscapture, const char *name, void *hint, ALSA_Device **pSee
             return;
         }
     } else {
-        desc = (char *) name;
+        desc = (char *)name;
     }
 
     SDL_assert(name != NULL);
@@ -788,11 +765,9 @@ add_device(const int iscapture, const char *name, void *hint, ALSA_Device **pSee
     *pSeen = dev;
 }
 
-
 static ALSA_Device *hotplug_devices = NULL;
 
-static void
-ALSA_HotplugIteration(void)
+static void ALSA_HotplugIteration(void)
 {
     void **hints = NULL;
     ALSA_Device *dev;
@@ -807,7 +782,7 @@ ALSA_HotplugIteration(void)
         int bestmatch = 0xFFFF;
         size_t match_len = 0;
         int defaultdev = -1;
-        static const char * const prefixes[] = {
+        static const char *const prefixes[] = {
             "hw:", "sysdefault:", "default:", NULL
         };
 
@@ -850,7 +825,7 @@ ALSA_HotplugIteration(void)
 
             /* if we didn't find a device name prefix we like at all... */
             if ((match == NULL) && (defaultdev != i)) {
-                continue;  /* ...skip anything that isn't the default device. */
+                continue; /* ...skip anything that isn't the default device. */
             }
 
             name = ALSA_snd_device_name_get_hint(hints[i], "NAME");
@@ -876,7 +851,7 @@ ALSA_HotplugIteration(void)
                 prev = NULL;
                 for (dev = unseen; dev; dev = next) {
                     next = dev->next;
-                    if ( (SDL_strcmp(dev->name, name) == 0) && (((isinput) && dev->iscapture) || ((isoutput) && !dev->iscapture)) ) {
+                    if ((SDL_strcmp(dev->name, name) == 0) && (((isinput) && dev->iscapture) || ((isoutput) && !dev->iscapture))) {
                         if (prev) {
                             prev->next = next;
                         } else {
@@ -908,7 +883,7 @@ ALSA_HotplugIteration(void)
 
         ALSA_snd_device_name_free_hint(hints);
 
-        hotplug_devices = seen;   /* now we have a known-good list of attached devices. */
+        hotplug_devices = seen; /* now we have a known-good list of attached devices. */
 
         /* report anything still in unseen as removed. */
         for (dev = unseen; dev; dev = next) {
@@ -925,8 +900,7 @@ ALSA_HotplugIteration(void)
 static SDL_atomic_t ALSA_hotplug_shutdown;
 static SDL_Thread *ALSA_hotplug_thread;
 
-static int SDLCALL
-ALSA_HotplugThread(void *arg)
+static int SDLCALL ALSA_HotplugThread(void *arg)
 {
     SDL_SetThreadPriority(SDL_THREAD_PRIORITY_LOW);
 
@@ -937,17 +911,16 @@ ALSA_HotplugThread(void *arg)
             SDL_Delay(100);
         }
 
-        ALSA_HotplugIteration();  /* run the check. */
+        ALSA_HotplugIteration(); /* run the check. */
     }
 
     return 0;
 }
 #endif
 
-static void
-ALSA_DetectDevices(void)
+static void ALSA_DetectDevices(void)
 {
-    ALSA_HotplugIteration();  /* run once now before a thread continues to check. */
+    ALSA_HotplugIteration(); /* run once now before a thread continues to check. */
 
 #if SDL_ALSA_HOTPLUG_THREAD
     SDL_AtomicSet(&ALSA_hotplug_shutdown, 0);
@@ -956,8 +929,7 @@ ALSA_DetectDevices(void)
 #endif
 }
 
-static void
-ALSA_Deinitialize(void)
+static void ALSA_Deinitialize(void)
 {
     ALSA_Device *dev;
     ALSA_Device *next;
@@ -982,8 +954,7 @@ ALSA_Deinitialize(void)
     UnloadALSALibrary();
 }
 
-static SDL_bool
-ALSA_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool ALSA_Init(SDL_AudioDriverImpl *impl)
 {
     if (LoadALSALibrary() < 0) {
         return SDL_FALSE;
@@ -1003,10 +974,9 @@ ALSA_Init(SDL_AudioDriverImpl * impl)
     impl->HasCaptureSupport = SDL_TRUE;
     impl->SupportsNonPow2Samples = SDL_TRUE;
 
-    return SDL_TRUE;   /* this audio target is available. */
+    return SDL_TRUE; /* this audio target is available. */
 }
 
-
 AudioBootStrap ALSA_bootstrap = {
     "alsa", "ALSA PCM audio", ALSA_Init, SDL_FALSE
 };

src/audio/alsa/SDL_alsa_audio.h

@@ -28,7 +28,7 @@
 #include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the audio functions */
-#define _THIS   SDL_AudioDevice *this
+#define _THIS SDL_AudioDevice *this
 
 struct SDL_PrivateAudioData
 {

src/audio/android/SDL_androidaudio.c

@@ -31,11 +31,10 @@
 
 #include <android/log.h>
 
-static SDL_AudioDevice* audioDevice = NULL;
-static SDL_AudioDevice* captureDevice = NULL;
+static SDL_AudioDevice *audioDevice = NULL;
+static SDL_AudioDevice *captureDevice = NULL;
 
-static int
-ANDROIDAUDIO_OpenDevice(_THIS, const char *devname)
+static int ANDROIDAUDIO_OpenDevice(_THIS, const char *devname)
 {
     SDL_AudioFormat test_format;
     SDL_bool iscapture = this->iscapture;
@@ -49,7 +48,7 @@ ANDROIDAUDIO_OpenDevice(_THIS, const char *devname)
         audioDevice = this;
     }
 
-    this->hidden = (struct SDL_PrivateAudioData *) SDL_calloc(1, (sizeof *this->hidden));
+    this->hidden = (struct SDL_PrivateAudioData *)SDL_calloc(1, (sizeof *this->hidden));
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
@@ -77,32 +76,27 @@ ANDROIDAUDIO_OpenDevice(_THIS, const char *devname)
     return 0;
 }
 
-static void
-ANDROIDAUDIO_PlayDevice(_THIS)
+static void ANDROIDAUDIO_PlayDevice(_THIS)
 {
     Android_JNI_WriteAudioBuffer();
 }
 
-static Uint8 *
-ANDROIDAUDIO_GetDeviceBuf(_THIS)
+static Uint8 *ANDROIDAUDIO_GetDeviceBuf(_THIS)
 {
     return Android_JNI_GetAudioBuffer();
 }
 
-static int
-ANDROIDAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
+static int ANDROIDAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
 {
     return Android_JNI_CaptureAudioBuffer(buffer, buflen);
 }
 
-static void
-ANDROIDAUDIO_FlushCapture(_THIS)
+static void ANDROIDAUDIO_FlushCapture(_THIS)
 {
     Android_JNI_FlushCapturedAudio();
 }
 
-static void
-ANDROIDAUDIO_CloseDevice(_THIS)
+static void ANDROIDAUDIO_CloseDevice(_THIS)
 {
     /* At this point SDL_CloseAudioDevice via close_audio_device took care of terminating the audio thread
        so it's safe to terminate the Java side buffer and AudioTrack
@@ -118,8 +112,7 @@ ANDROIDAUDIO_CloseDevice(_THIS)
     SDL_free(this->hidden);
 }
 
-static SDL_bool
-ANDROIDAUDIO_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool ANDROIDAUDIO_Init(SDL_AudioDriverImpl *impl)
 {
     /* Set the function pointers */
     impl->OpenDevice = ANDROIDAUDIO_OpenDevice;
@@ -134,7 +127,7 @@ ANDROIDAUDIO_Init(SDL_AudioDriverImpl * impl)
     impl->OnlyHasDefaultOutputDevice = SDL_TRUE;
     impl->OnlyHasDefaultCaptureDevice = SDL_TRUE;
 
-    return SDL_TRUE;   /* this audio target is available. */
+    return SDL_TRUE; /* this audio target is available. */
 }
 
 AudioBootStrap ANDROIDAUDIO_bootstrap = {
@@ -147,7 +140,7 @@ void ANDROIDAUDIO_PauseDevices(void)
     /* TODO: Handle multiple devices? */
     struct SDL_PrivateAudioData *private;
     if (audioDevice != NULL && audioDevice->hidden != NULL) {
-        private = (struct SDL_PrivateAudioData *) audioDevice->hidden;
+        private = (struct SDL_PrivateAudioData *)audioDevice->hidden;
         if (SDL_AtomicGet(&audioDevice->paused)) {
             /* The device is already paused, leave it alone */
             private->resume = SDL_FALSE;
@@ -159,7 +152,7 @@ void ANDROIDAUDIO_PauseDevices(void)
     }
 
     if (captureDevice != NULL && captureDevice->hidden != NULL) {
-        private = (struct SDL_PrivateAudioData *) captureDevice->hidden;
+        private = (struct SDL_PrivateAudioData *)captureDevice->hidden;
         if (SDL_AtomicGet(&captureDevice->paused)) {
             /* The device is already paused, leave it alone */
             private->resume = SDL_FALSE;
@@ -177,7 +170,7 @@ void ANDROIDAUDIO_ResumeDevices(void)
     /* TODO: Handle multiple devices? */
     struct SDL_PrivateAudioData *private;
     if (audioDevice != NULL && audioDevice->hidden != NULL) {
-        private = (struct SDL_PrivateAudioData *) audioDevice->hidden;
+        private = (struct SDL_PrivateAudioData *)audioDevice->hidden;
         if (private->resume) {
             SDL_AtomicSet(&audioDevice->paused, 0);
             private->resume = SDL_FALSE;
@@ -186,7 +179,7 @@ void ANDROIDAUDIO_ResumeDevices(void)
     }
 
     if (captureDevice != NULL && captureDevice->hidden != NULL) {
-        private = (struct SDL_PrivateAudioData *) captureDevice->hidden;
+        private = (struct SDL_PrivateAudioData *)captureDevice->hidden;
         if (private->resume) {
             SDL_AtomicSet(&captureDevice->paused, 0);
             private->resume = SDL_FALSE;
@@ -195,7 +188,7 @@ void ANDROIDAUDIO_ResumeDevices(void)
     }
 }
 
-#else 
+#else
 
 void ANDROIDAUDIO_ResumeDevices(void) {}
 void ANDROIDAUDIO_PauseDevices(void) {}
@@ -203,4 +196,3 @@ void ANDROIDAUDIO_PauseDevices(void) {}
 #endif /* SDL_AUDIO_DRIVER_ANDROID */
 
 /* vi: set ts=4 sw=4 expandtab: */
-

src/audio/android/SDL_androidaudio.h

@@ -26,7 +26,7 @@
 #include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the audio functions */
-#define _THIS   SDL_AudioDevice *this
+#define _THIS SDL_AudioDevice *this
 
 struct SDL_PrivateAudioData
 {

src/audio/coreaudio/SDL_coreaudio.h

@@ -48,7 +48,7 @@
 #endif
 
 /* Hidden "this" pointer for the audio functions */
-#define _THIS   SDL_AudioDevice *this
+#define _THIS SDL_AudioDevice *this
 
 struct SDL_PrivateAudioData
 {

src/audio/coreaudio/SDL_coreaudio.m

@@ -32,21 +32,20 @@
 #define DEBUG_COREAUDIO 0
 
 #if DEBUG_COREAUDIO
-    #define CHECK_RESULT(msg) \
-        if (result != noErr) { \
-            printf("COREAUDIO: Got error %d from '%s'!\n", (int) result, msg); \
-            SDL_SetError("CoreAudio error (%s): %d", msg, (int) result); \
-            return 0; \
-        }
+#define CHECK_RESULT(msg)                                                 \
+    if (result != noErr) {                                                \
+        printf("COREAUDIO: Got error %d from '%s'!\n", (int)result, msg); \
+        SDL_SetError("CoreAudio error (%s): %d", msg, (int)result);       \
+        return 0;                                                         \
+    }
 #else
-    #define CHECK_RESULT(msg) \
-        if (result != noErr) { \
-            SDL_SetError("CoreAudio error (%s): %d", msg, (int) result); \
-            return 0; \
-        }
+#define CHECK_RESULT(msg)                                           \
+    if (result != noErr) {                                          \
+        SDL_SetError("CoreAudio error (%s): %d", msg, (int)result); \
+        return 0;                                                   \
+    }
 #endif
 
-
 #if MACOSX_COREAUDIO
 static const AudioObjectPropertyAddress devlist_address = {
     kAudioHardwarePropertyDevices,
@@ -66,10 +65,9 @@ typedef struct AudioDeviceList
 static AudioDeviceList *output_devs = NULL;
 static AudioDeviceList *capture_devs = NULL;
 
-static SDL_bool
-add_to_internal_dev_list(const int iscapture, AudioDeviceID devId)
+static SDL_bool add_to_internal_dev_list(const int iscapture, AudioDeviceID devId)
 {
-    AudioDeviceList *item = (AudioDeviceList *) SDL_malloc(sizeof (AudioDeviceList));
+    AudioDeviceList *item = (AudioDeviceList *)SDL_malloc(sizeof(AudioDeviceList));
     if (item == NULL) {
         return SDL_FALSE;
     }
@@ -85,16 +83,14 @@ add_to_internal_dev_list(const int iscapture, AudioDeviceID devId)
     return SDL_TRUE;
 }
 
-static void
-addToDevList(const char *name, SDL_AudioSpec *spec, const int iscapture, AudioDeviceID devId, void *data)
+static void addToDevList(const char *name, SDL_AudioSpec *spec, const int iscapture, AudioDeviceID devId, void *data)
 {
     if (add_to_internal_dev_list(iscapture, devId)) {
-        SDL_AddAudioDevice(iscapture, name, spec, (void *) ((size_t) devId));
+        SDL_AddAudioDevice(iscapture, name, spec, (void *)((size_t)devId));
     }
 }
 
-static void
-build_device_list(int iscapture, addDevFn addfn, void *addfndata)
+static void build_device_list(int iscapture, addDevFn addfn, void *addfndata)
 {
     OSStatus result = noErr;
     UInt32 size = 0;
@@ -107,7 +103,7 @@ build_device_list(int iscapture, addDevFn addfn, void *addfndata)
     if (result != kAudioHardwareNoError)
         return;
 
-    devs = (AudioDeviceID *) alloca(size);
+    devs = (AudioDeviceID *)alloca(size);
     if (devs == NULL)
         return;
 
@@ -116,7 +112,7 @@ build_device_list(int iscapture, addDevFn addfn, void *addfndata)
     if (result != kAudioHardwareNoError)
         return;
 
-    max = size / sizeof (AudioDeviceID);
+    max = size / sizeof(AudioDeviceID);
     for (i = 0; i < max; i++) {
         CFStringRef cfstr = NULL;
         char *ptr = NULL;
@@ -146,7 +142,7 @@ build_device_list(int iscapture, addDevFn addfn, void *addfndata)
         if (result != noErr)
             continue;
 
-        buflist = (AudioBufferList *) SDL_malloc(size);
+        buflist = (AudioBufferList *)SDL_malloc(size);
         if (buflist == NULL)
             continue;
 
@@ -166,13 +162,13 @@ build_device_list(int iscapture, addDevFn addfn, void *addfndata)
         if (spec.channels == 0)
             continue;
 
-        size = sizeof (sampleRate);
+        size = sizeof(sampleRate);
         result = AudioObjectGetPropertyData(dev, &freqaddr, 0, NULL, &size, &sampleRate);
         if (result == noErr) {
-            spec.freq = (int) sampleRate;
+            spec.freq = (int)sampleRate;
         }
 
-        size = sizeof (CFStringRef);
+        size = sizeof(CFStringRef);
         result = AudioObjectGetPropertyData(dev, &nameaddr, 0, NULL, &size, &cfstr);
         if (result != kAudioHardwareNoError)
             continue;
@@ -180,10 +176,9 @@ build_device_list(int iscapture, addDevFn addfn, void *addfndata)
         len = CFStringGetMaximumSizeForEncoding(CFStringGetLength(cfstr),
                                                 kCFStringEncodingUTF8);
 
-        ptr = (char *) SDL_malloc(len + 1);
+        ptr = (char *)SDL_malloc(len + 1);
         usable = ((ptr != NULL) &&
-                  (CFStringGetCString
-                   (cfstr, ptr, len + 1, kCFStringEncodingUTF8)));
+                  (CFStringGetCString(cfstr, ptr, len + 1, kCFStringEncodingUTF8)));
 
         CFRelease(cfstr);
 
@@ -202,16 +197,15 @@ build_device_list(int iscapture, addDevFn addfn, void *addfndata)
 #if DEBUG_COREAUDIO
             printf("COREAUDIO: Found %s device #%d: '%s' (devid %d)\n",
                    ((iscapture) ? "capture" : "output"),
-                   (int) i, ptr, (int) dev);
+                   (int)i, ptr, (int)dev);
 #endif
             addfn(ptr, &spec, iscapture, dev, addfndata);
         }
-        SDL_free(ptr);  /* addfn() would have copied the string. */
+        SDL_free(ptr); /* addfn() would have copied the string. */
     }
 }
 
-static void
-free_audio_device_list(AudioDeviceList **list)
+static void free_audio_device_list(AudioDeviceList **list)
 {
     AudioDeviceList *item = *list;
     while (item) {
@@ -222,17 +216,15 @@ free_audio_device_list(AudioDeviceList **list)
     *list = NULL;
 }
 
-static void
-COREAUDIO_DetectDevices(void)
+static void COREAUDIO_DetectDevices(void)
 {
     build_device_list(SDL_TRUE, addToDevList, NULL);
     build_device_list(SDL_FALSE, addToDevList, NULL);
 }
 
-static void
-build_device_change_list(const char *name, SDL_AudioSpec *spec, const int iscapture, AudioDeviceID devId, void *data)
+static void build_device_change_list(const char *name, SDL_AudioSpec *spec, const int iscapture, AudioDeviceID devId, void *data)
 {
-    AudioDeviceList **list = (AudioDeviceList **) data;
+    AudioDeviceList **list = (AudioDeviceList **)data;
     AudioDeviceList *item;
     for (item = *list; item != NULL; item = item->next) {
         if (item->devid == devId) {
@@ -241,12 +233,11 @@ build_device_change_list(const char *name, SDL_AudioSpec *spec, const int iscapt
         }
     }
 
-    add_to_internal_dev_list(iscapture, devId);  /* new device, add it. */
-    SDL_AddAudioDevice(iscapture, name, spec, (void *) ((size_t) devId));
+    add_to_internal_dev_list(iscapture, devId); /* new device, add it. */
+    SDL_AddAudioDevice(iscapture, name, spec, (void *)((size_t)devId));
 }
 
-static void
-reprocess_device_list(const int iscapture, AudioDeviceList **list)
+static void reprocess_device_list(const int iscapture, AudioDeviceList **list)
 {
     AudioDeviceList *item;
     AudioDeviceList *prev = NULL;
@@ -263,7 +254,7 @@ reprocess_device_list(const int iscapture, AudioDeviceList **list)
         if (item->alive) {
             prev = item;
         } else {
-            SDL_RemoveAudioDevice(iscapture, (void *) ((size_t) item->devid));
+            SDL_RemoveAudioDevice(iscapture, (void *)((size_t)item->devid));
             if (prev) {
                 prev->next = item->next;
             } else {
@@ -276,8 +267,7 @@ reprocess_device_list(const int iscapture, AudioDeviceList **list)
 }
 
 /* this is called when the system's list of available audio devices changes. */
-static OSStatus
-device_list_changed(AudioObjectID systemObj, UInt32 num_addr, const AudioObjectPropertyAddress *addrs, void *data)
+static OSStatus device_list_changed(AudioObjectID systemObj, UInt32 num_addr, const AudioObjectPropertyAddress *addrs, void *data)
 {
     reprocess_device_list(SDL_TRUE, &capture_devs);
     reprocess_device_list(SDL_FALSE, &output_devs);
@@ -285,7 +275,6 @@ device_list_changed(AudioObjectID systemObj, UInt32 num_addr, const AudioObjectP
 }
 #endif
 
-
 static int open_playback_devices;
 static int open_capture_devices;
 static int num_open_devices;
@@ -337,16 +326,14 @@ static void interruption_begin(_THIS)
 
 static void interruption_end(_THIS)
 {
-    if (this != NULL && this->hidden != NULL && this->hidden->audioQueue != NULL
-    && this->hidden->interrupted
-    && AudioQueueStart(this->hidden->audioQueue, NULL) == AVAudioSessionErrorCodeNone) {
+    if (this != NULL && this->hidden != NULL && this->hidden->audioQueue != NULL && this->hidden->interrupted && AudioQueueStart(this->hidden->audioQueue, NULL) == AVAudioSessionErrorCodeNone) {
         this->hidden->interrupted = SDL_FALSE;
     }
 }
 
 @interface SDLInterruptionListener : NSObject
 
-@property (nonatomic, assign) SDL_AudioDevice *device;
+@property(nonatomic, assign) SDL_AudioDevice *device;
 
 @end
 
@@ -354,7 +341,7 @@ static void interruption_end(_THIS)
 
 - (void)audioSessionInterruption:(NSNotification *)note
 {
-    @synchronized (self) {
+    @synchronized(self) {
         NSNumber *type = note.userInfo[AVAudioSessionInterruptionTypeKey];
         if (type.unsignedIntegerValue == AVAudioSessionInterruptionTypeBegan) {
             interruption_begin(self.device);
@@ -366,7 +353,7 @@ static void interruption_end(_THIS)
 
 - (void)applicationBecameActive:(NSNotification *)note
 {
-    @synchronized (self) {
+    @synchronized(self) {
         interruption_end(self.device);
     }
 }
@@ -502,9 +489,9 @@ static BOOL update_audio_session(_THIS, SDL_bool open, SDL_bool allow_playandrec
             this->hidden->interruption_listener = CFBridgingRetain(listener);
         } else {
             SDLInterruptionListener *listener = nil;
-            listener = (SDLInterruptionListener *) CFBridgingRelease(this->hidden->interruption_listener);
+            listener = (SDLInterruptionListener *)CFBridgingRelease(this->hidden->interruption_listener);
             [center removeObserver:listener];
-            @synchronized (listener) {
+            @synchronized(listener) {
                 listener.device = NULL;
             }
         }
@@ -514,25 +501,23 @@ static BOOL update_audio_session(_THIS, SDL_bool open, SDL_bool allow_playandrec
 }
 #endif
 
-
 /* The AudioQueue callback */
-static void
-outputCallback(void *inUserData, AudioQueueRef inAQ, AudioQueueBufferRef inBuffer)
+static void outputCallback(void *inUserData, AudioQueueRef inAQ, AudioQueueBufferRef inBuffer)
 {
-    SDL_AudioDevice *this = (SDL_AudioDevice *) inUserData;
+    SDL_AudioDevice *this = (SDL_AudioDevice *)inUserData;
 
     /* This flag is set before this->mixer_lock is destroyed during
        shutdown, so check it before grabbing the mutex, and then check it
        again _after_ in case we blocked waiting on the lock. */
     if (SDL_AtomicGet(&this->shutdown)) {
-        return;  /* don't do anything, since we don't even want to enqueue this buffer again. */
+        return; /* don't do anything, since we don't even want to enqueue this buffer again. */
     }
 
     SDL_LockMutex(this->mixer_lock);
 
     if (SDL_AtomicGet(&this->shutdown)) {
         SDL_UnlockMutex(this->mixer_lock);
-        return;  /* don't do anything, since we don't even want to enqueue this buffer again. */
+        return; /* don't do anything, since we don't even want to enqueue this buffer again. */
     }
 
     if (!SDL_AtomicGet(&this->enabled) || SDL_AtomicGet(&this->paused)) {
@@ -540,7 +525,7 @@ outputCallback(void *inUserData, AudioQueueRef inAQ, AudioQueueBufferRef inBuffe
         SDL_memset(inBuffer->mAudioData, this->spec.silence, inBuffer->mAudioDataBytesCapacity);
     } else if (this->stream) {
         UInt32 remaining = inBuffer->mAudioDataBytesCapacity;
-        Uint8 *ptr = (Uint8 *) inBuffer->mAudioData;
+        Uint8 *ptr = (Uint8 *)inBuffer->mAudioData;
 
         while (remaining > 0) {
             if (SDL_AudioStreamAvailable(this->stream) == 0) {
@@ -566,14 +551,14 @@ outputCallback(void *inUserData, AudioQueueRef inAQ, AudioQueueBufferRef inBuffe
         }
     } else {
         UInt32 remaining = inBuffer->mAudioDataBytesCapacity;
-        Uint8 *ptr = (Uint8 *) inBuffer->mAudioData;
+        Uint8 *ptr = (Uint8 *)inBuffer->mAudioData;
 
         while (remaining > 0) {
             UInt32 len;
             if (this->hidden->bufferOffset >= this->hidden->bufferSize) {
                 /* Generate the data */
                 (*this->callbackspec.callback)(this->callbackspec.userdata,
-                            this->hidden->buffer, this->hidden->bufferSize);
+                                               this->hidden->buffer, this->hidden->bufferSize);
                 this->hidden->bufferOffset = 0;
             }
 
@@ -581,8 +566,7 @@ outputCallback(void *inUserData, AudioQueueRef inAQ, AudioQueueBufferRef inBuffe
             if (len > remaining) {
                 len = remaining;
             }
-            SDL_memcpy(ptr, (char *)this->hidden->buffer +
-                       this->hidden->bufferOffset, len);
+            SDL_memcpy(ptr, (char *)this->hidden->buffer + this->hidden->bufferOffset, len);
             ptr = ptr + len;
             remaining -= len;
             this->hidden->bufferOffset += len;
@@ -596,20 +580,19 @@ outputCallback(void *inUserData, AudioQueueRef inAQ, AudioQueueBufferRef inBuffe
     SDL_UnlockMutex(this->mixer_lock);
 }
 
-static void
-inputCallback(void *inUserData, AudioQueueRef inAQ, AudioQueueBufferRef inBuffer,
-              const AudioTimeStamp *inStartTime, UInt32 inNumberPacketDescriptions,
-              const AudioStreamPacketDescription *inPacketDescs)
+static void inputCallback(void *inUserData, AudioQueueRef inAQ, AudioQueueBufferRef inBuffer,
+                          const AudioTimeStamp *inStartTime, UInt32 inNumberPacketDescriptions,
+                          const AudioStreamPacketDescription *inPacketDescs)
 {
-    SDL_AudioDevice *this = (SDL_AudioDevice *) inUserData;
+    SDL_AudioDevice *this = (SDL_AudioDevice *)inUserData;
 
     if (SDL_AtomicGet(&this->shutdown)) {
-        return;  /* don't do anything. */
+        return; /* don't do anything. */
     }
 
     /* ignore unless we're active. */
     if (!SDL_AtomicGet(&this->paused) && SDL_AtomicGet(&this->enabled)) {
-        const Uint8 *ptr = (const Uint8 *) inBuffer->mAudioData;
+        const Uint8 *ptr = (const Uint8 *)inBuffer->mAudioData;
         UInt32 remaining = inBuffer->mAudioDataByteSize;
         while (remaining > 0) {
             UInt32 len = this->hidden->bufferSize - this->hidden->bufferOffset;
@@ -634,35 +617,32 @@ inputCallback(void *inUserData, AudioQueueRef inAQ, AudioQueueBufferRef inBuffer
     AudioQueueEnqueueBuffer(this->hidden->audioQueue, inBuffer, 0, NULL);
 }
 
-
 #if MACOSX_COREAUDIO
-static const AudioObjectPropertyAddress alive_address =
-{
+static const AudioObjectPropertyAddress alive_address = {
     kAudioDevicePropertyDeviceIsAlive,
     kAudioObjectPropertyScopeGlobal,
     kAudioObjectPropertyElementMain
 };
 
-static OSStatus
-device_unplugged(AudioObjectID devid, UInt32 num_addr, const AudioObjectPropertyAddress *addrs, void *data)
+static OSStatus device_unplugged(AudioObjectID devid, UInt32 num_addr, const AudioObjectPropertyAddress *addrs, void *data)
 {
-    SDL_AudioDevice *this = (SDL_AudioDevice *) data;
+    SDL_AudioDevice *this = (SDL_AudioDevice *)data;
     SDL_bool dead = SDL_FALSE;
     UInt32 isAlive = 1;
-    UInt32 size = sizeof (isAlive);
+    UInt32 size = sizeof(isAlive);
     OSStatus error;
 
     if (!SDL_AtomicGet(&this->enabled)) {
-        return 0;  /* already known to be dead. */
+        return 0; /* already known to be dead. */
     }
 
     error = AudioObjectGetPropertyData(this->hidden->deviceID, &alive_address,
                                        0, NULL, &size, &isAlive);
 
     if (error == kAudioHardwareBadDeviceError) {
-        dead = SDL_TRUE;  /* device was unplugged. */
+        dead = SDL_TRUE; /* device was unplugged. */
     } else if ((error == kAudioHardwareNoError) && (!isAlive)) {
-        dead = SDL_TRUE;  /* device died in some other way. */
+        dead = SDL_TRUE; /* device died in some other way. */
     }
 
     if (dead) {
@@ -673,20 +653,18 @@ device_unplugged(AudioObjectID devid, UInt32 num_addr, const AudioObjectProperty
 }
 
 /* macOS calls this when the default device changed (if we have a default device open). */
-static OSStatus
-default_device_changed(AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress *inAddresses, void *inUserData)
+static OSStatus default_device_changed(AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress *inAddresses, void *inUserData)
 {
-    SDL_AudioDevice *this = (SDL_AudioDevice *) inUserData;
-    #if DEBUG_COREAUDIO
+    SDL_AudioDevice *this = (SDL_AudioDevice *)inUserData;
+#if DEBUG_COREAUDIO
     printf("COREAUDIO: default device changed for SDL audio device %p!\n", this);
-    #endif
-    SDL_AtomicSet(&this->hidden->device_change_flag, 1);  /* let the audioqueue thread pick up on this when safe to do so. */
+#endif
+    SDL_AtomicSet(&this->hidden->device_change_flag, 1); /* let the audioqueue thread pick up on this when safe to do so. */
     return noErr;
 }
 #endif
 
-static void
-COREAUDIO_CloseDevice(_THIS)
+static void COREAUDIO_CloseDevice(_THIS)
 {
     const SDL_bool iscapture = this->iscapture;
     int i;
@@ -694,7 +672,7 @@ COREAUDIO_CloseDevice(_THIS)
 /* !!! FIXME: what does iOS do when a bluetooth audio device vanishes? Headphones unplugged? */
 /* !!! FIXME: (we only do a "default" device on iOS right now...can we do more?) */
 #if MACOSX_COREAUDIO
-    if (this->handle != NULL) {  /* we don't register this listener for default devices. */
+    if (this->handle != NULL) { /* we don't register this listener for default devices. */
         AudioObjectRemovePropertyListener(this->hidden->deviceID, &alive_address, device_unplugged, this);
     }
 #endif
@@ -708,7 +686,7 @@ COREAUDIO_CloseDevice(_THIS)
     }
 
     if (this->hidden->thread) {
-        SDL_assert(SDL_AtomicGet(&this->shutdown) != 0);  /* should have been set by SDL_audio.c */
+        SDL_assert(SDL_AtomicGet(&this->shutdown) != 0); /* should have been set by SDL_audio.c */
         SDL_WaitThread(this->hidden->thread, NULL);
     }
 
@@ -726,7 +704,7 @@ COREAUDIO_CloseDevice(_THIS)
         if (open_devices[i] == this) {
             --num_open_devices;
             if (i < num_open_devices) {
-                SDL_memmove(&open_devices[i], &open_devices[i+1], sizeof(open_devices[i])*(num_open_devices - i));
+                SDL_memmove(&open_devices[i], &open_devices[i + 1], sizeof(open_devices[i]) * (num_open_devices - i));
             }
             break;
         }
@@ -748,12 +726,11 @@ COREAUDIO_CloseDevice(_THIS)
 }
 
 #if MACOSX_COREAUDIO
-static int
-prepare_device(_THIS)
+static int prepare_device(_THIS)
 {
     void *handle = this->handle;
     SDL_bool iscapture = this->iscapture;
-    AudioDeviceID devid = (AudioDeviceID) ((size_t) handle);
+    AudioDeviceID devid = (AudioDeviceID)((size_t)handle);
     OSStatus result = noErr;
     UInt32 size = 0;
     UInt32 alive = 0;
@@ -766,23 +743,20 @@ prepare_device(_THIS)
     };
 
     if (handle == NULL) {
-        size = sizeof (AudioDeviceID);
+        size = sizeof(AudioDeviceID);
         addr.mSelector =
-            ((iscapture) ? kAudioHardwarePropertyDefaultInputDevice :
-            kAudioHardwarePropertyDefaultOutputDevice);
+            ((iscapture) ? kAudioHardwarePropertyDefaultInputDevice : kAudioHardwarePropertyDefaultOutputDevice);
         result = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr,
                                             0, NULL, &size, &devid);
         CHECK_RESULT("AudioHardwareGetProperty (default device)");
     }
 
     addr.mSelector = kAudioDevicePropertyDeviceIsAlive;
-    addr.mScope = iscapture ? kAudioDevicePropertyScopeInput :
-                    kAudioDevicePropertyScopeOutput;
+    addr.mScope = iscapture ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput;
 
-    size = sizeof (alive);
+    size = sizeof(alive);
     result = AudioObjectGetPropertyData(devid, &addr, 0, NULL, &size, &alive);
-    CHECK_RESULT
-        ("AudioDeviceGetProperty (kAudioDevicePropertyDeviceIsAlive)");
+    CHECK_RESULT("AudioDeviceGetProperty (kAudioDevicePropertyDeviceIsAlive)");
 
     if (!alive) {
         SDL_SetError("CoreAudio: requested device exists, but isn't alive.");
@@ -790,7 +764,7 @@ prepare_device(_THIS)
     }
 
     addr.mSelector = kAudioDevicePropertyHogMode;
-    size = sizeof (pid);
+    size = sizeof(pid);
     result = AudioObjectGetPropertyData(devid, &addr, 0, NULL, &size, &pid);
 
     /* some devices don't support this property, so errors are fine here. */
@@ -803,8 +777,7 @@ prepare_device(_THIS)
     return 1;
 }
 
-static int
-assign_device_to_audioqueue(_THIS)
+static int assign_device_to_audioqueue(_THIS)
 {
     const AudioObjectPropertyAddress prop = {
         kAudioDevicePropertyDeviceUID,
@@ -814,7 +787,7 @@ assign_device_to_audioqueue(_THIS)
 
     OSStatus result;
     CFStringRef devuid;
-    UInt32 devuidsize = sizeof (devuid);
+    UInt32 devuidsize = sizeof(devuid);
     result = AudioObjectGetPropertyData(this->hidden->deviceID, &prop, 0, NULL, &devuidsize, &devuid);
     CHECK_RESULT("AudioObjectGetPropertyData (kAudioDevicePropertyDeviceUID)");
     result = AudioQueueSetProperty(this->hidden->audioQueue, kAudioQueueProperty_CurrentDevice, &devuid, devuidsize);
@@ -824,8 +797,7 @@ assign_device_to_audioqueue(_THIS)
 }
 #endif
 
-static int
-prepare_audioqueue(_THIS)
+static int prepare_audioqueue(_THIS)
 {
     const AudioStreamBasicDescription *strdesc = &this->hidden->strdesc;
     const int iscapture = this->iscapture;
@@ -833,7 +805,8 @@ prepare_audioqueue(_THIS)
     int i, numAudioBuffers = 2;
     AudioChannelLayout layout;
     double MINIMUM_AUDIO_BUFFER_TIME_MS;
-    const double msecs = (this->spec.samples / ((double) this->spec.freq)) * 1000.0;;
+    const double msecs = (this->spec.samples / ((double)this->spec.freq)) * 1000.0;
+    ;
 
     SDL_assert(CFRunLoopGetCurrent() != NULL);
 
@@ -845,7 +818,7 @@ prepare_audioqueue(_THIS)
         CHECK_RESULT("AudioQueueNewOutput");
     }
 
-    #if MACOSX_COREAUDIO
+#if MACOSX_COREAUDIO
     if (!assign_device_to_audioqueue(this)) {
         return 0;
     }
@@ -859,7 +832,7 @@ prepare_audioqueue(_THIS)
         /* If this fails, oh well, we won't notice a device had an extraordinary event take place. */
         AudioObjectAddPropertyListener(this->hidden->deviceID, &alive_address, device_unplugged, this);
     }
-    #endif
+#endif
 
     /* Calculate the final parameters for this audio specification */
     SDL_CalculateAudioSpec(&this->spec);
@@ -916,12 +889,12 @@ prepare_audioqueue(_THIS)
         MINIMUM_AUDIO_BUFFER_TIME_MS = 40.0;
     }
 #endif
-    if (msecs < MINIMUM_AUDIO_BUFFER_TIME_MS) {  /* use more buffers if we have a VERY small sample set. */
+    if (msecs < MINIMUM_AUDIO_BUFFER_TIME_MS) { /* use more buffers if we have a VERY small sample set. */
         numAudioBuffers = ((int)SDL_ceil(MINIMUM_AUDIO_BUFFER_TIME_MS / msecs) * 2);
     }
 
     this->hidden->numAudioBuffers = numAudioBuffers;
-    this->hidden->audioBuffer = SDL_calloc(1, sizeof (AudioQueueBufferRef) * numAudioBuffers);
+    this->hidden->audioBuffer = SDL_calloc(1, sizeof(AudioQueueBufferRef) * numAudioBuffers);
     if (this->hidden->audioBuffer == NULL) {
         SDL_OutOfMemory();
         return 0;
@@ -948,24 +921,23 @@ prepare_audioqueue(_THIS)
     return 1;
 }
 
-static int
-audioqueue_thread(void *arg)
+static int audioqueue_thread(void *arg)
 {
-    SDL_AudioDevice *this = (SDL_AudioDevice *) arg;
+    SDL_AudioDevice *this = (SDL_AudioDevice *)arg;
     int rc;
 
-    #if MACOSX_COREAUDIO
+#if MACOSX_COREAUDIO
     const AudioObjectPropertyAddress default_device_address = {
         this->iscapture ? kAudioHardwarePropertyDefaultInputDevice : kAudioHardwarePropertyDefaultOutputDevice,
         kAudioObjectPropertyScopeGlobal,
         kAudioObjectPropertyElementMain
     };
 
-    if (this->handle == NULL) {  /* opened the default device? Register to know if the user picks a new default. */
+    if (this->handle == NULL) { /* opened the default device? Register to know if the user picks a new default. */
         /* we don't care if this fails; we just won't change to new default devices, but we still otherwise function in this case. */
         AudioObjectAddPropertyListener(kAudioObjectSystemObject, &default_device_address, default_device_changed, this);
     }
-    #endif
+#endif
 
     rc = prepare_audioqueue(this);
     if (!rc) {
@@ -982,14 +954,14 @@ audioqueue_thread(void *arg)
     while (!SDL_AtomicGet(&this->shutdown)) {
         CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.10, 1);
 
-        #if MACOSX_COREAUDIO
+#if MACOSX_COREAUDIO
         if ((this->handle == NULL) && SDL_AtomicGet(&this->hidden->device_change_flag)) {
             const AudioDeviceID prev_devid = this->hidden->deviceID;
             SDL_AtomicSet(&this->hidden->device_change_flag, 0);
 
-            #if DEBUG_COREAUDIO
+#if DEBUG_COREAUDIO
             printf("COREAUDIO: audioqueue_thread is trying to switch to new default device!\n");
-            #endif
+#endif
 
             /* if any of this fails, there's not much to do but wait to see if the user gives up
                and quits (flagging the audioqueue for shutdown), or toggles to some other system
@@ -1007,26 +979,25 @@ audioqueue_thread(void *arg)
                 }
             }
         }
-        #endif
+#endif
     }
 
-    if (!this->iscapture) {  /* Drain off any pending playback. */
-        const CFTimeInterval secs = (((this->spec.size / (SDL_AUDIO_BITSIZE(this->spec.format) / 8)) / this->spec.channels) / ((CFTimeInterval) this->spec.freq)) * 2.0;
+    if (!this->iscapture) { /* Drain off any pending playback. */
+        const CFTimeInterval secs = (((this->spec.size / (SDL_AUDIO_BITSIZE(this->spec.format) / 8)) / this->spec.channels) / ((CFTimeInterval)this->spec.freq)) * 2.0;
         CFRunLoopRunInMode(kCFRunLoopDefaultMode, secs, 0);
     }
 
-    #if MACOSX_COREAUDIO
+#if MACOSX_COREAUDIO
     if (this->handle == NULL) {
         /* we don't care if this fails; we just won't change to new default devices, but we still otherwise function in this case. */
         AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &default_device_address, default_device_changed, this);
     }
-    #endif
+#endif
 
     return 0;
 }
 
-static int
-COREAUDIO_OpenDevice(_THIS, const char *devname)
+static int COREAUDIO_OpenDevice(_THIS, const char *devname)
 {
     AudioStreamBasicDescription *strdesc;
     SDL_AudioFormat test_format;
@@ -1062,7 +1033,7 @@ COREAUDIO_OpenDevice(_THIS, const char *devname)
 
     /* Stop CoreAudio from doing expensive audio rate conversion */
     @autoreleasepool {
-        AVAudioSession* session = [AVAudioSession sharedInstance];
+        AVAudioSession *session = [AVAudioSession sharedInstance];
         [session setPreferredSampleRate:this->spec.freq error:nil];
         this->spec.freq = (int)session.sampleRate;
 #if TARGET_OS_TV
@@ -1106,7 +1077,7 @@ COREAUDIO_OpenDevice(_THIS, const char *devname)
         break;
     }
 
-    if (!test_format) {      /* shouldn't happen, but just in case... */
+    if (!test_format) { /* shouldn't happen, but just in case... */
         return SDL_SetError("%s: Unsupported audio format", "coreaudio");
     }
     this->spec.format = test_format;
@@ -1131,7 +1102,7 @@ COREAUDIO_OpenDevice(_THIS, const char *devname)
     /* This has to init in a new thread so it can get its own CFRunLoop. :/ */
     this->hidden->ready_semaphore = SDL_CreateSemaphore(0);
     if (!this->hidden->ready_semaphore) {
-        return -1;  /* oh well. */
+        return -1; /* oh well. */
     }
 
     this->hidden->thread = SDL_CreateThreadInternal(audioqueue_thread, "AudioQueue thread", 512 * 1024, this);
@@ -1151,10 +1122,9 @@ COREAUDIO_OpenDevice(_THIS, const char *devname)
 }
 
 #if !MACOSX_COREAUDIO
-static int
-COREAUDIO_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
+static int COREAUDIO_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
 {
-    AVAudioSession* session = [AVAudioSession sharedInstance];
+    AVAudioSession *session = [AVAudioSession sharedInstance];
 
     if (name != NULL) {
         *name = NULL;
@@ -1164,9 +1134,8 @@ COREAUDIO_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
     spec->channels = [session outputNumberOfChannels];
     return 0;
 }
-#else /* MACOSX_COREAUDIO */
-static int
-COREAUDIO_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
+#else  /* MACOSX_COREAUDIO */
+static int COREAUDIO_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
 {
     AudioDeviceID devid;
     AudioBufferList *buflist;
@@ -1205,7 +1174,7 @@ COREAUDIO_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
 
     /* Get the Device ID */
     cfstr = NULL;
-    size = sizeof (AudioDeviceID);
+    size = sizeof(AudioDeviceID);
     result = AudioObjectGetPropertyData(kAudioObjectSystemObject, &addr,
                                         0, NULL, &size, &devid);
 
@@ -1215,7 +1184,7 @@ COREAUDIO_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
 
     if (name != NULL) {
         /* Use the Device ID to get the name */
-        size = sizeof (CFStringRef);
+        size = sizeof(CFStringRef);
         result = AudioObjectGetPropertyData(devid, &nameaddr, 0, NULL, &size, &cfstr);
 
         if (result != noErr) {
@@ -1223,8 +1192,8 @@ COREAUDIO_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
         }
 
         len = CFStringGetMaximumSizeForEncoding(CFStringGetLength(cfstr),
-                                                        kCFStringEncodingUTF8);
-        devname = (char *) SDL_malloc(len + 1);
+                                                kCFStringEncodingUTF8);
+        devname = (char *)SDL_malloc(len + 1);
         usable = ((devname != NULL) &&
                   (CFStringGetCString(cfstr, devname, len + 1, kCFStringEncodingUTF8)));
         CFRelease(cfstr);
@@ -1256,13 +1225,13 @@ COREAUDIO_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
         return SDL_SetError("%s: Default Device Sample Rate not found", "coreaudio");
     }
 
-    spec->freq = (int) sampleRate;
+    spec->freq = (int)sampleRate;
 
     result = AudioObjectGetPropertyDataSize(devid, &bufaddr, 0, NULL, &size);
     if (result != noErr)
         return SDL_SetError("%s: Default Device Data Size not found", "coreaudio");
 
-    buflist = (AudioBufferList *) SDL_malloc(size);
+    buflist = (AudioBufferList *)SDL_malloc(size);
     if (buflist == NULL)
         return SDL_SetError("%s: Default Device Buffer List not found", "coreaudio");
 
@@ -1286,8 +1255,7 @@ COREAUDIO_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
 }
 #endif /* MACOSX_COREAUDIO */
 
-static void
-COREAUDIO_Deinitialize(void)
+static void COREAUDIO_Deinitialize(void)
 {
 #if MACOSX_COREAUDIO
     AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &devlist_address, device_list_changed, NULL);
@@ -1296,8 +1264,7 @@ COREAUDIO_Deinitialize(void)
 #endif
 }
 
-static SDL_bool
-COREAUDIO_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool COREAUDIO_Init(SDL_AudioDriverImpl *impl)
 {
     /* Set the function pointers */
     impl->OpenDevice = COREAUDIO_OpenDevice;
@@ -1317,7 +1284,7 @@ COREAUDIO_Init(SDL_AudioDriverImpl * impl)
     impl->HasCaptureSupport = SDL_TRUE;
     impl->SupportsNonPow2Samples = SDL_TRUE;
 
-    return SDL_TRUE;   /* this audio target is available. */
+    return SDL_TRUE; /* this audio target is available. */
 }
 
 AudioBootStrap COREAUDIO_bootstrap = {

src/audio/directsound/SDL_directsound.c

@@ -41,21 +41,20 @@ static SDL_bool SupportsIMMDevice = SDL_FALSE;
 #endif /* HAVE_MMDEVICEAPI_H */
 
 /* DirectX function pointers for audio */
-static void* DSoundDLL = NULL;
-typedef HRESULT (WINAPI *fnDirectSoundCreate8)(LPGUID,LPDIRECTSOUND*,LPUNKNOWN);
-typedef HRESULT (WINAPI *fnDirectSoundEnumerateW)(LPDSENUMCALLBACKW, LPVOID);
-typedef HRESULT (WINAPI *fnDirectSoundCaptureCreate8)(LPCGUID,LPDIRECTSOUNDCAPTURE8 *,LPUNKNOWN);
-typedef HRESULT (WINAPI *fnDirectSoundCaptureEnumerateW)(LPDSENUMCALLBACKW,LPVOID);
+static void *DSoundDLL = NULL;
+typedef HRESULT(WINAPI *fnDirectSoundCreate8)(LPGUID, LPDIRECTSOUND *, LPUNKNOWN);
+typedef HRESULT(WINAPI *fnDirectSoundEnumerateW)(LPDSENUMCALLBACKW, LPVOID);
+typedef HRESULT(WINAPI *fnDirectSoundCaptureCreate8)(LPCGUID, LPDIRECTSOUNDCAPTURE8 *, LPUNKNOWN);
+typedef HRESULT(WINAPI *fnDirectSoundCaptureEnumerateW)(LPDSENUMCALLBACKW, LPVOID);
 static fnDirectSoundCreate8 pDirectSoundCreate8 = NULL;
 static fnDirectSoundEnumerateW pDirectSoundEnumerateW = NULL;
 static fnDirectSoundCaptureCreate8 pDirectSoundCaptureCreate8 = NULL;
 static fnDirectSoundCaptureEnumerateW pDirectSoundCaptureEnumerateW = NULL;
 
-static const GUID SDL_KSDATAFORMAT_SUBTYPE_PCM = { 0x00000001, 0x0000, 0x0010,{ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } };
-static const GUID SDL_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = { 0x00000003, 0x0000, 0x0010,{ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } };
+static const GUID SDL_KSDATAFORMAT_SUBTYPE_PCM = { 0x00000001, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } };
+static const GUID SDL_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = { 0x00000003, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } };
 
-static void
-DSOUND_Unload(void)
+static void DSOUND_Unload(void)
 {
     pDirectSoundCreate8 = NULL;
     pDirectSoundEnumerateW = NULL;
@@ -68,9 +67,7 @@ DSOUND_Unload(void)
     }
 }
 
-
-static int
-DSOUND_Load(void)
+static int DSOUND_Load(void)
 {
     int loaded = 0;
 
@@ -80,17 +77,19 @@ DSOUND_Load(void)
     if (DSoundDLL == NULL) {
         SDL_SetError("DirectSound: failed to load DSOUND.DLL");
     } else {
-        /* Now make sure we have DirectX 8 or better... */
-        #define DSOUNDLOAD(f) { \
-            p##f = (fn##f) SDL_LoadFunction(DSoundDLL, #f); \
-            if (!p##f) loaded = 0; \
-        }
-        loaded = 1;  /* will reset if necessary. */
+/* Now make sure we have DirectX 8 or better... */
+#define DSOUNDLOAD(f)                                  \
+    {                                                  \
+        p##f = (fn##f)SDL_LoadFunction(DSoundDLL, #f); \
+        if (!p##f)                                     \
+            loaded = 0;                                \
+    }
+        loaded = 1; /* will reset if necessary. */
         DSOUNDLOAD(DirectSoundCreate8);
         DSOUNDLOAD(DirectSoundEnumerateW);
         DSOUNDLOAD(DirectSoundCaptureCreate8);
         DSOUNDLOAD(DirectSoundCaptureEnumerateW);
-        #undef DSOUNDLOAD
+#undef DSOUNDLOAD
 
         if (!loaded) {
             SDL_SetError("DirectSound: System doesn't appear to have DX8.");
@@ -104,8 +103,7 @@ DSOUND_Load(void)
     return loaded;
 }
 
-static int
-SetDSerror(const char *function, int code)
+static int SetDSerror(const char *function, int code)
 {
     const char *error;
 
@@ -151,14 +149,12 @@ SetDSerror(const char *function, int code)
     return SDL_SetError("%s: %s (0x%x)", function, error, code);
 }
 
-static void
-DSOUND_FreeDeviceHandle(void *handle)
+static void DSOUND_FreeDeviceHandle(void *handle)
 {
     SDL_free(handle);
 }
 
-static int
-DSOUND_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
+static int DSOUND_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
 {
 #if HAVE_MMDEVICEAPI_H
     if (SupportsIMMDevice) {
@@ -168,29 +164,27 @@ DSOUND_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
     return SDL_Unsupported();
 }
 
-static BOOL CALLBACK
-FindAllDevs(LPGUID guid, LPCWSTR desc, LPCWSTR module, LPVOID data)
+static BOOL CALLBACK FindAllDevs(LPGUID guid, LPCWSTR desc, LPCWSTR module, LPVOID data)
 {
-    const int iscapture = (int) ((size_t) data);
-    if (guid != NULL) {  /* skip default device */
+    const int iscapture = (int)((size_t)data);
+    if (guid != NULL) { /* skip default device */
         char *str = WIN_LookupAudioDeviceName(desc, guid);
         if (str != NULL) {
-            LPGUID cpyguid = (LPGUID) SDL_malloc(sizeof (GUID));
-            SDL_memcpy(cpyguid, guid, sizeof (GUID));
+            LPGUID cpyguid = (LPGUID)SDL_malloc(sizeof(GUID));
+            SDL_memcpy(cpyguid, guid, sizeof(GUID));
 
             /* Note that spec is NULL, because we are required to connect to the
              * device before getting the channel mask and output format, making
              * this information inaccessible at enumeration time
              */
             SDL_AddAudioDevice(iscapture, str, NULL, cpyguid);
-            SDL_free(str);  /* addfn() makes a copy of this string. */
+            SDL_free(str); /* addfn() makes a copy of this string. */
         }
     }
-    return TRUE;  /* keep enumerating. */
+    return TRUE; /* keep enumerating. */
 }
 
-static void
-DSOUND_DetectDevices(void)
+static void DSOUND_DetectDevices(void)
 {
 #if HAVE_MMDEVICEAPI_H
     if (SupportsIMMDevice) {
@@ -204,9 +198,7 @@ DSOUND_DetectDevices(void)
 #endif /* HAVE_MMDEVICEAPI_H*/
 }
 
-
-static void
-DSOUND_WaitDevice(_THIS)
+static void DSOUND_WaitDevice(_THIS)
 {
     DWORD status = 0;
     DWORD cursor = 0;
@@ -263,8 +255,7 @@ DSOUND_WaitDevice(_THIS)
     }
 }
 
-static void
-DSOUND_PlayDevice(_THIS)
+static void DSOUND_PlayDevice(_THIS)
 {
     /* Unlock the buffer, allowing it to play */
     if (this->hidden->locked_buf) {
@@ -274,8 +265,7 @@ DSOUND_PlayDevice(_THIS)
     }
 }
 
-static Uint8 *
-DSOUND_GetDeviceBuf(_THIS)
+static Uint8 *DSOUND_GetDeviceBuf(_THIS)
 {
     DWORD cursor = 0;
     DWORD junk = 0;
@@ -316,14 +306,13 @@ DSOUND_GetDeviceBuf(_THIS)
     /* Lock the audio buffer */
     result = IDirectSoundBuffer_Lock(this->hidden->mixbuf, cursor,
                                      this->spec.size,
-                                     (LPVOID *) & this->hidden->locked_buf,
+                                     (LPVOID *)&this->hidden->locked_buf,
                                      &rawlen, NULL, &junk, 0);
     if (result == DSERR_BUFFERLOST) {
         IDirectSoundBuffer_Restore(this->hidden->mixbuf);
         result = IDirectSoundBuffer_Lock(this->hidden->mixbuf, cursor,
                                          this->spec.size,
-                                         (LPVOID *) & this->
-                                         hidden->locked_buf, &rawlen, NULL,
+                                         (LPVOID *)&this->hidden->locked_buf, &rawlen, NULL,
                                          &junk, 0);
     }
     if (result != DS_OK) {
@@ -333,8 +322,7 @@ DSOUND_GetDeviceBuf(_THIS)
     return this->hidden->locked_buf;
 }
 
-static int
-DSOUND_CaptureFromDevice(_THIS, void *buffer, int buflen)
+static int DSOUND_CaptureFromDevice(_THIS, void *buffer, int buflen)
 {
     struct SDL_PrivateAudioData *h = this->hidden;
     DWORD junk, cursor, ptr1len, ptr2len;
@@ -343,7 +331,7 @@ DSOUND_CaptureFromDevice(_THIS, void *buffer, int buflen)
     SDL_assert(buflen == this->spec.size);
 
     while (SDL_TRUE) {
-        if (SDL_AtomicGet(&this->shutdown)) {  /* in case the buffer froze... */
+        if (SDL_AtomicGet(&this->shutdown)) { /* in case the buffer froze... */
             SDL_memset(buffer, this->spec.silence, buflen);
             return buflen;
         }
@@ -352,7 +340,7 @@ DSOUND_CaptureFromDevice(_THIS, void *buffer, int buflen)
             return -1;
         }
         if ((cursor / this->spec.size) == h->lastchunk) {
-            SDL_Delay(1);  /* FIXME: find out how much time is left and sleep that long */
+            SDL_Delay(1); /* FIXME: find out how much time is left and sleep that long */
         } else {
             break;
         }
@@ -377,8 +365,7 @@ DSOUND_CaptureFromDevice(_THIS, void *buffer, int buflen)
     return ptr1len;
 }
 
-static void
-DSOUND_FlushCapture(_THIS)
+static void DSOUND_FlushCapture(_THIS)
 {
     struct SDL_PrivateAudioData *h = this->hidden;
     DWORD junk, cursor;
@@ -387,8 +374,7 @@ DSOUND_FlushCapture(_THIS)
     }
 }
 
-static void
-DSOUND_CloseDevice(_THIS)
+static void DSOUND_CloseDevice(_THIS)
 {
     if (this->hidden->mixbuf != NULL) {
         IDirectSoundBuffer_Stop(this->hidden->mixbuf);
@@ -411,8 +397,7 @@ DSOUND_CloseDevice(_THIS)
    number of audio chunks available in the created buffer. This is for
    playback devices, not capture.
 */
-static int
-CreateSecondary(_THIS, const DWORD bufsize, WAVEFORMATEX *wfmt)
+static int CreateSecondary(_THIS, const DWORD bufsize, WAVEFORMATEX *wfmt)
 {
     LPDIRECTSOUND sndObj = this->hidden->sound;
     LPDIRECTSOUNDBUFFER *sndbuf = &this->hidden->mixbuf;
@@ -436,14 +421,14 @@ CreateSecondary(_THIS, const DWORD bufsize, WAVEFORMATEX *wfmt)
 
     /* Silence the initial audio buffer */
     result = IDirectSoundBuffer_Lock(*sndbuf, 0, format.dwBufferBytes,
-                                     (LPVOID *) & pvAudioPtr1, &dwAudioBytes1,
-                                     (LPVOID *) & pvAudioPtr2, &dwAudioBytes2,
+                                     (LPVOID *)&pvAudioPtr1, &dwAudioBytes1,
+                                     (LPVOID *)&pvAudioPtr2, &dwAudioBytes2,
                                      DSBLOCK_ENTIREBUFFER);
     if (result == DS_OK) {
         SDL_memset(pvAudioPtr1, this->spec.silence, dwAudioBytes1);
         IDirectSoundBuffer_Unlock(*sndbuf,
-                                  (LPVOID) pvAudioPtr1, dwAudioBytes1,
-                                  (LPVOID) pvAudioPtr2, dwAudioBytes2);
+                                  (LPVOID)pvAudioPtr1, dwAudioBytes1,
+                                  (LPVOID)pvAudioPtr2, dwAudioBytes2);
     }
 
     /* We're ready to go */
@@ -454,8 +439,7 @@ CreateSecondary(_THIS, const DWORD bufsize, WAVEFORMATEX *wfmt)
    number of audio chunks available in the created buffer. This is for
    capture devices, not playback.
 */
-static int
-CreateCaptureBuffer(_THIS, const DWORD bufsize, WAVEFORMATEX *wfmt)
+static int CreateCaptureBuffer(_THIS, const DWORD bufsize, WAVEFORMATEX *wfmt)
 {
     LPDIRECTSOUNDCAPTURE capture = this->hidden->capture;
     LPDIRECTSOUNDCAPTUREBUFFER *capturebuf = &this->hidden->capturebuf;
@@ -463,7 +447,7 @@ CreateCaptureBuffer(_THIS, const DWORD bufsize, WAVEFORMATEX *wfmt)
     HRESULT result;
 
     SDL_zero(format);
-    format.dwSize = sizeof (format);
+    format.dwSize = sizeof(format);
     format.dwFlags = DSCBCAPS_WAVEMAPPED;
     format.dwBufferBytes = bufsize;
     format.lpwfxFormat = wfmt;
@@ -494,15 +478,14 @@ CreateCaptureBuffer(_THIS, const DWORD bufsize, WAVEFORMATEX *wfmt)
     return 0;
 }
 
-static int
-DSOUND_OpenDevice(_THIS, const char *devname)
+static int DSOUND_OpenDevice(_THIS, const char *devname)
 {
     const DWORD numchunks = 8;
     HRESULT result;
     SDL_bool tried_format = SDL_FALSE;
     SDL_bool iscapture = this->iscapture;
     SDL_AudioFormat test_format;
-    LPGUID guid = (LPGUID) this->handle;
+    LPGUID guid = (LPGUID)this->handle;
     DWORD bufsize;
 
     /* Initialize all variables that we clean on shutdown */
@@ -548,8 +531,8 @@ DSOUND_OpenDevice(_THIS, const char *devname)
             bufsize = numchunks * this->spec.size;
             if ((bufsize < DSBSIZE_MIN) || (bufsize > DSBSIZE_MAX)) {
                 SDL_SetError("Sound buffer size must be between %d and %d",
-                             (int) ((DSBSIZE_MIN < numchunks) ? 1 : DSBSIZE_MIN / numchunks),
-                             (int) (DSBSIZE_MAX / numchunks));
+                             (int)((DSBSIZE_MIN < numchunks) ? 1 : DSBSIZE_MIN / numchunks),
+                             (int)(DSBSIZE_MAX / numchunks));
             } else {
                 int rc;
                 WAVEFORMATEXTENSIBLE wfmt;
@@ -565,8 +548,7 @@ DSOUND_OpenDevice(_THIS, const char *devname)
                     }
                     wfmt.Samples.wValidBitsPerSample = SDL_AUDIO_BITSIZE(this->spec.format);
 
-                    switch (this->spec.channels)
-                    {
+                    switch (this->spec.channels) {
                     case 3: /* 3.0 (or 2.1) */
                         wfmt.dwChannelMask = SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER;
                         break;
@@ -601,7 +583,7 @@ DSOUND_OpenDevice(_THIS, const char *devname)
                 wfmt.Format.nBlockAlign = wfmt.Format.nChannels * (wfmt.Format.wBitsPerSample / 8);
                 wfmt.Format.nAvgBytesPerSec = wfmt.Format.nSamplesPerSec * wfmt.Format.nBlockAlign;
 
-                rc = iscapture ? CreateCaptureBuffer(this, bufsize, (WAVEFORMATEX*) &wfmt) : CreateSecondary(this, bufsize, (WAVEFORMATEX*) &wfmt);
+                rc = iscapture ? CreateCaptureBuffer(this, bufsize, (WAVEFORMATEX *)&wfmt) : CreateSecondary(this, bufsize, (WAVEFORMATEX *)&wfmt);
                 if (rc == 0) {
                     this->hidden->num_buffers = numchunks;
                     break;
@@ -616,19 +598,17 @@ DSOUND_OpenDevice(_THIS, const char *devname)
 
     if (!test_format) {
         if (tried_format) {
-            return -1;  /* CreateSecondary() should have called SDL_SetError(). */
+            return -1; /* CreateSecondary() should have called SDL_SetError(). */
         }
         return SDL_SetError("%s: Unsupported audio format", "directsound");
     }
 
     /* Playback buffers will auto-start playing in DSOUND_WaitDevice() */
 
-    return 0;                   /* good to go. */
+    return 0; /* good to go. */
 }
 
-
-static void
-DSOUND_Deinitialize(void)
+static void DSOUND_Deinitialize(void)
 {
 #if HAVE_MMDEVICEAPI_H
     if (SupportsIMMDevice) {
@@ -639,9 +619,7 @@ DSOUND_Deinitialize(void)
     DSOUND_Unload();
 }
 
-
-static SDL_bool
-DSOUND_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool DSOUND_Init(SDL_AudioDriverImpl *impl)
 {
     if (!DSOUND_Load()) {
         return SDL_FALSE;
@@ -667,7 +645,7 @@ DSOUND_Init(SDL_AudioDriverImpl * impl)
     impl->HasCaptureSupport = SDL_TRUE;
     impl->SupportsNonPow2Samples = SDL_TRUE;
 
-    return SDL_TRUE;   /* this audio target is available. */
+    return SDL_TRUE; /* this audio target is available. */
 }
 
 AudioBootStrap DSOUND_bootstrap = {

src/audio/directsound/SDL_directsound.h

@@ -28,7 +28,7 @@
 #include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the audio functions */
-#define _THIS   SDL_AudioDevice *this
+#define _THIS SDL_AudioDevice *this
 
 /* The DirectSound objects */
 struct SDL_PrivateAudioData

src/audio/disk/SDL_diskaudio.c

@@ -33,21 +33,19 @@
 
 /* !!! FIXME: these should be SDL hints, not environment variables. */
 /* environment variables and defaults. */
-#define DISKENVR_OUTFILE         "SDL_DISKAUDIOFILE"
-#define DISKDEFAULT_OUTFILE      "sdlaudio.raw"
-#define DISKENVR_INFILE         "SDL_DISKAUDIOFILEIN"
-#define DISKDEFAULT_INFILE      "sdlaudio-in.raw"
-#define DISKENVR_IODELAY      "SDL_DISKAUDIODELAY"
+#define DISKENVR_OUTFILE    "SDL_DISKAUDIOFILE"
+#define DISKDEFAULT_OUTFILE "sdlaudio.raw"
+#define DISKENVR_INFILE     "SDL_DISKAUDIOFILEIN"
+#define DISKDEFAULT_INFILE  "sdlaudio-in.raw"
+#define DISKENVR_IODELAY    "SDL_DISKAUDIODELAY"
 
 /* This function waits until it is possible to write a full sound buffer */
-static void
-DISKAUDIO_WaitDevice(_THIS)
+static void DISKAUDIO_WaitDevice(_THIS)
 {
     SDL_Delay(_this->hidden->io_delay);
 }
 
-static void
-DISKAUDIO_PlayDevice(_THIS)
+static void DISKAUDIO_PlayDevice(_THIS)
 {
     const size_t written = SDL_RWwrite(_this->hidden->io,
                                        _this->hidden->mixbuf,
@@ -62,14 +60,12 @@ DISKAUDIO_PlayDevice(_THIS)
 #endif
 }
 
-static Uint8 *
-DISKAUDIO_GetDeviceBuf(_THIS)
+static Uint8 *DISKAUDIO_GetDeviceBuf(_THIS)
 {
     return _this->hidden->mixbuf;
 }
 
-static int
-DISKAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
+static int DISKAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
 {
     struct SDL_PrivateAudioData *h = _this->hidden;
     const int origbuflen = buflen;
@@ -78,9 +74,9 @@ DISKAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
 
     if (h->io) {
         const size_t br = SDL_RWread(h->io, buffer, 1, buflen);
-        buflen -= (int) br;
-        buffer = ((Uint8 *) buffer) + br;
-        if (buflen > 0) {  /* EOF (or error, but whatever). */
+        buflen -= (int)br;
+        buffer = ((Uint8 *)buffer) + br;
+        if (buflen > 0) { /* EOF (or error, but whatever). */
             SDL_RWclose(h->io);
             h->io = NULL;
         }
@@ -92,15 +88,12 @@ DISKAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
     return origbuflen;
 }
 
-static void
-DISKAUDIO_FlushCapture(_THIS)
+static void DISKAUDIO_FlushCapture(_THIS)
 {
     /* no op...we don't advance the file pointer or anything. */
 }
 
-
-static void
-DISKAUDIO_CloseDevice(_THIS)
+static void DISKAUDIO_CloseDevice(_THIS)
 {
     if (_this->hidden->io != NULL) {
         SDL_RWclose(_this->hidden->io);
@@ -109,9 +102,7 @@ DISKAUDIO_CloseDevice(_THIS)
     SDL_free(_this->hidden);
 }
 
-
-static const char *
-get_filename(const SDL_bool iscapture, const char *devname)
+static const char *get_filename(const SDL_bool iscapture, const char *devname)
 {
     if (devname == NULL) {
         devname = SDL_getenv(iscapture ? DISKENVR_INFILE : DISKENVR_OUTFILE);
@@ -122,8 +113,7 @@ get_filename(const SDL_bool iscapture, const char *devname)
     return devname;
 }
 
-static int
-DISKAUDIO_OpenDevice(_THIS, const char *devname)
+static int DISKAUDIO_OpenDevice(_THIS, const char *devname)
 {
     void *handle = _this->handle;
     /* handle != NULL means "user specified the placeholder name on the fake detected device list" */
@@ -152,7 +142,7 @@ DISKAUDIO_OpenDevice(_THIS, const char *devname)
 
     /* Allocate mixing buffer */
     if (!iscapture) {
-        _this->hidden->mixbuf = (Uint8 *) SDL_malloc(_this->spec.size);
+        _this->hidden->mixbuf = (Uint8 *)SDL_malloc(_this->spec.size);
         if (_this->hidden->mixbuf == NULL) {
             return SDL_OutOfMemory();
         }
@@ -160,24 +150,22 @@ DISKAUDIO_OpenDevice(_THIS, const char *devname)
     }
 
     SDL_LogCritical(SDL_LOG_CATEGORY_AUDIO,
-                "You are using the SDL disk i/o audio driver!\n");
+                    "You are using the SDL disk i/o audio driver!\n");
     SDL_LogCritical(SDL_LOG_CATEGORY_AUDIO,
-                " %s file [%s].\n", iscapture ? "Reading from" : "Writing to",
-                fname);
+                    " %s file [%s].\n", iscapture ? "Reading from" : "Writing to",
+                    fname);
 
     /* We're ready to rock and roll. :-) */
     return 0;
 }
 
-static void
-DISKAUDIO_DetectDevices(void)
+static void DISKAUDIO_DetectDevices(void)
 {
-    SDL_AddAudioDevice(SDL_FALSE, DEFAULT_OUTPUT_DEVNAME, NULL, (void *) 0x1);
-    SDL_AddAudioDevice(SDL_TRUE, DEFAULT_INPUT_DEVNAME, NULL, (void *) 0x2);
+    SDL_AddAudioDevice(SDL_FALSE, DEFAULT_OUTPUT_DEVNAME, NULL, (void *)0x1);
+    SDL_AddAudioDevice(SDL_TRUE, DEFAULT_INPUT_DEVNAME, NULL, (void *)0x2);
 }
 
-static SDL_bool
-DISKAUDIO_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool DISKAUDIO_Init(SDL_AudioDriverImpl *impl)
 {
     /* Set the function pointers */
     impl->OpenDevice = DISKAUDIO_OpenDevice;
@@ -194,7 +182,7 @@ DISKAUDIO_Init(SDL_AudioDriverImpl * impl)
     impl->HasCaptureSupport = SDL_TRUE;
     impl->SupportsNonPow2Samples = SDL_TRUE;
 
-    return SDL_TRUE;   /* this audio target is available. */
+    return SDL_TRUE; /* this audio target is available. */
 }
 
 AudioBootStrap DISKAUDIO_bootstrap = {

src/audio/disk/SDL_diskaudio.h

@@ -26,7 +26,7 @@
 #include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the audio functions */
-#define _THIS   SDL_AudioDevice *_this
+#define _THIS SDL_AudioDevice *_this
 
 struct SDL_PrivateAudioData
 {

src/audio/dsp/SDL_dspaudio.c

@@ -24,8 +24,8 @@
 
 /* Allow access to a raw mixing buffer */
 
-#include <stdio.h>              /* For perror() */
-#include <string.h>             /* For strerror() */
+#include <stdio.h>  /* For perror() */
+#include <string.h> /* For strerror() */
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -40,16 +40,12 @@
 #include "../SDL_audiodev_c.h"
 #include "SDL_dspaudio.h"
 
-
-static void
-DSP_DetectDevices(void)
+static void DSP_DetectDevices(void)
 {
     SDL_EnumUnixAudioDevices(0, NULL);
 }
 
-
-static void
-DSP_CloseDevice(_THIS)
+static void DSP_CloseDevice(_THIS)
 {
     if (this->hidden->audio_fd >= 0) {
         close(this->hidden->audio_fd);
@@ -58,9 +54,7 @@ DSP_CloseDevice(_THIS)
     SDL_free(this->hidden);
 }
 
-
-static int
-DSP_OpenDevice(_THIS, const char *devname)
+static int DSP_OpenDevice(_THIS, const char *devname)
 {
     SDL_bool iscapture = this->iscapture;
     const int flags = ((iscapture) ? OPEN_FLAGS_INPUT : OPEN_FLAGS_OUTPUT);
@@ -203,11 +197,12 @@ DSP_OpenDevice(_THIS, const char *devname)
     SDL_CalculateAudioSpec(&this->spec);
 
     /* Determine the power of two of the fragment size */
-    for (frag_spec = 0; (0x01U << frag_spec) < this->spec.size; ++frag_spec);
+    for (frag_spec = 0; (0x01U << frag_spec) < this->spec.size; ++frag_spec)
+        ;
     if ((0x01U << frag_spec) != this->spec.size) {
         return SDL_SetError("Fragment size must be a power of two");
     }
-    frag_spec |= 0x00020000;    /* two fragments, for low latency */
+    frag_spec |= 0x00020000; /* two fragments, for low latency */
 
     /* Set the audio buffering parameters */
 #ifdef DEBUG_AUDIO
@@ -231,7 +226,7 @@ DSP_OpenDevice(_THIS, const char *devname)
     /* Allocate mixing buffer */
     if (!iscapture) {
         this->hidden->mixlen = this->spec.size;
-        this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
+        this->hidden->mixbuf = (Uint8 *)SDL_malloc(this->hidden->mixlen);
         if (this->hidden->mixbuf == NULL) {
             return SDL_OutOfMemory();
         }
@@ -242,9 +237,7 @@ DSP_OpenDevice(_THIS, const char *devname)
     return 0;
 }
 
-
-static void
-DSP_PlayDevice(_THIS)
+static void DSP_PlayDevice(_THIS)
 {
     struct SDL_PrivateAudioData *h = this->hidden;
     if (write(h->audio_fd, h->mixbuf, h->mixlen) == -1) {
@@ -256,27 +249,24 @@ DSP_PlayDevice(_THIS)
 #endif
 }
 
-static Uint8 *
-DSP_GetDeviceBuf(_THIS)
+static Uint8 *DSP_GetDeviceBuf(_THIS)
 {
     return this->hidden->mixbuf;
 }
 
-static int
-DSP_CaptureFromDevice(_THIS, void *buffer, int buflen)
+static int DSP_CaptureFromDevice(_THIS, void *buffer, int buflen)
 {
     return (int)read(this->hidden->audio_fd, buffer, buflen);
 }
 
-static void
-DSP_FlushCapture(_THIS)
+static void DSP_FlushCapture(_THIS)
 {
     struct SDL_PrivateAudioData *h = this->hidden;
     audio_buf_info info;
     if (ioctl(h->audio_fd, SNDCTL_DSP_GETISPACE, &info) == 0) {
         while (info.bytes > 0) {
             char buf[512];
-            const size_t len = SDL_min(sizeof (buf), info.bytes);
+            const size_t len = SDL_min(sizeof(buf), info.bytes);
             const ssize_t br = read(h->audio_fd, buf, len);
             if (br <= 0) {
                 break;
@@ -287,22 +277,20 @@ DSP_FlushCapture(_THIS)
 }
 
 static SDL_bool InitTimeDevicesExist = SDL_FALSE;
-static int
-look_for_devices_test(int fd)
+static int look_for_devices_test(int fd)
 {
-    InitTimeDevicesExist = SDL_TRUE;  /* note that _something_ exists. */
+    InitTimeDevicesExist = SDL_TRUE; /* note that _something_ exists. */
     /* Don't add to the device list, we're just seeing if any devices exist. */
     return 0;
 }
 
-static SDL_bool
-DSP_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool DSP_Init(SDL_AudioDriverImpl *impl)
 {
     InitTimeDevicesExist = SDL_FALSE;
     SDL_EnumUnixAudioDevices(0, look_for_devices_test);
     if (!InitTimeDevicesExist) {
         SDL_SetError("dsp: No such audio device");
-        return SDL_FALSE;  /* maybe try a different backend. */
+        return SDL_FALSE; /* maybe try a different backend. */
     }
 
     /* Set the function pointers */
@@ -317,10 +305,9 @@ DSP_Init(SDL_AudioDriverImpl * impl)
     impl->AllowsArbitraryDeviceNames = SDL_TRUE;
     impl->HasCaptureSupport = SDL_TRUE;
 
-    return SDL_TRUE;   /* this audio target is available. */
+    return SDL_TRUE; /* this audio target is available. */
 }
 
-
 AudioBootStrap DSP_bootstrap = {
     "dsp", "OSS /dev/dsp standard audio", DSP_Init, SDL_FALSE
 };

src/audio/dsp/SDL_dspaudio.h

@@ -26,7 +26,7 @@
 #include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the audio functions */
-#define _THIS   SDL_AudioDevice *this
+#define _THIS SDL_AudioDevice *this
 
 struct SDL_PrivateAudioData
 {
@@ -37,7 +37,7 @@ struct SDL_PrivateAudioData
     Uint8 *mixbuf;
     int mixlen;
 };
-#define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */
+#define FUDGE_TICKS 10 /* The scheduler overhead ticks per frame */
 
 #endif /* SDL_dspaudio_h_ */
 /* vi: set ts=4 sw=4 expandtab: */

src/audio/dummy/SDL_dummyaudio.c

@@ -25,15 +25,14 @@
 #include "../SDL_audio_c.h"
 #include "SDL_dummyaudio.h"
 
-static int
-DUMMYAUDIO_OpenDevice(_THIS, const char *devname)
+static int DUMMYAUDIO_OpenDevice(_THIS, const char *devname)
 {
-    _this->hidden = (void *) 0x1;  /* just something non-NULL */
-    return 0;                   /* always succeeds. */
+    _this->hidden = (void *)0x1; /* just something non-NULL */
+
+    return 0; /* always succeeds. */
 }
 
-static int
-DUMMYAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
+static int DUMMYAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
 {
     /* Delay to make this sort of simulate real audio input. */
     SDL_Delay((_this->spec.samples * 1000) / _this->spec.freq);
@@ -43,8 +42,7 @@ DUMMYAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
     return buflen;
 }
 
-static SDL_bool
-DUMMYAUDIO_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool DUMMYAUDIO_Init(SDL_AudioDriverImpl *impl)
 {
     /* Set the function pointers */
     impl->OpenDevice = DUMMYAUDIO_OpenDevice;
@@ -54,7 +52,7 @@ DUMMYAUDIO_Init(SDL_AudioDriverImpl * impl)
     impl->OnlyHasDefaultCaptureDevice = SDL_TRUE;
     impl->HasCaptureSupport = SDL_TRUE;
 
-    return SDL_TRUE;   /* this audio target is available. */
+    return SDL_TRUE; /* this audio target is available. */
 }
 
 AudioBootStrap DUMMYAUDIO_bootstrap = {

src/audio/dummy/SDL_dummyaudio.h

@@ -26,7 +26,7 @@
 #include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the audio functions */
-#define _THIS   SDL_AudioDevice *_this
+#define _THIS SDL_AudioDevice *_this
 
 struct SDL_PrivateAudioData
 {

src/audio/emscripten/SDL_emscriptenaudio.c

@@ -32,10 +32,10 @@
    !!! FIXME:  true always once pthread support becomes widespread. Revisit this code
    !!! FIXME:  at some point and see what needs to be done for that! */
 
-static void
-FeedAudioDevice(_THIS, const void *buf, const int buflen)
+static void FeedAudioDevice(_THIS, const void *buf, const int buflen)
 {
     const int framelen = (SDL_AUDIO_BITSIZE(this->spec.format) / 8) * this->spec.channels;
+    /* *INDENT-OFF* */ /* clang-format off */
     MAIN_THREAD_EM_ASM({
         var SDL3 = Module['SDL3'];
         var numChannels = SDL3.audio.currentOutputBuffer['numberOfChannels'];
@@ -50,10 +50,10 @@ FeedAudioDevice(_THIS, const void *buf, const int buflen)
             }
         }
     }, buf, buflen / framelen);
+/* *INDENT-ON* */ /* clang-format on */
 }
 
-static void
-HandleAudioProcess(_THIS)
+static void HandleAudioProcess(_THIS)
 {
     SDL_AudioCallback callback = this->callbackspec.callback;
     const int stream_len = this->callbackspec.size;
@@ -69,12 +69,12 @@ HandleAudioProcess(_THIS)
         return;
     }
 
-    if (this->stream == NULL) {  /* no conversion necessary. */
+    if (this->stream == NULL) { /* no conversion necessary. */
         SDL_assert(this->spec.size == stream_len);
         callback(this->callbackspec.userdata, this->work_buffer, stream_len);
-    } else {  /* streaming/converting */
+    } else { /* streaming/converting */
         int got;
-        while (SDL_AudioStreamAvailable(this->stream) < ((int) this->spec.size)) {
+        while (SDL_AudioStreamAvailable(this->stream) < ((int)this->spec.size)) {
             callback(this->callbackspec.userdata, this->work_buffer, stream_len);
             if (SDL_AudioStreamPut(this->stream, this->work_buffer, stream_len) == -1) {
                 SDL_AudioStreamClear(this->stream);
@@ -93,8 +93,7 @@ HandleAudioProcess(_THIS)
     FeedAudioDevice(this, this->work_buffer, this->spec.size);
 }
 
-static void
-HandleCaptureProcess(_THIS)
+static void HandleCaptureProcess(_THIS)
 {
     SDL_AudioCallback callback = this->callbackspec.callback;
     const int stream_len = this->callbackspec.size;
@@ -105,6 +104,7 @@ HandleCaptureProcess(_THIS)
         return;
     }
 
+    /* *INDENT-OFF* */ /* clang-format off */
     MAIN_THREAD_EM_ASM({
         var SDL3 = Module['SDL3'];
         var numChannels = SDL3.capture.currentCaptureBuffer.numberOfChannels;
@@ -125,13 +125,14 @@ HandleCaptureProcess(_THIS)
             }
         }
     }, this->work_buffer, (this->spec.size / sizeof (float)) / this->spec.channels);
+/* *INDENT-ON* */ /* clang-format on */
 
     /* okay, we've got an interleaved float32 array in C now. */
 
-    if (this->stream == NULL) {  /* no conversion necessary. */
+    if (this->stream == NULL) { /* no conversion necessary. */
         SDL_assert(this->spec.size == stream_len);
         callback(this->callbackspec.userdata, this->work_buffer, stream_len);
-    } else {  /* streaming/converting */
+    } else { /* streaming/converting */
         if (SDL_AudioStreamPut(this->stream, this->work_buffer, this->spec.size) == -1) {
             SDL_AtomicSet(&this->enabled, 0);
         }
@@ -142,15 +143,14 @@ HandleCaptureProcess(_THIS)
             if (got != stream_len) {
                 SDL_memset(this->work_buffer, this->callbackspec.silence, stream_len);
             }
-            callback(this->callbackspec.userdata, this->work_buffer, stream_len);  /* Send it to the app. */
+            callback(this->callbackspec.userdata, this->work_buffer, stream_len); /* Send it to the app. */
         }
     }
 }
 
-
-static void
-EMSCRIPTENAUDIO_CloseDevice(_THIS)
+static void EMSCRIPTENAUDIO_CloseDevice(_THIS)
 {
+    /* *INDENT-OFF* */ /* clang-format off */
     MAIN_THREAD_EM_ASM({
         var SDL3 = Module['SDL3'];
         if ($0) {
@@ -189,14 +189,14 @@ EMSCRIPTENAUDIO_CloseDevice(_THIS)
             SDL3.audioContext = undefined;
         }
     }, this->iscapture);
+/* *INDENT-ON* */ /* clang-format on */
 
-#if 0  /* !!! FIXME: currently not used. Can we move some stuff off the SDL3 namespace? --ryan. */
+#if 0 /* !!! FIXME: currently not used. Can we move some stuff off the SDL3 namespace? --ryan. */
     SDL_free(this->hidden);
 #endif
 }
 
-static int
-EMSCRIPTENAUDIO_OpenDevice(_THIS, const char *devname)
+static int EMSCRIPTENAUDIO_OpenDevice(_THIS, const char *devname)
 {
     SDL_AudioFormat test_format;
     SDL_bool iscapture = this->iscapture;
@@ -204,6 +204,7 @@ EMSCRIPTENAUDIO_OpenDevice(_THIS, const char *devname)
 
     /* based on parts of library_sdl.js */
 
+    /* *INDENT-OFF* */ /* clang-format off */
     /* create context */
     result = MAIN_THREAD_EM_ASM_INT({
         if (typeof(Module['SDL3']) === 'undefined') {
@@ -228,6 +229,8 @@ EMSCRIPTENAUDIO_OpenDevice(_THIS, const char *devname)
         }
         return SDL3.audioContext === undefined ? -1 : 0;
     }, iscapture);
+/* *INDENT-ON* */ /* clang-format on */
+
     if (result < 0) {
         return SDL_SetError("Web Audio API is not available!");
     }
@@ -249,7 +252,7 @@ EMSCRIPTENAUDIO_OpenDevice(_THIS, const char *devname)
     this->spec.format = test_format;
 
     /* Initialize all variables that we clean on shutdown */
-#if 0  /* !!! FIXME: currently not used. Can we move some stuff off the SDL3 namespace? --ryan. */
+#if 0 /* !!! FIXME: currently not used. Can we move some stuff off the SDL3 namespace? --ryan. */
     this->hidden = (struct SDL_PrivateAudioData *)
         SDL_malloc((sizeof *this->hidden));
     if (this->hidden == NULL) {
@@ -261,12 +264,13 @@ EMSCRIPTENAUDIO_OpenDevice(_THIS, const char *devname)
 
     /* limit to native freq */
     this->spec.freq = EM_ASM_INT_V({
-      var SDL3 = Module['SDL3'];
-      return SDL3.audioContext.sampleRate;
+        var SDL3 = Module['SDL3'];
+        return SDL3.audioContext.sampleRate;
     });
 
     SDL_CalculateAudioSpec(&this->spec);
 
+    /* *INDENT-OFF* */ /* clang-format off */
     if (iscapture) {
         /* The idea is to take the capture media stream, hook it up to an
            audio graph where we can pass it through a ScriptProcessorNode
@@ -338,17 +342,16 @@ EMSCRIPTENAUDIO_OpenDevice(_THIS, const char *devname)
             SDL3.audio.scriptProcessorNode['connect'](SDL3.audioContext['destination']);
         }, this->spec.channels, this->spec.samples, HandleAudioProcess, this);
     }
+/* *INDENT-ON* */ /* clang-format on */
 
     return 0;
 }
 
-static void
-EMSCRIPTENAUDIO_LockOrUnlockDeviceWithNoMixerLock(SDL_AudioDevice * device)
+static void EMSCRIPTENAUDIO_LockOrUnlockDeviceWithNoMixerLock(SDL_AudioDevice *device)
 {
 }
 
-static SDL_bool
-EMSCRIPTENAUDIO_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool EMSCRIPTENAUDIO_Init(SDL_AudioDriverImpl *impl)
 {
     SDL_bool available, capture_available;
 
@@ -362,6 +365,7 @@ EMSCRIPTENAUDIO_Init(SDL_AudioDriverImpl * impl)
     impl->LockDevice = impl->UnlockDevice = EMSCRIPTENAUDIO_LockOrUnlockDeviceWithNoMixerLock;
     impl->ProvidesOwnCallbackThread = SDL_TRUE;
 
+    /* *INDENT-OFF* */ /* clang-format off */
     /* check availability */
     available = MAIN_THREAD_EM_ASM_INT({
         if (typeof(AudioContext) !== 'undefined') {
@@ -371,11 +375,13 @@ EMSCRIPTENAUDIO_Init(SDL_AudioDriverImpl * impl)
         }
         return false;
     });
+/* *INDENT-ON* */ /* clang-format on */
 
     if (!available) {
         SDL_SetError("No audio context available");
     }
 
+    /* *INDENT-OFF* */ /* clang-format off */
     capture_available = available && MAIN_THREAD_EM_ASM_INT({
         if ((typeof(navigator.mediaDevices) !== 'undefined') && (typeof(navigator.mediaDevices.getUserMedia) !== 'undefined')) {
             return true;
@@ -384,6 +390,7 @@ EMSCRIPTENAUDIO_Init(SDL_AudioDriverImpl * impl)
         }
         return false;
     });
+/* *INDENT-ON* */ /* clang-format on */
 
     impl->HasCaptureSupport = capture_available ? SDL_TRUE : SDL_FALSE;
     impl->OnlyHasDefaultCaptureDevice = capture_available ? SDL_TRUE : SDL_FALSE;

src/audio/emscripten/SDL_emscriptenaudio.h

@@ -26,7 +26,7 @@
 #include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the audio functions */
-#define _THIS   SDL_AudioDevice *this
+#define _THIS SDL_AudioDevice *this
 
 struct SDL_PrivateAudioData
 {

src/audio/haiku/SDL_haikuaudio.cc

@@ -41,8 +41,7 @@ extern "C"
 
 /* !!! FIXME: have the callback call the higher level to avoid code dupe. */
 /* The Haiku callback for handling the audio buffer */
-static void
-FillSound(void *device, void *stream, size_t len,
+static void FillSound(void *device, void *stream, size_t len,
           const media_raw_audio_format & format)
 {
     SDL_AudioDevice *audio = (SDL_AudioDevice *) device;
@@ -84,8 +83,7 @@ FillSound(void *device, void *stream, size_t len,
     SDL_UnlockMutex(audio->mixer_lock);
 }
 
-static void
-HAIKUAUDIO_CloseDevice(_THIS)
+static void HAIKUAUDIO_CloseDevice(_THIS)
 {
     if (_this->hidden->audio_obj) {
         _this->hidden->audio_obj->Stop();
@@ -99,8 +97,7 @@ static const int sig_list[] = {
     SIGHUP, SIGINT, SIGQUIT, SIGPIPE, SIGALRM, SIGTERM, SIGWINCH, 0
 };
 
-static inline void
-MaskSignals(sigset_t * omask)
+static inline void MaskSignals(sigset_t * omask)
 {
     sigset_t mask;
     int i;
@@ -112,15 +109,13 @@ MaskSignals(sigset_t * omask)
     sigprocmask(SIG_BLOCK, &mask, omask);
 }
 
-static inline void
-UnmaskSignals(sigset_t * omask)
+static inline void UnmaskSignals(sigset_t * omask)
 {
     sigprocmask(SIG_SETMASK, omask, NULL);
 }
 
 
-static int
-HAIKUAUDIO_OpenDevice(_THIS, const char *devname)
+static int HAIKUAUDIO_OpenDevice(_THIS, const char *devname)
 {
     media_raw_audio_format format;
     SDL_AudioFormat test_format;
@@ -207,14 +202,12 @@ HAIKUAUDIO_OpenDevice(_THIS, const char *devname)
     return 0;
 }
 
-static void
-HAIKUAUDIO_Deinitialize(void)
+static void HAIKUAUDIO_Deinitialize(void)
 {
     SDL_QuitBeApp();
 }
 
-static SDL_bool
-HAIKUAUDIO_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool HAIKUAUDIO_Init(SDL_AudioDriverImpl * impl)
 {
     /* Initialize the Be Application, if it's not already started */
     if (SDL_InitBeApp() < 0) {

src/audio/haiku/SDL_haikuaudio.h

@@ -26,7 +26,7 @@
 #include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the audio functions */
-#define _THIS   SDL_AudioDevice *_this
+#define _THIS SDL_AudioDevice *_this
 
 struct SDL_PrivateAudioData
 {

src/audio/jack/SDL_jackaudio.c

@@ -26,36 +26,33 @@
 #include "SDL_jackaudio.h"
 #include "../../thread/SDL_systhread.h"
 
-
-static jack_client_t * (*JACK_jack_client_open) (const char *, jack_options_t, jack_status_t *, ...);
-static int (*JACK_jack_client_close) (jack_client_t *);
-static void (*JACK_jack_on_shutdown) (jack_client_t *, JackShutdownCallback, void *);
-static int (*JACK_jack_activate) (jack_client_t *);
-static int (*JACK_jack_deactivate) (jack_client_t *);
-static void * (*JACK_jack_port_get_buffer) (jack_port_t *, jack_nframes_t);
-static int (*JACK_jack_port_unregister) (jack_client_t *, jack_port_t *);
-static void (*JACK_jack_free) (void *);
-static const char ** (*JACK_jack_get_ports) (jack_client_t *, const char *, const char *, unsigned long);
-static jack_nframes_t (*JACK_jack_get_sample_rate) (jack_client_t *);
-static jack_nframes_t (*JACK_jack_get_buffer_size) (jack_client_t *);
-static jack_port_t * (*JACK_jack_port_register) (jack_client_t *, const char *, const char *, unsigned long, unsigned long);
-static jack_port_t * (*JACK_jack_port_by_name) (jack_client_t *, const char *);
-static const char * (*JACK_jack_port_name) (const jack_port_t *);
-static const char * (*JACK_jack_port_type) (const jack_port_t *);
-static int (*JACK_jack_connect) (jack_client_t *, const char *, const char *);
-static int (*JACK_jack_set_process_callback) (jack_client_t *, JackProcessCallback, void *);
+static jack_client_t *(*JACK_jack_client_open)(const char *, jack_options_t, jack_status_t *, ...);
+static int (*JACK_jack_client_close)(jack_client_t *);
+static void (*JACK_jack_on_shutdown)(jack_client_t *, JackShutdownCallback, void *);
+static int (*JACK_jack_activate)(jack_client_t *);
+static int (*JACK_jack_deactivate)(jack_client_t *);
+static void *(*JACK_jack_port_get_buffer)(jack_port_t *, jack_nframes_t);
+static int (*JACK_jack_port_unregister)(jack_client_t *, jack_port_t *);
+static void (*JACK_jack_free)(void *);
+static const char **(*JACK_jack_get_ports)(jack_client_t *, const char *, const char *, unsigned long);
+static jack_nframes_t (*JACK_jack_get_sample_rate)(jack_client_t *);
+static jack_nframes_t (*JACK_jack_get_buffer_size)(jack_client_t *);
+static jack_port_t *(*JACK_jack_port_register)(jack_client_t *, const char *, const char *, unsigned long, unsigned long);
+static jack_port_t *(*JACK_jack_port_by_name)(jack_client_t *, const char *);
+static const char *(*JACK_jack_port_name)(const jack_port_t *);
+static const char *(*JACK_jack_port_type)(const jack_port_t *);
+static int (*JACK_jack_connect)(jack_client_t *, const char *, const char *);
+static int (*JACK_jack_set_process_callback)(jack_client_t *, JackProcessCallback, void *);
 
 static int load_jack_syms(void);
 
-
 #ifdef SDL_AUDIO_DRIVER_JACK_DYNAMIC
 
 static const char *jack_library = SDL_AUDIO_DRIVER_JACK_DYNAMIC;
 static void *jack_handle = NULL;
 
 /* !!! FIXME: this is copy/pasted in several places now */
-static int
-load_jack_sym(const char *fn, void **addr)
+static int load_jack_sym(const char *fn, void **addr)
 {
     *addr = SDL_LoadFunction(jack_handle, fn);
     if (*addr == NULL) {
@@ -67,11 +64,11 @@ load_jack_sym(const char *fn, void **addr)
 }
 
 /* cast funcs to char* first, to please GCC's strict aliasing rules. */
-#define SDL_JACK_SYM(x) \
-    if (!load_jack_sym(#x, (void **) (char *) &JACK_##x)) return -1
+#define SDL_JACK_SYM(x)                                 \
+    if (!load_jack_sym(#x, (void **)(char *)&JACK_##x)) \
+    return -1
 
-static void
-UnloadJackLibrary(void)
+static void UnloadJackLibrary(void)
 {
     if (jack_handle != NULL) {
         SDL_UnloadObject(jack_handle);
@@ -79,8 +76,7 @@ UnloadJackLibrary(void)
     }
 }
 
-static int
-LoadJackLibrary(void)
+static int LoadJackLibrary(void)
 {
     int retval = 0;
     if (jack_handle == NULL) {
@@ -102,13 +98,11 @@ LoadJackLibrary(void)
 
 #define SDL_JACK_SYM(x) JACK_##x = x
 
-static void
-UnloadJackLibrary(void)
+static void UnloadJackLibrary(void)
 {
 }
 
-static int
-LoadJackLibrary(void)
+static int LoadJackLibrary(void)
 {
     load_jack_syms();
     return 0;
@@ -116,9 +110,7 @@ LoadJackLibrary(void)
 
 #endif /* SDL_AUDIO_DRIVER_JACK_DYNAMIC */
 
-
-static int
-load_jack_syms(void)
+static int load_jack_syms(void)
 {
     SDL_JACK_SYM(jack_client_open);
     SDL_JACK_SYM(jack_client_close);
@@ -140,23 +132,20 @@ load_jack_syms(void)
     return 0;
 }
 
-
-static void
-jackShutdownCallback(void *arg)  /* JACK went away; device is lost. */
+static void jackShutdownCallback(void *arg) /* JACK went away; device is lost. */
 {
-    SDL_AudioDevice *this = (SDL_AudioDevice *) arg;
+    SDL_AudioDevice *this = (SDL_AudioDevice *)arg;
     SDL_OpenedAudioDeviceDisconnected(this);
-    SDL_SemPost(this->hidden->iosem);  /* unblock the SDL thread. */
+    SDL_SemPost(this->hidden->iosem); /* unblock the SDL thread. */
 }
 
 // !!! FIXME: implement and register these!
-//typedef int(* JackSampleRateCallback)(jack_nframes_t nframes, void *arg)
-//typedef int(* JackBufferSizeCallback)(jack_nframes_t nframes, void *arg)
+// typedef int(* JackSampleRateCallback)(jack_nframes_t nframes, void *arg)
+// typedef int(* JackBufferSizeCallback)(jack_nframes_t nframes, void *arg)
 
-static int
-jackProcessPlaybackCallback(jack_nframes_t nframes, void *arg)
+static int jackProcessPlaybackCallback(jack_nframes_t nframes, void *arg)
 {
-    SDL_AudioDevice *this = (SDL_AudioDevice *) arg;
+    SDL_AudioDevice *this = (SDL_AudioDevice *)arg;
     jack_port_t **ports = this->hidden->sdlports;
     const int total_channels = this->spec.channels;
     const int total_frames = this->spec.samples;
@@ -168,9 +157,9 @@ jackProcessPlaybackCallback(jack_nframes_t nframes, void *arg)
     }
 
     for (channelsi = 0; channelsi < total_channels; channelsi++) {
-        float *dst = (float *) JACK_jack_port_get_buffer(ports[channelsi], nframes);
+        float *dst = (float *)JACK_jack_port_get_buffer(ports[channelsi], nframes);
         if (dst) {
-            const float *src = ((float *) this->hidden->iobuffer) + channelsi;
+            const float *src = ((float *)this->hidden->iobuffer) + channelsi;
             int framesi;
             for (framesi = 0; framesi < total_frames; framesi++) {
                 *(dst++) = *src;
@@ -179,14 +168,12 @@ jackProcessPlaybackCallback(jack_nframes_t nframes, void *arg)
         }
     }
 
-    SDL_SemPost(this->hidden->iosem);  /* tell SDL thread we're done; refill the buffer. */
-    return 0;  /* success */
+    SDL_SemPost(this->hidden->iosem); /* tell SDL thread we're done; refill the buffer. */
+    return 0;
 }
 
-
 /* This function waits until it is possible to write a full sound buffer */
-static void
-JACK_WaitDevice(_THIS)
+static void JACK_WaitDevice(_THIS)
 {
     if (SDL_AtomicGet(&this->enabled)) {
         if (SDL_SemWait(this->hidden->iosem) == -1) {
@@ -195,27 +182,24 @@ JACK_WaitDevice(_THIS)
     }
 }
 
-static Uint8 *
-JACK_GetDeviceBuf(_THIS)
+static Uint8 *JACK_GetDeviceBuf(_THIS)
 {
-    return (Uint8 *) this->hidden->iobuffer;
+    return (Uint8 *)this->hidden->iobuffer;
 }
 
-
-static int
-jackProcessCaptureCallback(jack_nframes_t nframes, void *arg)
+static int jackProcessCaptureCallback(jack_nframes_t nframes, void *arg)
 {
-    SDL_AudioDevice *this = (SDL_AudioDevice *) arg;
+    SDL_AudioDevice *this = (SDL_AudioDevice *)arg;
     if (SDL_AtomicGet(&this->enabled)) {
         jack_port_t **ports = this->hidden->sdlports;
         const int total_channels = this->spec.channels;
         const int total_frames = this->spec.samples;
         int channelsi;
-    
+
         for (channelsi = 0; channelsi < total_channels; channelsi++) {
-            const float *src = (const float *) JACK_jack_port_get_buffer(ports[channelsi], nframes);
+            const float *src = (const float *)JACK_jack_port_get_buffer(ports[channelsi], nframes);
             if (src) {
-                float *dst = ((float *) this->hidden->iobuffer) + channelsi;
+                float *dst = ((float *)this->hidden->iobuffer) + channelsi;
                 int framesi;
                 for (framesi = 0; framesi < total_frames; framesi++) {
                     *dst = *(src++);
@@ -225,14 +209,13 @@ jackProcessCaptureCallback(jack_nframes_t nframes, void *arg)
         }
     }
 
-    SDL_SemPost(this->hidden->iosem);  /* tell SDL thread we're done; new buffer is ready! */
-    return 0;  /* success */
+    SDL_SemPost(this->hidden->iosem); /* tell SDL thread we're done; new buffer is ready! */
+    return 0;
 }
 
-static int
-JACK_CaptureFromDevice(_THIS, void *buffer, int buflen)
+static int JACK_CaptureFromDevice(_THIS, void *buffer, int buflen)
 {
-    SDL_assert(buflen == this->spec.size);  /* we always fill a full buffer. */
+    SDL_assert(buflen == this->spec.size); /* we always fill a full buffer. */
 
     /* Wait for JACK to fill the iobuffer */
     if (SDL_SemWait(this->hidden->iosem) == -1) {
@@ -243,15 +226,12 @@ JACK_CaptureFromDevice(_THIS, void *buffer, int buflen)
     return buflen;
 }
 
-static void
-JACK_FlushCapture(_THIS)
+static void JACK_FlushCapture(_THIS)
 {
     SDL_SemWait(this->hidden->iosem);
 }
 
-
-static void
-JACK_CloseDevice(_THIS)
+static void JACK_CloseDevice(_THIS)
 {
     if (this->hidden->client) {
         JACK_jack_deactivate(this->hidden->client);
@@ -276,8 +256,7 @@ JACK_CloseDevice(_THIS)
     SDL_free(this->hidden);
 }
 
-static int
-JACK_OpenDevice(_THIS, const char *devname)
+static int JACK_OpenDevice(_THIS, const char *devname)
 {
     /* Note that JACK uses "output" for capture devices (they output audio
         data to us) and "input" for playback (we input audio data to them).
@@ -297,7 +276,7 @@ JACK_OpenDevice(_THIS, const char *devname)
     int i;
 
     /* Initialize all variables that we clean on shutdown */
-    this->hidden = (struct SDL_PrivateAudioData *) SDL_calloc(1, sizeof (*this->hidden));
+    this->hidden = (struct SDL_PrivateAudioData *)SDL_calloc(1, sizeof(*this->hidden));
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
@@ -325,7 +304,7 @@ JACK_OpenDevice(_THIS, const char *devname)
         const char *type = JACK_jack_port_type(dport);
         const int len = SDL_strlen(type);
         /* See if type ends with "audio" */
-        if (len >= 5 && !SDL_memcmp(type+len-5, "audio", 5)) {
+        if (len >= 5 && !SDL_memcmp(type + len - 5, "audio", 5)) {
             audio_ports[channels++] = i;
         }
     }
@@ -333,7 +312,6 @@ JACK_OpenDevice(_THIS, const char *devname)
         return SDL_SetError("No physical JACK ports available");
     }
 
-
     /* !!! FIXME: docs say about buffer size: "This size may change, clients that depend on it must register a bufsize_callback so they will be notified if it does." */
 
     /* Jack pretty much demands what it wants. */
@@ -346,23 +324,23 @@ JACK_OpenDevice(_THIS, const char *devname)
 
     this->hidden->iosem = SDL_CreateSemaphore(0);
     if (!this->hidden->iosem) {
-        return -1;  /* error was set by SDL_CreateSemaphore */
+        return -1; /* error was set by SDL_CreateSemaphore */
     }
 
-    this->hidden->iobuffer = (float *) SDL_calloc(1, this->spec.size);
+    this->hidden->iobuffer = (float *)SDL_calloc(1, this->spec.size);
     if (!this->hidden->iobuffer) {
         return SDL_OutOfMemory();
     }
 
     /* Build SDL's ports, which we will connect to the device ports. */
-    this->hidden->sdlports = (jack_port_t **) SDL_calloc(channels, sizeof (jack_port_t *));
+    this->hidden->sdlports = (jack_port_t **)SDL_calloc(channels, sizeof(jack_port_t *));
     if (this->hidden->sdlports == NULL) {
         return SDL_OutOfMemory();
     }
 
     for (i = 0; i < channels; i++) {
         char portname[32];
-        SDL_snprintf(portname, sizeof (portname), "sdl_jack_%s_%d", sdlportstr, i);
+        SDL_snprintf(portname, sizeof(portname), "sdl_jack_%s_%d", sdlportstr, i);
         this->hidden->sdlports[i] = JACK_jack_port_register(client, portname, JACK_DEFAULT_AUDIO_TYPE, sdlportflags, 0);
         if (this->hidden->sdlports[i] == NULL) {
             return SDL_SetError("jack_port_register failed");
@@ -397,14 +375,12 @@ JACK_OpenDevice(_THIS, const char *devname)
     return 0;
 }
 
-static void
-JACK_Deinitialize(void)
+static void JACK_Deinitialize(void)
 {
     UnloadJackLibrary();
 }
 
-static SDL_bool
-JACK_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool JACK_Init(SDL_AudioDriverImpl *impl)
 {
     if (LoadJackLibrary() < 0) {
         return SDL_FALSE;
@@ -431,7 +407,7 @@ JACK_Init(SDL_AudioDriverImpl * impl)
     impl->OnlyHasDefaultCaptureDevice = SDL_TRUE;
     impl->HasCaptureSupport = SDL_TRUE;
 
-    return SDL_TRUE;   /* this audio target is available. */
+    return SDL_TRUE; /* this audio target is available. */
 }
 
 AudioBootStrap JACK_bootstrap = {

src/audio/n3ds/SDL_n3dsaudio.c

@@ -22,7 +22,6 @@
 
 #ifdef SDL_AUDIO_DRIVER_N3DS
 
-
 /* N3DS Audio driver */
 
 #include "../SDL_sysaudio.h"
@@ -36,32 +35,27 @@ static SDL_AudioDevice *audio_device;
 static void FreePrivateData(_THIS);
 static int FindAudioFormat(_THIS);
 
-static SDL_INLINE void
-contextLock(_THIS)
+static SDL_INLINE void contextLock(_THIS)
 {
     LightLock_Lock(&this->hidden->lock);
 }
 
-static SDL_INLINE void
-contextUnlock(_THIS)
+static SDL_INLINE void contextUnlock(_THIS)
 {
     LightLock_Unlock(&this->hidden->lock);
 }
 
-static void
-N3DSAUD_LockAudio(_THIS)
+static void N3DSAUD_LockAudio(_THIS)
 {
     contextLock(this);
 }
 
-static void
-N3DSAUD_UnlockAudio(_THIS)
+static void N3DSAUD_UnlockAudio(_THIS)
 {
     contextUnlock(this);
 }
 
-static void
-N3DSAUD_DspHook(DSP_HookType hook)
+static void N3DSAUD_DspHook(DSP_HookType hook)
 {
     if (hook == DSPHOOK_ONCANCEL) {
         contextLock(audio_device);
@@ -72,12 +66,11 @@ N3DSAUD_DspHook(DSP_HookType hook)
     }
 }
 
-static void
-AudioFrameFinished(void *device)
+static void AudioFrameFinished(void *device)
 {
     bool shouldBroadcast = false;
     unsigned i;
-    SDL_AudioDevice *this = (SDL_AudioDevice *) device;
+    SDL_AudioDevice *this = (SDL_AudioDevice *)device;
 
     contextLock(this);
 
@@ -95,13 +88,12 @@ AudioFrameFinished(void *device)
     contextUnlock(this);
 }
 
-static int
-N3DSAUDIO_OpenDevice(_THIS, const char *devname)
+static int N3DSAUDIO_OpenDevice(_THIS, const char *devname)
 {
     Result ndsp_init_res;
     Uint8 *data_vaddr;
     float mix[12];
-    this->hidden = (struct SDL_PrivateAudioData *) SDL_calloc(1, sizeof *this->hidden);
+    this->hidden = (struct SDL_PrivateAudioData *)SDL_calloc(1, sizeof *this->hidden);
 
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
@@ -140,14 +132,14 @@ N3DSAUDIO_OpenDevice(_THIS, const char *devname)
     }
 
     this->hidden->mixlen = this->spec.size;
-    this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->spec.size);
+    this->hidden->mixbuf = (Uint8 *)SDL_malloc(this->spec.size);
     if (this->hidden->mixbuf == NULL) {
         return SDL_OutOfMemory();
     }
 
     SDL_memset(this->hidden->mixbuf, this->spec.silence, this->spec.size);
 
-    data_vaddr = (Uint8 *) linearAlloc(this->hidden->mixlen * NUM_BUFFERS);
+    data_vaddr = (Uint8 *)linearAlloc(this->hidden->mixlen * NUM_BUFFERS);
     if (data_vaddr == NULL) {
         return SDL_OutOfMemory();
     }
@@ -186,8 +178,7 @@ N3DSAUDIO_OpenDevice(_THIS, const char *devname)
     return 0;
 }
 
-static int
-N3DSAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
+static int N3DSAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
 {
     /* Delay to make this sort of simulate real audio input. */
     SDL_Delay((this->spec.samples * 1000) / this->spec.freq);
@@ -197,8 +188,7 @@ N3DSAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
     return buflen;
 }
 
-static void
-N3DSAUDIO_PlayDevice(_THIS)
+static void N3DSAUDIO_PlayDevice(_THIS)
 {
     size_t nextbuf;
     size_t sampleLen;
@@ -217,15 +207,14 @@ N3DSAUDIO_PlayDevice(_THIS)
 
     contextUnlock(this);
 
-    memcpy((void *) this->hidden->waveBuf[nextbuf].data_vaddr,
+    memcpy((void *)this->hidden->waveBuf[nextbuf].data_vaddr,
            this->hidden->mixbuf, sampleLen);
     DSP_FlushDataCache(this->hidden->waveBuf[nextbuf].data_vaddr, sampleLen);
 
     ndspChnWaveBufAdd(0, &this->hidden->waveBuf[nextbuf]);
 }
 
-static void
-N3DSAUDIO_WaitDevice(_THIS)
+static void N3DSAUDIO_WaitDevice(_THIS)
 {
     contextLock(this);
     while (!this->hidden->isCancelled &&
@@ -235,14 +224,12 @@ N3DSAUDIO_WaitDevice(_THIS)
     contextUnlock(this);
 }
 
-static Uint8 *
-N3DSAUDIO_GetDeviceBuf(_THIS)
+static Uint8 *N3DSAUDIO_GetDeviceBuf(_THIS)
 {
     return this->hidden->mixbuf;
 }
 
-static void
-N3DSAUDIO_CloseDevice(_THIS)
+static void N3DSAUDIO_CloseDevice(_THIS)
 {
     contextLock(this);
 
@@ -262,8 +249,7 @@ N3DSAUDIO_CloseDevice(_THIS)
     FreePrivateData(this);
 }
 
-static void
-N3DSAUDIO_ThreadInit(_THIS)
+static void N3DSAUDIO_ThreadInit(_THIS)
 {
     s32 current_priority;
     svcGetThreadPriority(&current_priority, CUR_THREAD_HANDLE);
@@ -273,8 +259,7 @@ N3DSAUDIO_ThreadInit(_THIS)
     svcSetThreadPriority(CUR_THREAD_HANDLE, current_priority);
 }
 
-static SDL_bool
-N3DSAUDIO_Init(SDL_AudioDriverImpl *impl)
+static SDL_bool N3DSAUDIO_Init(SDL_AudioDriverImpl *impl)
 {
     /* Set the function pointers */
     impl->OpenDevice = N3DSAUDIO_OpenDevice;
@@ -304,15 +289,14 @@ AudioBootStrap N3DSAUDIO_bootstrap = {
 /**
  * Cleans up all allocated memory, safe to call with null pointers
  */
-static void
-FreePrivateData(_THIS)
+static void FreePrivateData(_THIS)
 {
     if (!this->hidden) {
         return;
     }
 
     if (this->hidden->waveBuf[0].data_vaddr) {
-        linearFree((void *) this->hidden->waveBuf[0].data_vaddr);
+        linearFree((void *)this->hidden->waveBuf[0].data_vaddr);
     }
 
     if (this->hidden->mixbuf) {
@@ -324,8 +308,7 @@ FreePrivateData(_THIS)
     this->hidden = NULL;
 }
 
-static int
-FindAudioFormat(_THIS)
+static int FindAudioFormat(_THIS)
 {
     SDL_bool found_valid_format = SDL_FALSE;
     Uint16 test_format = SDL_FirstAudioFormat(this->spec.format);

src/audio/netbsd/SDL_netbsdaudio.c

@@ -43,15 +43,12 @@
 
 /* #define DEBUG_AUDIO */
 
-static void
-NETBSDAUDIO_DetectDevices(void)
+static void NETBSDAUDIO_DetectDevices(void)
 {
     SDL_EnumUnixAudioDevices(0, NULL);
 }
 
-
-static void
-NETBSDAUDIO_Status(_THIS)
+static void NETBSDAUDIO_Status(_THIS)
 {
 #ifdef DEBUG_AUDIO
     /* *INDENT-OFF* */ /* clang-format off */
@@ -117,12 +114,11 @@ NETBSDAUDIO_Status(_THIS)
             this->spec.format,
             this->spec.size);
     /* *INDENT-ON* */ /* clang-format on */
+
 #endif /* DEBUG_AUDIO */
 }
 
-
-static void
-NETBSDAUDIO_PlayDevice(_THIS)
+static void NETBSDAUDIO_PlayDevice(_THIS)
 {
     struct SDL_PrivateAudioData *h = this->hidden;
     int written;
@@ -141,17 +137,14 @@ NETBSDAUDIO_PlayDevice(_THIS)
 #endif
 }
 
-static Uint8 *
-NETBSDAUDIO_GetDeviceBuf(_THIS)
+static Uint8 *NETBSDAUDIO_GetDeviceBuf(_THIS)
 {
     return this->hidden->mixbuf;
 }
 
-
-static int
-NETBSDAUDIO_CaptureFromDevice(_THIS, void *_buffer, int buflen)
+static int NETBSDAUDIO_CaptureFromDevice(_THIS, void *_buffer, int buflen)
 {
-    Uint8 *buffer = (Uint8 *) _buffer;
+    Uint8 *buffer = (Uint8 *)_buffer;
     int br;
 
     br = read(this->hidden->audio_fd, buffer, buflen);
@@ -167,30 +160,28 @@ NETBSDAUDIO_CaptureFromDevice(_THIS, void *_buffer, int buflen)
     return 0;
 }
 
-static void
-NETBSDAUDIO_FlushCapture(_THIS)
+static void NETBSDAUDIO_FlushCapture(_THIS)
 {
     audio_info_t info;
     size_t remain;
     Uint8 buf[512];
 
     if (ioctl(this->hidden->audio_fd, AUDIO_GETINFO, &info) < 0) {
-        return;  /* oh well. */
+        return; /* oh well. */
     }
 
-    remain = (size_t) (info.record.samples * (SDL_AUDIO_BITSIZE(this->spec.format) / 8));
+    remain = (size_t)(info.record.samples * (SDL_AUDIO_BITSIZE(this->spec.format) / 8));
     while (remain > 0) {
-        const size_t len = SDL_min(sizeof (buf), remain);
+        const size_t len = SDL_min(sizeof(buf), remain);
         const int br = read(this->hidden->audio_fd, buf, len);
         if (br <= 0) {
-            return;  /* oh well. */
+            return; /* oh well. */
         }
         remain -= br;
     }
 }
 
-static void
-NETBSDAUDIO_CloseDevice(_THIS)
+static void NETBSDAUDIO_CloseDevice(_THIS)
 {
     if (this->hidden->audio_fd >= 0) {
         close(this->hidden->audio_fd);
@@ -199,8 +190,7 @@ NETBSDAUDIO_CloseDevice(_THIS)
     SDL_free(this->hidden);
 }
 
-static int
-NETBSDAUDIO_OpenDevice(_THIS, const char *devname)
+static int NETBSDAUDIO_OpenDevice(_THIS, const char *devname)
 {
     SDL_bool iscapture = this->iscapture;
     SDL_AudioFormat test_format;
@@ -239,8 +229,7 @@ NETBSDAUDIO_OpenDevice(_THIS, const char *devname)
          * Use the device's native sample rate so the kernel doesn't have to
          * resample.
          */
-        this->spec.freq = iscapture ?
-            hwinfo.record.sample_rate : hwinfo.play.sample_rate;
+        this->spec.freq = iscapture ? hwinfo.record.sample_rate : hwinfo.play.sample_rate;
     }
 #endif
 
@@ -305,7 +294,7 @@ NETBSDAUDIO_OpenDevice(_THIS, const char *devname)
     if (!iscapture) {
         /* Allocate mixing buffer */
         this->hidden->mixlen = this->spec.size;
-        this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
+        this->hidden->mixbuf = (Uint8 *)SDL_malloc(this->hidden->mixlen);
         if (this->hidden->mixbuf == NULL) {
             return SDL_OutOfMemory();
         }
@@ -318,8 +307,7 @@ NETBSDAUDIO_OpenDevice(_THIS, const char *devname)
     return 0;
 }
 
-static SDL_bool
-NETBSDAUDIO_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool NETBSDAUDIO_Init(SDL_AudioDriverImpl *impl)
 {
     /* Set the function pointers */
     impl->DetectDevices = NETBSDAUDIO_DetectDevices;
@@ -333,10 +321,9 @@ NETBSDAUDIO_Init(SDL_AudioDriverImpl * impl)
     impl->HasCaptureSupport = SDL_TRUE;
     impl->AllowsArbitraryDeviceNames = SDL_TRUE;
 
-    return SDL_TRUE;   /* this audio target is available. */
+    return SDL_TRUE; /* this audio target is available. */
 }
 
-
 AudioBootStrap NETBSDAUDIO_bootstrap = {
     "netbsd", "NetBSD audio", NETBSDAUDIO_Init, SDL_FALSE
 };

src/audio/netbsd/SDL_netbsdaudio.h

@@ -25,7 +25,7 @@
 
 #include "../SDL_sysaudio.h"
 
-#define _THIS   SDL_AudioDevice *this
+#define _THIS SDL_AudioDevice *this
 
 struct SDL_PrivateAudioData
 {
@@ -41,7 +41,7 @@ struct SDL_PrivateAudioData
     float next_frame;
 };
 
-#define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */
+#define FUDGE_TICKS 10 /* The scheduler overhead ticks per frame */
 
 #endif /* SDL_netbsdaudio_h_ */
 

src/audio/openslES/SDL_openslES.c

@@ -37,9 +37,9 @@
 #include <android/log.h>
 
 #if 0
-#define LOG_TAG "SDL_openslES"
-#define LOGE(...)  __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)
-#define LOGI(...)  __android_log_print(ANDROID_LOG_INFO,LOG_TAG,__VA_ARGS__)
+#define LOG_TAG   "SDL_openslES"
+#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
+#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
 //#define LOGV(...)  __android_log_print(ANDROID_LOG_VERBOSE,LOG_TAG,__VA_ARGS__)
 #define LOGV(...)
 #else
@@ -69,9 +69,9 @@
 #define SL_SPEAKER_TOP_BACK_RIGHT        ((SLuint32) 0x00020000)
 */
 #define SL_ANDROID_SPEAKER_STEREO (SL_SPEAKER_FRONT_LEFT | SL_SPEAKER_FRONT_RIGHT)
-#define SL_ANDROID_SPEAKER_QUAD (SL_ANDROID_SPEAKER_STEREO | SL_SPEAKER_BACK_LEFT | SL_SPEAKER_BACK_RIGHT)
-#define SL_ANDROID_SPEAKER_5DOT1 (SL_ANDROID_SPEAKER_QUAD | SL_SPEAKER_FRONT_CENTER  | SL_SPEAKER_LOW_FREQUENCY)
-#define SL_ANDROID_SPEAKER_7DOT1 (SL_ANDROID_SPEAKER_5DOT1 | SL_SPEAKER_SIDE_LEFT | SL_SPEAKER_SIDE_RIGHT)
+#define SL_ANDROID_SPEAKER_QUAD   (SL_ANDROID_SPEAKER_STEREO | SL_SPEAKER_BACK_LEFT | SL_SPEAKER_BACK_RIGHT)
+#define SL_ANDROID_SPEAKER_5DOT1  (SL_ANDROID_SPEAKER_QUAD | SL_SPEAKER_FRONT_CENTER | SL_SPEAKER_LOW_FREQUENCY)
+#define SL_ANDROID_SPEAKER_7DOT1  (SL_ANDROID_SPEAKER_5DOT1 | SL_SPEAKER_SIDE_LEFT | SL_SPEAKER_SIDE_RIGHT)
 
 /* engine interfaces */
 static SLObjectItf engineObject = NULL;
@@ -97,8 +97,8 @@ static SLAndroidSimpleBufferQueueItf recorderBufferQueue = NULL;
 static const char *sldevaudiorecorderstr = "SLES Audio Recorder";
 static const char *sldevaudioplayerstr   = "SLES Audio Player";
 
-#define  SLES_DEV_AUDIO_RECORDER  sldevaudiorecorderstr
-#define  SLES_DEV_AUDIO_PLAYER  sldevaudioplayerstr
+#define SLES_DEV_AUDIO_RECORDER sldevaudiorecorderstr
+#define SLES_DEV_AUDIO_PLAYER   sldevaudioplayerstr
 static void openslES_DetectDevices( int iscapture )
 {
     LOGI( "openSLES_DetectDevices()" );
@@ -127,8 +127,7 @@ static void openslES_DestroyEngine(void)
     }
 }
 
-static int
-openslES_CreateEngine(void)
+static int openslES_CreateEngine(void)
 {
     const SLInterfaceID ids[1] = { SL_IID_VOLUME };
     const SLboolean req[1] = { SL_BOOLEAN_FALSE };
@@ -182,17 +181,15 @@ error:
 }
 
 /* this callback handler is called every time a buffer finishes recording */
-static void
-bqRecorderCallback(SLAndroidSimpleBufferQueueItf bq, void *context)
+static void bqRecorderCallback(SLAndroidSimpleBufferQueueItf bq, void *context)
 {
-    struct SDL_PrivateAudioData *audiodata = (struct SDL_PrivateAudioData *) context;
+    struct SDL_PrivateAudioData *audiodata = (struct SDL_PrivateAudioData *)context;
 
     LOGV("SLES: Recording Callback");
     SDL_SemPost(audiodata->playsem);
 }
 
-static void
-openslES_DestroyPCMRecorder(_THIS)
+static void openslES_DestroyPCMRecorder(_THIS)
 {
     struct SDL_PrivateAudioData *audiodata = this->hidden;
     SLresult result;
@@ -223,8 +220,7 @@ openslES_DestroyPCMRecorder(_THIS)
     }
 }
 
-static int
-openslES_CreatePCMRecorder(_THIS)
+static int openslES_CreatePCMRecorder(_THIS)
 {
     struct SDL_PrivateAudioData *audiodata = this->hidden;
     SLDataFormat_PCM format_pcm;
@@ -251,8 +247,8 @@ openslES_CreatePCMRecorder(_THIS)
     SDL_CalculateAudioSpec(&this->spec);
 
     LOGI("Try to open %u hz %u bit chan %u %s samples %u",
-          this->spec.freq, SDL_AUDIO_BITSIZE(this->spec.format),
-          this->spec.channels, (this->spec.format & 0x1000) ? "BE" : "LE", this->spec.samples);
+         this->spec.freq, SDL_AUDIO_BITSIZE(this->spec.format),
+         this->spec.channels, (this->spec.format & 0x1000) ? "BE" : "LE", this->spec.samples);
 
     /* configure audio source */
     loc_dev.locatorType = SL_DATALOCATOR_IODEVICE;
@@ -266,13 +262,13 @@ openslES_CreatePCMRecorder(_THIS)
     loc_bufq.locatorType = SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE;
     loc_bufq.numBuffers = NUM_BUFFERS;
 
-    format_pcm.formatType    = SL_DATAFORMAT_PCM;
-    format_pcm.numChannels   = this->spec.channels;
-    format_pcm.samplesPerSec = this->spec.freq * 1000;  /* / kilo Hz to milli Hz */
+    format_pcm.formatType = SL_DATAFORMAT_PCM;
+    format_pcm.numChannels = this->spec.channels;
+    format_pcm.samplesPerSec = this->spec.freq * 1000; /* / kilo Hz to milli Hz */
     format_pcm.bitsPerSample = SDL_AUDIO_BITSIZE(this->spec.format);
     format_pcm.containerSize = SDL_AUDIO_BITSIZE(this->spec.format);
-    format_pcm.endianness    = SL_BYTEORDER_LITTLEENDIAN;
-    format_pcm.channelMask   = SL_SPEAKER_FRONT_CENTER;
+    format_pcm.endianness = SL_BYTEORDER_LITTLEENDIAN;
+    format_pcm.channelMask = SL_SPEAKER_FRONT_CENTER;
 
     audioSnk.pLocator = &loc_bufq;
     audioSnk.pFormat = &format_pcm;
@@ -322,7 +318,7 @@ openslES_CreatePCMRecorder(_THIS)
     }
 
     /* Create the sound buffers */
-    audiodata->mixbuff = (Uint8 *) SDL_malloc(NUM_BUFFERS * this->spec.size);
+    audiodata->mixbuff = (Uint8 *)SDL_malloc(NUM_BUFFERS * this->spec.size);
     if (audiodata->mixbuff == NULL) {
         LOGE("mixbuffer allocate - out of memory");
         goto failed;
@@ -362,17 +358,15 @@ failed:
 }
 
 /* this callback handler is called every time a buffer finishes playing */
-static void
-bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void *context)
+static void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void *context)
 {
-    struct SDL_PrivateAudioData *audiodata = (struct SDL_PrivateAudioData *) context;
+    struct SDL_PrivateAudioData *audiodata = (struct SDL_PrivateAudioData *)context;
 
     LOGV("SLES: Playback Callback");
     SDL_SemPost(audiodata->playsem);
 }
 
-static void
-openslES_DestroyPCMPlayer(_THIS)
+static void openslES_DestroyPCMPlayer(_THIS)
 {
     struct SDL_PrivateAudioData *audiodata = this->hidden;
     SLresult result;
@@ -404,8 +398,7 @@ openslES_DestroyPCMPlayer(_THIS)
     }
 }
 
-static int
-openslES_CreatePCMPlayer(_THIS)
+static int openslES_CreatePCMPlayer(_THIS)
 {
     struct SDL_PrivateAudioData *audiodata = this->hidden;
     SLDataLocator_AndroidSimpleBufferQueue loc_bufq;
@@ -433,7 +426,7 @@ openslES_CreatePCMPlayer(_THIS)
 
         if (!test_format) {
             /* Didn't find a compatible format : */
-            LOGI( "No compatible audio format, using signed 16-bit audio" );
+            LOGI("No compatible audio format, using signed 16-bit audio");
             test_format = AUDIO_S16SYS;
         }
         this->spec.format = test_format;
@@ -446,16 +439,16 @@ openslES_CreatePCMPlayer(_THIS)
     SDL_CalculateAudioSpec(&this->spec);
 
     LOGI("Try to open %u hz %s %u bit chan %u %s samples %u",
-          this->spec.freq, SDL_AUDIO_ISFLOAT(this->spec.format) ? "float" : "pcm", SDL_AUDIO_BITSIZE(this->spec.format),
-          this->spec.channels, (this->spec.format & 0x1000) ? "BE" : "LE", this->spec.samples);
+         this->spec.freq, SDL_AUDIO_ISFLOAT(this->spec.format) ? "float" : "pcm", SDL_AUDIO_BITSIZE(this->spec.format),
+         this->spec.channels, (this->spec.format & 0x1000) ? "BE" : "LE", this->spec.samples);
 
     /* configure audio source */
     loc_bufq.locatorType = SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE;
     loc_bufq.numBuffers = NUM_BUFFERS;
 
-    format_pcm.formatType    = SL_DATAFORMAT_PCM;
-    format_pcm.numChannels   = this->spec.channels;
-    format_pcm.samplesPerSec = this->spec.freq * 1000;  /* / kilo Hz to milli Hz */
+    format_pcm.formatType = SL_DATAFORMAT_PCM;
+    format_pcm.numChannels = this->spec.channels;
+    format_pcm.samplesPerSec = this->spec.freq * 1000; /* / kilo Hz to milli Hz */
     format_pcm.bitsPerSample = SDL_AUDIO_BITSIZE(this->spec.format);
     format_pcm.containerSize = SDL_AUDIO_BITSIZE(this->spec.format);
 
@@ -465,8 +458,7 @@ openslES_CreatePCMPlayer(_THIS)
         format_pcm.endianness = SL_BYTEORDER_LITTLEENDIAN;
     }
 
-    switch (this->spec.channels)
-    {
+    switch (this->spec.channels) {
     case 1:
         format_pcm.channelMask = SL_SPEAKER_FRONT_LEFT;
         break;
@@ -511,7 +503,7 @@ openslES_CreatePCMPlayer(_THIS)
     }
 
     audioSrc.pLocator = &loc_bufq;
-    audioSrc.pFormat = SDL_AUDIO_ISFLOAT(this->spec.format) ? (void*)&format_pcm_ex : (void*)&format_pcm;
+    audioSrc.pFormat = SDL_AUDIO_ISFLOAT(this->spec.format) ? (void *)&format_pcm_ex : (void *)&format_pcm;
 
     /* configure audio sink */
     loc_outmix.locatorType = SL_DATALOCATOR_OUTPUTMIX;
@@ -572,7 +564,7 @@ openslES_CreatePCMPlayer(_THIS)
     }
 
     /* Create the sound buffers */
-    audiodata->mixbuff = (Uint8 *) SDL_malloc(NUM_BUFFERS * this->spec.size);
+    audiodata->mixbuff = (Uint8 *)SDL_malloc(NUM_BUFFERS * this->spec.size);
     if (audiodata->mixbuff == NULL) {
         LOGE("mixbuffer allocate - out of memory");
         goto failed;
@@ -595,10 +587,9 @@ failed:
     return -1;
 }
 
-static int
-openslES_OpenDevice(_THIS, const char *devname)
+static int openslES_OpenDevice(_THIS, const char *devname)
 {
-    this->hidden = (struct SDL_PrivateAudioData *) SDL_calloc(1, (sizeof *this->hidden));
+    this->hidden = (struct SDL_PrivateAudioData *)SDL_calloc(1, (sizeof *this->hidden));
     if (this->hidden == NULL) {
         return SDL_OutOfMemory();
     }
@@ -624,12 +615,10 @@ openslES_OpenDevice(_THIS, const char *devname)
         } else {
             return SDL_SetError("Open device failed!");
         }
-
     }
 }
 
-static void
-openslES_WaitDevice(_THIS)
+static void openslES_WaitDevice(_THIS)
 {
     struct SDL_PrivateAudioData *audiodata = this->hidden;
 
@@ -639,8 +628,7 @@ openslES_WaitDevice(_THIS)
     SDL_SemWait(audiodata->playsem);
 }
 
-static void
-openslES_PlayDevice(_THIS)
+static void openslES_PlayDevice(_THIS)
 {
     struct SDL_PrivateAudioData *audiodata = this->hidden;
     SLresult result;
@@ -674,8 +662,7 @@ openslES_PlayDevice(_THIS)
 /* */
 /* okay.. */
 
-static Uint8 *
-openslES_GetDeviceBuf(_THIS)
+static Uint8 *openslES_GetDeviceBuf(_THIS)
 {
     struct SDL_PrivateAudioData *audiodata = this->hidden;
 
@@ -683,8 +670,7 @@ openslES_GetDeviceBuf(_THIS)
     return audiodata->pmixbuff[audiodata->next_buffer];
 }
 
-static int
-openslES_CaptureFromDevice(_THIS, void *buffer, int buflen)
+static int openslES_CaptureFromDevice(_THIS, void *buffer, int buflen)
 {
     struct SDL_PrivateAudioData *audiodata = this->hidden;
     SLresult result;
@@ -711,8 +697,7 @@ openslES_CaptureFromDevice(_THIS, void *buffer, int buflen)
     return this->spec.size;
 }
 
-static void
-openslES_CloseDevice(_THIS)
+static void openslES_CloseDevice(_THIS)
 {
     /* struct SDL_PrivateAudioData *audiodata = this->hidden; */
 
@@ -727,8 +712,7 @@ openslES_CloseDevice(_THIS)
     SDL_free(this->hidden);
 }
 
-static SDL_bool
-openslES_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool openslES_Init(SDL_AudioDriverImpl *impl)
 {
     LOGI("openslES_Init() called");
 
@@ -740,13 +724,13 @@ openslES_Init(SDL_AudioDriverImpl * impl)
 
     /* Set the function pointers */
     /* impl->DetectDevices = openslES_DetectDevices; */
-    impl->OpenDevice    = openslES_OpenDevice;
-    impl->WaitDevice    = openslES_WaitDevice;
-    impl->PlayDevice    = openslES_PlayDevice;
-    impl->GetDeviceBuf  = openslES_GetDeviceBuf;
+    impl->OpenDevice = openslES_OpenDevice;
+    impl->WaitDevice = openslES_WaitDevice;
+    impl->PlayDevice = openslES_PlayDevice;
+    impl->GetDeviceBuf = openslES_GetDeviceBuf;
     impl->CaptureFromDevice = openslES_CaptureFromDevice;
-    impl->CloseDevice   = openslES_CloseDevice;
-    impl->Deinitialize  = openslES_DestroyEngine;
+    impl->CloseDevice = openslES_CloseDevice;
+    impl->Deinitialize = openslES_DestroyEngine;
 
     /* and the capabilities */
     impl->HasCaptureSupport = SDL_TRUE;

src/audio/openslES/SDL_openslES.h

@@ -26,15 +26,15 @@
 #include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the audio functions */
-#define _THIS   SDL_AudioDevice *this
+#define _THIS SDL_AudioDevice *this
 
-#define NUM_BUFFERS 2           /* -- Don't lower this! */
+#define NUM_BUFFERS 2 /* -- Don't lower this! */
 
 struct SDL_PrivateAudioData
 {
-    Uint8   *mixbuff;
-    int      next_buffer;
-    Uint8   *pmixbuff[NUM_BUFFERS];
+    Uint8 *mixbuff;
+    int next_buffer;
+    Uint8 *pmixbuff[NUM_BUFFERS];
     SDL_sem *playsem;
 };
 

src/audio/pipewire/SDL_pipewire.c

@@ -74,7 +74,7 @@ enum PW_READY_FLAGS
 {
     PW_READY_FLAG_BUFFER_ADDED = 0x1,
     PW_READY_FLAG_STREAM_READY = 0x2,
-    PW_READY_FLAG_ALL_BITS     = 0x3
+    PW_READY_FLAG_ALL_BITS = 0x3
 };
 
 #define PW_ID_TO_HANDLE(x) (void *)((uintptr_t)x)
@@ -114,17 +114,16 @@ static struct pw_properties *(*PIPEWIRE_pw_properties_new)(const char *, ...)SPA
 static int (*PIPEWIRE_pw_properties_set)(struct pw_properties *, const char *, const char *);
 static int (*PIPEWIRE_pw_properties_setf)(struct pw_properties *, const char *, const char *, ...) SPA_PRINTF_FUNC(3, 4);
 
-static int         pipewire_version_major;
-static int         pipewire_version_minor;
-static int         pipewire_version_patch;
+static int pipewire_version_major;
+static int pipewire_version_minor;
+static int pipewire_version_patch;
 
 #ifdef SDL_AUDIO_DRIVER_PIPEWIRE_DYNAMIC
 
 static const char *pipewire_library = SDL_AUDIO_DRIVER_PIPEWIRE_DYNAMIC;
-static void       *pipewire_handle  = NULL;
+static void *pipewire_handle = NULL;
 
-static int
-pipewire_dlsym(const char *fn, void **addr)
+static int pipewire_dlsym(const char *fn, void **addr)
 {
     *addr = SDL_LoadFunction(pipewire_handle, fn);
     if (*addr == NULL) {
@@ -140,8 +139,7 @@ pipewire_dlsym(const char *fn, void **addr)
         return -1;                                             \
     }
 
-static int
-load_pipewire_library()
+static int load_pipewire_library()
 {
     if ((pipewire_handle = SDL_LoadObject(pipewire_library))) {
         return 0;
@@ -150,8 +148,7 @@ load_pipewire_library()
     return -1;
 }
 
-static void
-unload_pipewire_library()
+static void unload_pipewire_library()
 {
     if (pipewire_handle) {
         SDL_UnloadObject(pipewire_handle);
@@ -163,21 +160,18 @@ unload_pipewire_library()
 
 #define SDL_PIPEWIRE_SYM(x) PIPEWIRE_##x = x
 
-static int
-load_pipewire_library()
+static int load_pipewire_library()
 {
     return 0;
 }
 
-static void
-unload_pipewire_library()
+static void unload_pipewire_library()
 { /* Nothing to do */
 }
 
 #endif /* SDL_AUDIO_DRIVER_PIPEWIRE_DYNAMIC */
 
-static int
-load_pipewire_syms()
+static int load_pipewire_syms()
 {
     SDL_PIPEWIRE_SYM(pw_get_library_version);
     SDL_PIPEWIRE_SYM(pw_init);
@@ -219,8 +213,7 @@ pipewire_version_at_least(int major, int minor, int patch)
            (pipewire_version_major > major || pipewire_version_minor > minor || pipewire_version_patch >= patch);
 }
 
-static int
-init_pipewire_library()
+static int init_pipewire_library()
 {
     if (!load_pipewire_library()) {
         if (!load_pipewire_syms()) {
@@ -242,8 +235,7 @@ init_pipewire_library()
     return -1;
 }
 
-static void
-deinit_pipewire_library()
+static void deinit_pipewire_library()
 {
     PIPEWIRE_pw_deinit();
     unload_pipewire_library();
@@ -254,8 +246,8 @@ struct node_object
 {
     struct spa_list link;
 
-    Uint32   id;
-    int      seq;
+    Uint32 id;
+    int seq;
     SDL_bool persist;
 
     /*
@@ -268,8 +260,8 @@ struct node_object
     void *userdata;
 
     struct pw_proxy *proxy;
-    struct spa_hook  node_listener;
-    struct spa_hook  core_listener;
+    struct spa_hook node_listener;
+    struct spa_hook core_listener;
 };
 
 /* A sink/source node used for stream I/O. */
@@ -277,8 +269,8 @@ struct io_node
 {
     struct spa_list link;
 
-    Uint32        id;
-    SDL_bool      is_capture;
+    Uint32 id;
+    SDL_bool is_capture;
     SDL_AudioSpec spec;
 
     const char *name; /* Friendly name */
@@ -289,26 +281,25 @@ struct io_node
 
 /* The global hotplug thread and associated objects. */
 static struct pw_thread_loop *hotplug_loop;
-static struct pw_core        *hotplug_core;
-static struct pw_context     *hotplug_context;
-static struct pw_registry    *hotplug_registry;
-static struct spa_hook        hotplug_registry_listener;
-static struct spa_hook        hotplug_core_listener;
-static struct spa_list        hotplug_pending_list;
-static struct spa_list        hotplug_io_list;
-static int                    hotplug_init_seq_val;
-static SDL_bool               hotplug_init_complete;
-static SDL_bool               hotplug_events_enabled;
-
-static char *pipewire_default_sink_id   = NULL;
+static struct pw_core *hotplug_core;
+static struct pw_context *hotplug_context;
+static struct pw_registry *hotplug_registry;
+static struct spa_hook hotplug_registry_listener;
+static struct spa_hook hotplug_core_listener;
+static struct spa_list hotplug_pending_list;
+static struct spa_list hotplug_io_list;
+static int hotplug_init_seq_val;
+static SDL_bool hotplug_init_complete;
+static SDL_bool hotplug_events_enabled;
+
+static char *pipewire_default_sink_id = NULL;
 static char *pipewire_default_source_id = NULL;
 
 /* The active node list */
-static SDL_bool
-io_list_check_add(struct io_node *node)
+static SDL_bool io_list_check_add(struct io_node *node)
 {
     struct io_node *n;
-    SDL_bool        ret = SDL_TRUE;
+    SDL_bool ret = SDL_TRUE;
 
     /* See if the node is already in the list */
     spa_list_for_each (n, &hotplug_io_list, link) {
@@ -330,8 +321,7 @@ dup_found:
     return ret;
 }
 
-static void
-io_list_remove(Uint32 id)
+static void io_list_remove(Uint32 id)
 {
     struct io_node *n, *temp;
 
@@ -351,8 +341,7 @@ io_list_remove(Uint32 id)
     }
 }
 
-static void
-io_list_sort()
+static void io_list_sort()
 {
     struct io_node *default_sink = NULL, *default_source = NULL;
     struct io_node *n, *temp;
@@ -377,8 +366,7 @@ io_list_sort()
     }
 }
 
-static void
-io_list_clear()
+static void io_list_clear()
 {
     struct io_node *n, *temp;
 
@@ -388,7 +376,7 @@ io_list_clear()
     }
 }
 
-static struct io_node*
+static struct io_node *
 io_list_get_by_id(Uint32 id)
 {
     struct io_node *n, *temp;
@@ -400,7 +388,7 @@ io_list_get_by_id(Uint32 id)
     return NULL;
 }
 
-static struct io_node*
+static struct io_node *
 io_list_get_by_path(char *path)
 {
     struct io_node *n, *temp;
@@ -412,8 +400,7 @@ io_list_get_by_path(char *path)
     return NULL;
 }
 
-static void
-node_object_destroy(struct node_object *node)
+static void node_object_destroy(struct node_object *node)
 {
     SDL_assert(node);
 
@@ -425,15 +412,13 @@ node_object_destroy(struct node_object *node)
 }
 
 /* The pending node list */
-static void
-pending_list_add(struct node_object *node)
+static void pending_list_add(struct node_object *node)
 {
     SDL_assert(node);
     spa_list_append(&hotplug_pending_list, &node->link);
 }
 
-static void
-pending_list_remove(Uint32 id)
+static void pending_list_remove(Uint32 id)
 {
     struct node_object *node, *temp;
 
@@ -444,8 +429,7 @@ pending_list_remove(Uint32 id)
     }
 }
 
-static void
-pending_list_clear()
+static void pending_list_clear()
 {
     struct node_object *node, *temp;
 
@@ -454,10 +438,9 @@ pending_list_clear()
     }
 }
 
-static void *
-node_object_new(Uint32 id, const char *type, Uint32 version, const void *funcs, const struct pw_core_events *core_events)
+static void *node_object_new(Uint32 id, const char *type, Uint32 version, const void *funcs, const struct pw_core_events *core_events)
 {
-    struct pw_proxy    *proxy;
+    struct pw_proxy *proxy;
     struct node_object *node;
 
     /* Create the proxy object */
@@ -470,7 +453,7 @@ node_object_new(Uint32 id, const char *type, Uint32 version, const void *funcs,
     node = PIPEWIRE_pw_proxy_get_user_data(proxy);
     SDL_zerop(node);
 
-    node->id    = id;
+    node->id = id;
     node->proxy = proxy;
 
     /* Add the callbacks */
@@ -484,8 +467,7 @@ node_object_new(Uint32 id, const char *type, Uint32 version, const void *funcs,
 }
 
 /* Core sync points */
-static void
-core_events_hotplug_init_callback(void *object, uint32_t id, int seq)
+static void core_events_hotplug_init_callback(void *object, uint32_t id, int seq)
 {
     if (id == PW_ID_CORE && seq == hotplug_init_seq_val) {
         /* This core listener is no longer needed. */
@@ -497,11 +479,10 @@ core_events_hotplug_init_callback(void *object, uint32_t id, int seq)
     }
 }
 
-static void
-core_events_interface_callback(void *object, uint32_t id, int seq)
+static void core_events_interface_callback(void *object, uint32_t id, int seq)
 {
     struct node_object *node = object;
-    struct io_node     *io   = node->userdata;
+    struct io_node *io = node->userdata;
 
     if (id == PW_ID_CORE && seq == node->seq) {
         /*
@@ -516,8 +497,7 @@ core_events_interface_callback(void *object, uint32_t id, int seq)
     }
 }
 
-static void
-core_events_metadata_callback(void *object, uint32_t id, int seq)
+static void core_events_metadata_callback(void *object, uint32_t id, int seq)
 {
     struct node_object *node = object;
 
@@ -527,11 +507,10 @@ core_events_metadata_callback(void *object, uint32_t id, int seq)
 }
 
 static const struct pw_core_events hotplug_init_core_events = { PW_VERSION_CORE_EVENTS, .done = core_events_hotplug_init_callback };
-static const struct pw_core_events interface_core_events    = { PW_VERSION_CORE_EVENTS, .done = core_events_interface_callback };
-static const struct pw_core_events metadata_core_events     = { PW_VERSION_CORE_EVENTS, .done = core_events_metadata_callback };
+static const struct pw_core_events interface_core_events = { PW_VERSION_CORE_EVENTS, .done = core_events_interface_callback };
+static const struct pw_core_events metadata_core_events = { PW_VERSION_CORE_EVENTS, .done = core_events_metadata_callback };
 
-static void
-hotplug_core_sync(struct node_object *node)
+static void hotplug_core_sync(struct node_object *node)
 {
     /*
      * Node sync events *must* come before the hotplug init sync events or the initial
@@ -547,12 +526,11 @@ hotplug_core_sync(struct node_object *node)
 }
 
 /* Helpers for retrieving values from params */
-static SDL_bool
-get_range_param(const struct spa_pod *param, Uint32 key, int *def, int *min, int *max)
+static SDL_bool get_range_param(const struct spa_pod *param, Uint32 key, int *def, int *min, int *max)
 {
     const struct spa_pod_prop *prop;
-    struct spa_pod            *value;
-    Uint32                     n_values, choice;
+    struct spa_pod *value;
+    Uint32 n_values, choice;
 
     prop = spa_pod_find_prop(param, NULL, key);
 
@@ -581,11 +559,10 @@ get_range_param(const struct spa_pod *param, Uint32 key, int *def, int *min, int
     return SDL_FALSE;
 }
 
-static SDL_bool
-get_int_param(const struct spa_pod *param, Uint32 key, int *val)
+static SDL_bool get_int_param(const struct spa_pod *param, Uint32 key, int *val)
 {
     const struct spa_pod_prop *prop;
-    Sint32                     v;
+    Sint32 v;
 
     prop = spa_pod_find_prop(param, NULL, key);
 
@@ -601,13 +578,12 @@ get_int_param(const struct spa_pod *param, Uint32 key, int *val)
 }
 
 /* Interface node callbacks */
-static void
-node_event_info(void *object, const struct pw_node_info *info)
+static void node_event_info(void *object, const struct pw_node_info *info)
 {
     struct node_object *node = object;
-    struct io_node     *io   = node->userdata;
-    const char         *prop_val;
-    Uint32              i;
+    struct io_node *io = node->userdata;
+    const char *prop_val;
+    Uint32 i;
 
     if (info) {
         prop_val = spa_dict_lookup(info->props, PW_KEY_AUDIO_CHANNELS);
@@ -624,11 +600,10 @@ node_event_info(void *object, const struct pw_node_info *info)
     }
 }
 
-static void
-node_event_param(void *object, int seq, uint32_t id, uint32_t index, uint32_t next, const struct spa_pod *param)
+static void node_event_param(void *object, int seq, uint32_t id, uint32_t index, uint32_t next, const struct spa_pod *param)
 {
     struct node_object *node = object;
-    struct io_node     *io   = node->userdata;
+    struct io_node *io = node->userdata;
 
     /* Get the default frequency */
     if (io->spec.freq == 0) {
@@ -650,8 +625,7 @@ node_event_param(void *object, int seq, uint32_t id, uint32_t index, uint32_t ne
 static const struct pw_node_events interface_node_events = { PW_VERSION_NODE_EVENTS, .info = node_event_info,
                                                              .param = node_event_param };
 
-static char*
-get_name_from_json(const char *json)
+static char *get_name_from_json(const char *json)
 {
     struct spa_json parser[2];
     char key[7]; /* "name" */
@@ -673,8 +647,7 @@ get_name_from_json(const char *json)
 }
 
 /* Metadata node callback */
-static int
-metadata_property(void *object, Uint32 subject, const char *key, const char *type, const char *value)
+static int metadata_property(void *object, Uint32 subject, const char *key, const char *type, const char *value)
 {
     struct node_object *node = object;
 
@@ -700,9 +673,8 @@ metadata_property(void *object, Uint32 subject, const char *key, const char *typ
 static const struct pw_metadata_events metadata_node_events = { PW_VERSION_METADATA_EVENTS, .property = metadata_property };
 
 /* Global registry callbacks */
-static void
-registry_event_global_callback(void *object, uint32_t id, uint32_t permissions, const char *type, uint32_t version,
-                               const struct spa_dict *props)
+static void registry_event_global_callback(void *object, uint32_t id, uint32_t permissions, const char *type, uint32_t version,
+                                           const struct spa_dict *props)
 {
     struct node_object *node;
 
@@ -711,12 +683,12 @@ registry_event_global_callback(void *object, uint32_t id, uint32_t permissions,
         const char *media_class = spa_dict_lookup(props, PW_KEY_MEDIA_CLASS);
 
         if (media_class) {
-            const char     *node_desc;
-            const char     *node_path;
+            const char *node_desc;
+            const char *node_path;
             struct io_node *io;
-            SDL_bool        is_capture;
-            int             desc_buffer_len;
-            int             path_buffer_len;
+            SDL_bool is_capture;
+            int desc_buffer_len;
+            int path_buffer_len;
 
             /* Just want sink and capture */
             if (!SDL_strcasecmp(media_class, "Audio/Sink")) {
@@ -748,11 +720,11 @@ registry_event_global_callback(void *object, uint32_t id, uint32_t permissions,
                 }
 
                 /* Begin setting the node properties */
-                io->id          = id;
-                io->is_capture  = is_capture;
+                io->id = id;
+                io->is_capture = is_capture;
                 io->spec.format = AUDIO_F32; /* Pipewire uses floats internally, other formats require conversion. */
-                io->name        = io->buf;
-                io->path        = io->buf + desc_buffer_len;
+                io->name = io->buf;
+                io->path = io->buf + desc_buffer_len;
                 SDL_strlcpy(io->buf, node_desc, desc_buffer_len);
                 SDL_strlcpy(io->buf + desc_buffer_len, node_path, path_buffer_len);
 
@@ -772,8 +744,7 @@ registry_event_global_callback(void *object, uint32_t id, uint32_t permissions,
     }
 }
 
-static void
-registry_event_remove_callback(void *object, uint32_t id)
+static void registry_event_remove_callback(void *object, uint32_t id)
 {
     io_list_remove(id);
     pending_list_remove(id);
@@ -783,8 +754,7 @@ static const struct pw_registry_events registry_events = { PW_VERSION_REGISTRY_E
                                                            .global_remove = registry_event_remove_callback };
 
 /* The hotplug thread */
-static int
-hotplug_loop_init()
+static int hotplug_loop_init()
 {
     int res;
 
@@ -827,8 +797,7 @@ hotplug_loop_init()
     return 0;
 }
 
-static void
-hotplug_loop_destroy()
+static void hotplug_loop_destroy()
 {
     if (hotplug_loop) {
         PIPEWIRE_pw_thread_loop_stop(hotplug_loop);
@@ -837,7 +806,7 @@ hotplug_loop_destroy()
     pending_list_clear();
     io_list_clear();
 
-    hotplug_init_complete  = SDL_FALSE;
+    hotplug_init_complete = SDL_FALSE;
     hotplug_events_enabled = SDL_FALSE;
 
     if (pipewire_default_sink_id != NULL) {
@@ -870,8 +839,7 @@ hotplug_loop_destroy()
     }
 }
 
-static void
-PIPEWIRE_DetectDevices()
+static void PIPEWIRE_DetectDevices()
 {
     struct io_node *io;
 
@@ -913,11 +881,10 @@ static const enum spa_audio_channel PIPEWIRE_channel_map_8[] = { SPA_AUDIO_CHANN
 
 #define COPY_CHANNEL_MAP(c) SDL_memcpy(info->position, PIPEWIRE_channel_map_##c, sizeof(PIPEWIRE_channel_map_##c))
 
-static void
-initialize_spa_info(const SDL_AudioSpec *spec, struct spa_audio_info_raw *info)
+static void initialize_spa_info(const SDL_AudioSpec *spec, struct spa_audio_info_raw *info)
 {
     info->channels = spec->channels;
-    info->rate     = spec->freq;
+    info->rate = spec->freq;
 
     switch (spec->channels) {
     case 1:
@@ -981,14 +948,13 @@ initialize_spa_info(const SDL_AudioSpec *spec, struct spa_audio_info_raw *info)
     }
 }
 
-static void
-output_callback(void *data)
+static void output_callback(void *data)
 {
-    struct pw_buffer  *pw_buf;
+    struct pw_buffer *pw_buf;
     struct spa_buffer *spa_buf;
-    Uint8             *dst;
+    Uint8 *dst;
 
-    _THIS                    = (SDL_AudioDevice *)data;
+    _THIS = (SDL_AudioDevice *)data;
     struct pw_stream *stream = this->hidden->stream;
 
     /* Shutting down, don't do anything */
@@ -1042,18 +1008,17 @@ output_callback(void *data)
 
     spa_buf->datas[0].chunk->offset = 0;
     spa_buf->datas[0].chunk->stride = this->hidden->stride;
-    spa_buf->datas[0].chunk->size   = this->spec.size;
+    spa_buf->datas[0].chunk->size = this->spec.size;
 
     PIPEWIRE_pw_stream_queue_buffer(stream, pw_buf);
 }
 
-static void
-input_callback(void *data)
+static void input_callback(void *data)
 {
-    struct pw_buffer  *pw_buf;
+    struct pw_buffer *pw_buf;
     struct spa_buffer *spa_buf;
-    Uint8             *src;
-    _THIS                    = (SDL_AudioDevice *)data;
+    Uint8 *src;
+    _THIS = (SDL_AudioDevice *)data;
     struct pw_stream *stream = this->hidden->stream;
 
     /* Shutting down, don't do anything */
@@ -1075,7 +1040,7 @@ input_callback(void *data)
     if (!SDL_AtomicGet(&this->paused)) {
         /* Calculate the offset and data size */
         const Uint32 offset = SPA_MIN(spa_buf->datas[0].chunk->offset, spa_buf->datas[0].maxsize);
-        const Uint32 size   = SPA_MIN(spa_buf->datas[0].chunk->size, spa_buf->datas[0].maxsize - offset);
+        const Uint32 size = SPA_MIN(spa_buf->datas[0].chunk->size, spa_buf->datas[0].maxsize - offset);
 
         src += offset;
 
@@ -1103,8 +1068,7 @@ input_callback(void *data)
     PIPEWIRE_pw_stream_queue_buffer(stream, pw_buf);
 }
 
-static void
-stream_add_buffer_callback(void *data, struct pw_buffer *buffer)
+static void stream_add_buffer_callback(void *data, struct pw_buffer *buffer)
 {
     _THIS = data;
 
@@ -1115,7 +1079,7 @@ stream_add_buffer_callback(void *data, struct pw_buffer *buffer)
          */
         if (this->spec.size > buffer->buffer->datas[0].maxsize) {
             this->spec.samples = buffer->buffer->datas[0].maxsize / this->hidden->stride;
-            this->spec.size    = buffer->buffer->datas[0].maxsize;
+            this->spec.size = buffer->buffer->datas[0].maxsize;
         }
     } else if (this->hidden->buffer == NULL) {
         /*
@@ -1127,15 +1091,14 @@ stream_add_buffer_callback(void *data, struct pw_buffer *buffer)
          * A packet size of 2 periods should be more than is ever needed.
          */
         this->hidden->input_buffer_packet_size = SPA_MAX(this->spec.size, buffer->buffer->datas[0].maxsize) * 2;
-        this->hidden->buffer                   = SDL_NewDataQueue(this->hidden->input_buffer_packet_size, this->hidden->input_buffer_packet_size);
+        this->hidden->buffer = SDL_NewDataQueue(this->hidden->input_buffer_packet_size, this->hidden->input_buffer_packet_size);
     }
 
     this->hidden->stream_init_status |= PW_READY_FLAG_BUFFER_ADDED;
     PIPEWIRE_pw_thread_loop_signal(this->hidden->loop, false);
 }
 
-static void
-stream_state_changed_callback(void *data, enum pw_stream_state old, enum pw_stream_state state, const char *error)
+static void stream_state_changed_callback(void *data, enum pw_stream_state old, enum pw_stream_state state, const char *error)
 {
     _THIS = data;
 
@@ -1150,15 +1113,14 @@ stream_state_changed_callback(void *data, enum pw_stream_state old, enum pw_stre
 
 static const struct pw_stream_events stream_output_events = { PW_VERSION_STREAM_EVENTS,
                                                               .state_changed = stream_state_changed_callback,
-                                                              .add_buffer    = stream_add_buffer_callback,
-                                                              .process       = output_callback };
-static const struct pw_stream_events stream_input_events  = { PW_VERSION_STREAM_EVENTS,
-                                                              .state_changed = stream_state_changed_callback,
-                                                              .add_buffer    = stream_add_buffer_callback,
-                                                              .process       = input_callback };
-
-static int
-PIPEWIRE_OpenDevice(_THIS, const char *devname)
+                                                              .add_buffer = stream_add_buffer_callback,
+                                                              .process = output_callback };
+static const struct pw_stream_events stream_input_events = { PW_VERSION_STREAM_EVENTS,
+                                                             .state_changed = stream_state_changed_callback,
+                                                             .add_buffer = stream_add_buffer_callback,
+                                                             .process = input_callback };
+
+static int PIPEWIRE_OpenDevice(_THIS, const char *devname)
 {
     /*
      * NOTE: The PW_STREAM_FLAG_RT_PROCESS flag can be set to call the stream
@@ -1169,17 +1131,17 @@ PIPEWIRE_OpenDevice(_THIS, const char *devname)
      */
     static const enum pw_stream_flags STREAM_FLAGS = PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_MAP_BUFFERS;
 
-    char                         thread_name[PW_THREAD_NAME_BUFFER_LENGTH];
-    Uint8                        pod_buffer[PW_POD_BUFFER_LENGTH];
-    struct spa_pod_builder       b        = SPA_POD_BUILDER_INIT(pod_buffer, sizeof(pod_buffer));
-    struct spa_audio_info_raw    spa_info = { 0 };
-    const struct spa_pod        *params   = NULL;
+    char thread_name[PW_THREAD_NAME_BUFFER_LENGTH];
+    Uint8 pod_buffer[PW_POD_BUFFER_LENGTH];
+    struct spa_pod_builder b = SPA_POD_BUILDER_INIT(pod_buffer, sizeof(pod_buffer));
+    struct spa_audio_info_raw spa_info = { 0 };
+    const struct spa_pod *params = NULL;
     struct SDL_PrivateAudioData *priv;
-    struct pw_properties        *props;
-    const char                  *app_name, *stream_name, *stream_role, *error;
-    Uint32                       node_id   = this->handle == NULL ? PW_ID_ANY : PW_HANDLE_TO_ID(this->handle);
-    SDL_bool                     iscapture = this->iscapture;
-    int                          res;
+    struct pw_properties *props;
+    const char *app_name, *stream_name, *stream_role, *error;
+    Uint32 node_id = this->handle == NULL ? PW_ID_ANY : PW_HANDLE_TO_ID(this->handle);
+    SDL_bool iscapture = this->iscapture;
+    int res;
 
     /* Clamp the period size to sane values */
     const int min_period = PW_MIN_SAMPLES * SPA_MAX(this->spec.freq / PW_BASE_CLOCK_RATE, 1);
@@ -1223,7 +1185,7 @@ PIPEWIRE_OpenDevice(_THIS, const char *devname)
 
     if (this->spec.samples < min_period) {
         this->spec.samples = min_period;
-        this->spec.size    = this->spec.samples * priv->stride;
+        this->spec.size = this->spec.samples * priv->stride;
     }
 
     SDL_snprintf(thread_name, sizeof(thread_name), "SDLAudio%c%ld", (iscapture) ? 'C' : 'P', (long)this->handle);
@@ -1341,8 +1303,7 @@ static void PIPEWIRE_CloseDevice(_THIS)
     SDL_free(this->hidden);
 }
 
-static int
-PIPEWIRE_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
+static int PIPEWIRE_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
 {
     struct io_node *node;
     char *target;
@@ -1380,8 +1341,7 @@ failed:
     return ret;
 }
 
-static void
-PIPEWIRE_Deinitialize()
+static void PIPEWIRE_Deinitialize()
 {
     if (pipewire_initialized) {
         hotplug_loop_destroy();
@@ -1390,8 +1350,7 @@ PIPEWIRE_Deinitialize()
     }
 }
 
-static SDL_bool
-PIPEWIRE_Init(SDL_AudioDriverImpl *impl)
+static SDL_bool PIPEWIRE_Init(SDL_AudioDriverImpl *impl)
 {
     if (!pipewire_initialized) {
         if (init_pipewire_library() < 0) {
@@ -1407,15 +1366,15 @@ PIPEWIRE_Init(SDL_AudioDriverImpl *impl)
     }
 
     /* Set the function pointers */
-    impl->DetectDevices       = PIPEWIRE_DetectDevices;
-    impl->OpenDevice          = PIPEWIRE_OpenDevice;
-    impl->CloseDevice         = PIPEWIRE_CloseDevice;
-    impl->Deinitialize        = PIPEWIRE_Deinitialize;
+    impl->DetectDevices = PIPEWIRE_DetectDevices;
+    impl->OpenDevice = PIPEWIRE_OpenDevice;
+    impl->CloseDevice = PIPEWIRE_CloseDevice;
+    impl->Deinitialize = PIPEWIRE_Deinitialize;
     impl->GetDefaultAudioInfo = PIPEWIRE_GetDefaultAudioInfo;
 
-    impl->HasCaptureSupport         = SDL_TRUE;
+    impl->HasCaptureSupport = SDL_TRUE;
     impl->ProvidesOwnCallbackThread = SDL_TRUE;
-    impl->SupportsNonPow2Samples    = SDL_TRUE;
+    impl->SupportsNonPow2Samples = SDL_TRUE;
 
     return SDL_TRUE;
 }

src/audio/pipewire/SDL_pipewire.h

@@ -33,13 +33,13 @@
 struct SDL_PrivateAudioData
 {
     struct pw_thread_loop *loop;
-    struct pw_stream      *stream;
-    struct pw_context     *context;
-    struct SDL_DataQueue  *buffer;
+    struct pw_stream *stream;
+    struct pw_context *context;
+    struct SDL_DataQueue *buffer;
 
     size_t input_buffer_packet_size;
     Sint32 stride; /* Bytes-per-frame */
-    int    stream_init_status;
+    int stream_init_status;
 };
 
 #endif /* SDL_pipewire_h_ */

src/audio/ps2/SDL_ps2audio.c

@@ -31,10 +31,9 @@
 #include <ps2_audio_driver.h>
 
 /* The tag name used by PS2 audio */
-#define PS2AUDIO_DRIVER_NAME    "ps2"
+#define PS2AUDIO_DRIVER_NAME "ps2"
 
-static int
-PS2AUDIO_OpenDevice(_THIS, const char *devname)
+static int PS2AUDIO_OpenDevice(_THIS, const char *devname)
 {
     int i, mixlen;
     struct audsrv_fmt_t format;
@@ -46,21 +45,20 @@ PS2AUDIO_OpenDevice(_THIS, const char *devname)
     }
     SDL_zerop(this->hidden);
 
-
     /* These are the native supported audio PS2 configs  */
     switch (this->spec.freq) {
-        case 11025:
-        case 12000:
-        case 22050:
-        case 24000:
-        case 32000:
-        case 44100:
-        case 48000:
-            this->spec.freq = this->spec.freq;
-            break;
-        default: 
-            this->spec.freq = 48000;
-            break;
+    case 11025:
+    case 12000:
+    case 22050:
+    case 24000:
+    case 32000:
+    case 44100:
+    case 48000:
+        this->spec.freq = this->spec.freq;
+        break;
+    default:
+        this->spec.freq = 48000;
+        break;
     }
 
     this->spec.samples = 512;
@@ -69,8 +67,8 @@ PS2AUDIO_OpenDevice(_THIS, const char *devname)
 
     SDL_CalculateAudioSpec(&this->spec);
 
-    format.bits     = this->spec.format == AUDIO_S8 ? 8 : 16;
-    format.freq     = this->spec.freq;
+    format.bits = this->spec.format == AUDIO_S8 ? 8 : 16;
+    format.freq = this->spec.freq;
     format.channels = this->spec.channels;
 
     this->hidden->channel = audsrv_set_format(&format);
@@ -89,7 +87,7 @@ PS2AUDIO_OpenDevice(_THIS, const char *devname)
        be a multiple of 64 bytes.  Our sample count is already a multiple of
        64, so spec->size should be a multiple of 64 as well. */
     mixlen = this->spec.size * NUM_BUFFERS;
-    this->hidden->rawbuf = (Uint8 *) memalign(64, mixlen);
+    this->hidden->rawbuf = (Uint8 *)memalign(64, mixlen);
     if (this->hidden->rawbuf == NULL) {
         return SDL_SetError("Couldn't allocate mixing buffer");
     }
@@ -152,7 +150,7 @@ static void PS2AUDIO_Deinitialize(void)
     deinit_audio_driver();
 }
 
-static SDL_bool PS2AUDIO_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool PS2AUDIO_Init(SDL_AudioDriverImpl *impl)
 {
     if (init_audio_driver() < 0) {
         return SDL_FALSE;
@@ -167,7 +165,7 @@ static SDL_bool PS2AUDIO_Init(SDL_AudioDriverImpl * impl)
     impl->ThreadInit = PS2AUDIO_ThreadInit;
     impl->Deinitialize = PS2AUDIO_Deinitialize;
     impl->OnlyHasDefaultOutputDevice = SDL_TRUE;
-    return SDL_TRUE;   /* this audio target is available. */
+    return SDL_TRUE; /* this audio target is available. */
 }
 
 AudioBootStrap PS2AUDIO_bootstrap = {

src/audio/ps2/SDL_ps2audio.h

@@ -26,20 +26,20 @@
 #include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the audio functions */
-#define _THIS   SDL_AudioDevice *this
+#define _THIS SDL_AudioDevice *this
 
 #define NUM_BUFFERS 2
 
 struct SDL_PrivateAudioData
 {
-   /* The hardware output channel. */
-   int     channel;
-   /* The raw allocated mixing buffer. */
-   Uint8   *rawbuf;
-   /* Individual mixing buffers. */
-   Uint8   *mixbufs[NUM_BUFFERS];
-   /* Index of the next available mixing buffer. */
-   int     next_buffer;
+    /* The hardware output channel. */
+    int channel;
+    /* The raw allocated mixing buffer. */
+    Uint8 *rawbuf;
+    /* Individual mixing buffers. */
+    Uint8 *mixbufs[NUM_BUFFERS];
+    /* Index of the next available mixing buffer. */
+    int next_buffer;
 };
 
 #endif /* SDL_ps2audio_h_ */

src/audio/psp/SDL_pspaudio.c

@@ -36,10 +36,9 @@
 #include <pspthreadman.h>
 
 /* The tag name used by PSP audio */
-#define PSPAUDIO_DRIVER_NAME    "psp"
+#define PSPAUDIO_DRIVER_NAME "psp"
 
-static int
-PSPAUDIO_OpenDevice(_THIS, const char *devname)
+static int PSPAUDIO_OpenDevice(_THIS, const char *devname)
 {
     int format, mixlen, i;
 
@@ -61,7 +60,7 @@ PSPAUDIO_OpenDevice(_THIS, const char *devname)
         format = PSP_AUDIO_FORMAT_MONO;
     } else {
         format = PSP_AUDIO_FORMAT_STEREO;
-        this->spec.channels = 2;  /* we're forcing the hardware to stereo. */
+        this->spec.channels = 2; /* we're forcing the hardware to stereo. */
     }
 
     /*  PSP has some limitations with the Audio. It fully supports 44.1KHz (Mono & Stereo),
@@ -72,7 +71,7 @@ PSPAUDIO_OpenDevice(_THIS, const char *devname)
     } else {
         this->hidden->channel = sceAudioSRCChReserve(this->spec.samples, this->spec.freq, 2);
     }
-    
+
     if (this->hidden->channel < 0) {
         free(this->hidden->rawbuf);
         this->hidden->rawbuf = NULL;
@@ -86,7 +85,7 @@ PSPAUDIO_OpenDevice(_THIS, const char *devname)
        be a multiple of 64 bytes.  Our sample count is already a multiple of
        64, so spec->size should be a multiple of 64 as well. */
     mixlen = this->spec.size * NUM_BUFFERS;
-    this->hidden->rawbuf = (Uint8 *) memalign(64, mixlen);
+    this->hidden->rawbuf = (Uint8 *)memalign(64, mixlen);
     if (this->hidden->rawbuf == NULL) {
         return SDL_SetError("Couldn't allocate mixing buffer");
     }
@@ -155,8 +154,7 @@ static void PSPAUDIO_ThreadInit(_THIS)
     }
 }
 
-static SDL_bool
-PSPAUDIO_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool PSPAUDIO_Init(SDL_AudioDriverImpl *impl)
 {
     /* Set the function pointers */
     impl->OpenDevice = PSPAUDIO_OpenDevice;
@@ -172,7 +170,7 @@ PSPAUDIO_Init(SDL_AudioDriverImpl * impl)
     impl->HasCaptureSupport = SDL_TRUE;
     impl->OnlyHasDefaultCaptureDevice = SDL_TRUE;
     */
-    return SDL_TRUE;   /* this audio target is available. */
+    return SDL_TRUE; /* this audio target is available. */
 }
 
 AudioBootStrap PSPAUDIO_bootstrap = {

src/audio/psp/SDL_pspaudio.h

@@ -25,19 +25,20 @@
 #include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the audio functions */
-#define _THIS   SDL_AudioDevice *this
+#define _THIS SDL_AudioDevice *this
 
 #define NUM_BUFFERS 2
 
-struct SDL_PrivateAudioData {
+struct SDL_PrivateAudioData
+{
     /* The hardware output channel. */
-    int     channel;
+    int channel;
     /* The raw allocated mixing buffer. */
-    Uint8   *rawbuf;
+    Uint8 *rawbuf;
     /* Individual mixing buffers. */
-    Uint8   *mixbufs[NUM_BUFFERS];
+    Uint8 *mixbufs[NUM_BUFFERS];
     /* Index of the next available mixing buffer. */
-    int     next_buffer;
+    int next_buffer;
 };
 
 #endif /* SDL_pspaudio_h_ */

src/audio/pulseaudio/SDL_pulseaudio.c

@@ -45,81 +45,79 @@
 /* should we include monitors in the device list? Set at SDL_Init time */
 static SDL_bool include_monitors = SDL_FALSE;
 
-
 #if (PA_API_VERSION < 12)
 /** Return non-zero if the passed state is one of the connected states */
-static SDL_INLINE int PA_CONTEXT_IS_GOOD(pa_context_state_t x) {
+static SDL_INLINE int PA_CONTEXT_IS_GOOD(pa_context_state_t x)
+{
     return x == PA_CONTEXT_CONNECTING || x == PA_CONTEXT_AUTHORIZING || x == PA_CONTEXT_SETTING_NAME || x == PA_CONTEXT_READY;
 }
 /** Return non-zero if the passed state is one of the connected states */
-static SDL_INLINE int PA_STREAM_IS_GOOD(pa_stream_state_t x) {
+static SDL_INLINE int PA_STREAM_IS_GOOD(pa_stream_state_t x)
+{
     return x == PA_STREAM_CREATING || x == PA_STREAM_READY;
 }
 #endif /* pulseaudio <= 0.9.10 */
 
-
-static const char *(*PULSEAUDIO_pa_get_library_version) (void);
-static pa_channel_map *(*PULSEAUDIO_pa_channel_map_init_auto) (
+static const char *(*PULSEAUDIO_pa_get_library_version)(void);
+static pa_channel_map *(*PULSEAUDIO_pa_channel_map_init_auto)(
     pa_channel_map *, unsigned, pa_channel_map_def_t);
-static const char * (*PULSEAUDIO_pa_strerror) (int);
-static pa_mainloop * (*PULSEAUDIO_pa_mainloop_new) (void);
-static pa_mainloop_api * (*PULSEAUDIO_pa_mainloop_get_api) (pa_mainloop *);
-static int (*PULSEAUDIO_pa_mainloop_iterate) (pa_mainloop *, int, int *);
-static int (*PULSEAUDIO_pa_mainloop_run) (pa_mainloop *, int *);
-static void (*PULSEAUDIO_pa_mainloop_quit) (pa_mainloop *, int);
-static void (*PULSEAUDIO_pa_mainloop_free) (pa_mainloop *);
-
-static pa_operation_state_t (*PULSEAUDIO_pa_operation_get_state) (
+static const char *(*PULSEAUDIO_pa_strerror)(int);
+static pa_mainloop *(*PULSEAUDIO_pa_mainloop_new)(void);
+static pa_mainloop_api *(*PULSEAUDIO_pa_mainloop_get_api)(pa_mainloop *);
+static int (*PULSEAUDIO_pa_mainloop_iterate)(pa_mainloop *, int, int *);
+static int (*PULSEAUDIO_pa_mainloop_run)(pa_mainloop *, int *);
+static void (*PULSEAUDIO_pa_mainloop_quit)(pa_mainloop *, int);
+static void (*PULSEAUDIO_pa_mainloop_free)(pa_mainloop *);
+
+static pa_operation_state_t (*PULSEAUDIO_pa_operation_get_state)(
     const pa_operation *);
-static void (*PULSEAUDIO_pa_operation_cancel) (pa_operation *);
-static void (*PULSEAUDIO_pa_operation_unref) (pa_operation *);
-
-static pa_context * (*PULSEAUDIO_pa_context_new) (pa_mainloop_api *,
-    const char *);
-static int (*PULSEAUDIO_pa_context_connect) (pa_context *, const char *,
-    pa_context_flags_t, const pa_spawn_api *);
-static pa_operation * (*PULSEAUDIO_pa_context_get_sink_info_list) (pa_context *, pa_sink_info_cb_t, void *);
-static pa_operation * (*PULSEAUDIO_pa_context_get_source_info_list) (pa_context *, pa_source_info_cb_t, void *);
-static pa_operation * (*PULSEAUDIO_pa_context_get_sink_info_by_index) (pa_context *, uint32_t, pa_sink_info_cb_t, void *);
-static pa_operation * (*PULSEAUDIO_pa_context_get_source_info_by_index) (pa_context *, uint32_t, pa_source_info_cb_t, void *);
-static pa_context_state_t (*PULSEAUDIO_pa_context_get_state) (const pa_context *);
-static pa_operation * (*PULSEAUDIO_pa_context_subscribe) (pa_context *, pa_subscription_mask_t, pa_context_success_cb_t, void *);
-static void (*PULSEAUDIO_pa_context_set_subscribe_callback) (pa_context *, pa_context_subscribe_cb_t, void *);
-static void (*PULSEAUDIO_pa_context_disconnect) (pa_context *);
-static void (*PULSEAUDIO_pa_context_unref) (pa_context *);
-
-static pa_stream * (*PULSEAUDIO_pa_stream_new) (pa_context *, const char *,
-    const pa_sample_spec *, const pa_channel_map *);
-static int (*PULSEAUDIO_pa_stream_connect_playback) (pa_stream *, const char *,
-    const pa_buffer_attr *, pa_stream_flags_t, const pa_cvolume *, pa_stream *);
-static int (*PULSEAUDIO_pa_stream_connect_record) (pa_stream *, const char *,
-    const pa_buffer_attr *, pa_stream_flags_t);
-static pa_stream_state_t (*PULSEAUDIO_pa_stream_get_state) (const pa_stream *);
-static size_t (*PULSEAUDIO_pa_stream_writable_size) (const pa_stream *);
-static size_t (*PULSEAUDIO_pa_stream_readable_size) (const pa_stream *);
-static int (*PULSEAUDIO_pa_stream_write) (pa_stream *, const void *, size_t,
-    pa_free_cb_t, int64_t, pa_seek_mode_t);
-static pa_operation * (*PULSEAUDIO_pa_stream_drain) (pa_stream *,
-    pa_stream_success_cb_t, void *);
-static int (*PULSEAUDIO_pa_stream_peek) (pa_stream *, const void **, size_t *);
-static int (*PULSEAUDIO_pa_stream_drop) (pa_stream *);
-static pa_operation * (*PULSEAUDIO_pa_stream_flush) (pa_stream *,
-    pa_stream_success_cb_t, void *);
-static int (*PULSEAUDIO_pa_stream_disconnect) (pa_stream *);
-static void (*PULSEAUDIO_pa_stream_unref) (pa_stream *);
+static void (*PULSEAUDIO_pa_operation_cancel)(pa_operation *);
+static void (*PULSEAUDIO_pa_operation_unref)(pa_operation *);
+
+static pa_context *(*PULSEAUDIO_pa_context_new)(pa_mainloop_api *,
+                                                const char *);
+static int (*PULSEAUDIO_pa_context_connect)(pa_context *, const char *,
+                                            pa_context_flags_t, const pa_spawn_api *);
+static pa_operation *(*PULSEAUDIO_pa_context_get_sink_info_list)(pa_context *, pa_sink_info_cb_t, void *);
+static pa_operation *(*PULSEAUDIO_pa_context_get_source_info_list)(pa_context *, pa_source_info_cb_t, void *);
+static pa_operation *(*PULSEAUDIO_pa_context_get_sink_info_by_index)(pa_context *, uint32_t, pa_sink_info_cb_t, void *);
+static pa_operation *(*PULSEAUDIO_pa_context_get_source_info_by_index)(pa_context *, uint32_t, pa_source_info_cb_t, void *);
+static pa_context_state_t (*PULSEAUDIO_pa_context_get_state)(const pa_context *);
+static pa_operation *(*PULSEAUDIO_pa_context_subscribe)(pa_context *, pa_subscription_mask_t, pa_context_success_cb_t, void *);
+static void (*PULSEAUDIO_pa_context_set_subscribe_callback)(pa_context *, pa_context_subscribe_cb_t, void *);
+static void (*PULSEAUDIO_pa_context_disconnect)(pa_context *);
+static void (*PULSEAUDIO_pa_context_unref)(pa_context *);
+
+static pa_stream *(*PULSEAUDIO_pa_stream_new)(pa_context *, const char *,
+                                              const pa_sample_spec *, const pa_channel_map *);
+static int (*PULSEAUDIO_pa_stream_connect_playback)(pa_stream *, const char *,
+                                                    const pa_buffer_attr *, pa_stream_flags_t, const pa_cvolume *, pa_stream *);
+static int (*PULSEAUDIO_pa_stream_connect_record)(pa_stream *, const char *,
+                                                  const pa_buffer_attr *, pa_stream_flags_t);
+static pa_stream_state_t (*PULSEAUDIO_pa_stream_get_state)(const pa_stream *);
+static size_t (*PULSEAUDIO_pa_stream_writable_size)(const pa_stream *);
+static size_t (*PULSEAUDIO_pa_stream_readable_size)(const pa_stream *);
+static int (*PULSEAUDIO_pa_stream_write)(pa_stream *, const void *, size_t,
+                                         pa_free_cb_t, int64_t, pa_seek_mode_t);
+static pa_operation *(*PULSEAUDIO_pa_stream_drain)(pa_stream *,
+                                                   pa_stream_success_cb_t, void *);
+static int (*PULSEAUDIO_pa_stream_peek)(pa_stream *, const void **, size_t *);
+static int (*PULSEAUDIO_pa_stream_drop)(pa_stream *);
+static pa_operation *(*PULSEAUDIO_pa_stream_flush)(pa_stream *,
+                                                   pa_stream_success_cb_t, void *);
+static int (*PULSEAUDIO_pa_stream_disconnect)(pa_stream *);
+static void (*PULSEAUDIO_pa_stream_unref)(pa_stream *);
 static void (*PULSEAUDIO_pa_stream_set_write_callback)(pa_stream *, pa_stream_request_cb_t, void *);
-static pa_operation * (*PULSEAUDIO_pa_context_get_server_info)(pa_context *, pa_server_info_cb_t, void *);
+static pa_operation *(*PULSEAUDIO_pa_context_get_server_info)(pa_context *, pa_server_info_cb_t, void *);
 
 static int load_pulseaudio_syms(void);
 
-
 #ifdef SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC
 
 static const char *pulseaudio_library = SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC;
 static void *pulseaudio_handle = NULL;
 
-static int
-load_pulseaudio_sym(const char *fn, void **addr)
+static int load_pulseaudio_sym(const char *fn, void **addr)
 {
     *addr = SDL_LoadFunction(pulseaudio_handle, fn);
     if (*addr == NULL) {
@@ -131,11 +129,11 @@ load_pulseaudio_sym(const char *fn, void **addr)
 }
 
 /* cast funcs to char* first, to please GCC's strict aliasing rules. */
-#define SDL_PULSEAUDIO_SYM(x) \
-    if (!load_pulseaudio_sym(#x, (void **) (char *) &PULSEAUDIO_##x)) return -1
+#define SDL_PULSEAUDIO_SYM(x)                                       \
+    if (!load_pulseaudio_sym(#x, (void **)(char *)&PULSEAUDIO_##x)) \
+    return -1
 
-static void
-UnloadPulseAudioLibrary(void)
+static void UnloadPulseAudioLibrary(void)
 {
     if (pulseaudio_handle != NULL) {
         SDL_UnloadObject(pulseaudio_handle);
@@ -143,8 +141,7 @@ UnloadPulseAudioLibrary(void)
     }
 }
 
-static int
-LoadPulseAudioLibrary(void)
+static int LoadPulseAudioLibrary(void)
 {
     int retval = 0;
     if (pulseaudio_handle == NULL) {
@@ -166,13 +163,11 @@ LoadPulseAudioLibrary(void)
 
 #define SDL_PULSEAUDIO_SYM(x) PULSEAUDIO_##x = x
 
-static void
-UnloadPulseAudioLibrary(void)
+static void UnloadPulseAudioLibrary(void)
 {
 }
 
-static int
-LoadPulseAudioLibrary(void)
+static int LoadPulseAudioLibrary(void)
 {
     load_pulseaudio_syms();
     return 0;
@@ -180,9 +175,7 @@ LoadPulseAudioLibrary(void)
 
 #endif /* SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC */
 
-
-static int
-load_pulseaudio_syms(void)
+static int load_pulseaudio_syms(void)
 {
     SDL_PULSEAUDIO_SYM(pa_get_library_version);
     SDL_PULSEAUDIO_SYM(pa_mainloop_new);
@@ -225,15 +218,13 @@ load_pulseaudio_syms(void)
     return 0;
 }
 
-static SDL_INLINE int
-squashVersion(const int major, const int minor, const int patch)
+static SDL_INLINE int squashVersion(const int major, const int minor, const int patch)
 {
     return ((major & 0xFF) << 16) | ((minor & 0xFF) << 8) | (patch & 0xFF);
 }
 
 /* Workaround for older pulse: pa_context_new() must have non-NULL appname */
-static const char *
-getAppName(void)
+static const char *getAppName(void)
 {
     const char *retval = SDL_GetHint(SDL_HINT_AUDIO_DEVICE_APP_NAME);
     if (retval && *retval) {
@@ -244,12 +235,12 @@ getAppName(void)
         return retval;
     } else {
         const char *verstr = PULSEAUDIO_pa_get_library_version();
-        retval = "SDL Application";  /* the "oh well" default. */
+        retval = "SDL Application"; /* the "oh well" default. */
         if (verstr != NULL) {
             int maj, min, patch;
             if (SDL_sscanf(verstr, "%d.%d.%d", &maj, &min, &patch) == 3) {
                 if (squashVersion(maj, min, patch) >= squashVersion(0, 9, 15)) {
-                    retval = NULL;  /* 0.9.15+ handles NULL correctly. */
+                    retval = NULL; /* 0.9.15+ handles NULL correctly. */
                 }
             }
         }
@@ -257,8 +248,7 @@ getAppName(void)
     return retval;
 }
 
-static void
-WaitForPulseOperation(pa_mainloop *mainloop, pa_operation *o)
+static void WaitForPulseOperation(pa_mainloop *mainloop, pa_operation *o)
 {
     /* This checks for NO errors currently. Either fix that, check results elsewhere, or do things you don't care about. */
     if (mainloop && o) {
@@ -270,8 +260,7 @@ WaitForPulseOperation(pa_mainloop *mainloop, pa_operation *o)
     }
 }
 
-static void
-DisconnectFromPulseServer(pa_mainloop *mainloop, pa_context *context)
+static void DisconnectFromPulseServer(pa_mainloop *mainloop, pa_context *context)
 {
     if (context) {
         PULSEAUDIO_pa_context_disconnect(context);
@@ -282,8 +271,7 @@ DisconnectFromPulseServer(pa_mainloop *mainloop, pa_context *context)
     }
 }
 
-static int
-ConnectToPulseServer_Internal(pa_mainloop **_mainloop, pa_context **_context)
+static int ConnectToPulseServer_Internal(pa_mainloop **_mainloop, pa_context **_context)
 {
     pa_mainloop *mainloop = NULL;
     pa_context *context = NULL;
@@ -299,7 +287,7 @@ ConnectToPulseServer_Internal(pa_mainloop **_mainloop, pa_context **_context)
     }
 
     mainloop_api = PULSEAUDIO_pa_mainloop_get_api(mainloop);
-    SDL_assert(mainloop_api);  /* this never fails, right? */
+    SDL_assert(mainloop_api); /* this never fails, right? */
 
     context = PULSEAUDIO_pa_context_new(mainloop_api, getAppName());
     if (context == NULL) {
@@ -331,11 +319,10 @@ ConnectToPulseServer_Internal(pa_mainloop **_mainloop, pa_context **_context)
     *_context = context;
     *_mainloop = mainloop;
 
-    return 0;  /* connected and ready! */
+    return 0; /* connected and ready! */
 }
 
-static int
-ConnectToPulseServer(pa_mainloop **_mainloop, pa_context **_context)
+static int ConnectToPulseServer(pa_mainloop **_mainloop, pa_context **_context)
 {
     const int retval = ConnectToPulseServer_Internal(_mainloop, _context);
     if (retval < 0) {
@@ -344,23 +331,20 @@ ConnectToPulseServer(pa_mainloop **_mainloop, pa_context **_context)
     return retval;
 }
 
-
 /* This function waits until it is possible to write a full sound buffer */
-static void
-PULSEAUDIO_WaitDevice(_THIS)
+static void PULSEAUDIO_WaitDevice(_THIS)
 {
     /* this is a no-op; we wait in PULSEAUDIO_PlayDevice now. */
 }
 
 static void WriteCallback(pa_stream *p, size_t nbytes, void *userdata)
 {
-    struct SDL_PrivateAudioData *h = (struct SDL_PrivateAudioData *) userdata;
+    struct SDL_PrivateAudioData *h = (struct SDL_PrivateAudioData *)userdata;
     /*printf("PULSEAUDIO WRITE CALLBACK! nbytes=%u\n", (unsigned int) nbytes);*/
     h->bytes_requested += nbytes;
 }
 
-static void
-PULSEAUDIO_PlayDevice(_THIS)
+static void PULSEAUDIO_PlayDevice(_THIS)
 {
     struct SDL_PrivateAudioData *h = this->hidden;
     int available = h->mixlen;
@@ -395,15 +379,12 @@ PULSEAUDIO_PlayDevice(_THIS)
     /*printf("PULSEAUDIO PLAYDEVICE END! written=%d\n", written);*/
 }
 
-static Uint8 *
-PULSEAUDIO_GetDeviceBuf(_THIS)
+static Uint8 *PULSEAUDIO_GetDeviceBuf(_THIS)
 {
     return this->hidden->mixbuf;
 }
 
-
-static int
-PULSEAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
+static int PULSEAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
 {
     struct SDL_PrivateAudioData *h = this->hidden;
     const void *data = NULL;
@@ -418,40 +399,40 @@ PULSEAUDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
             h->capturelen -= cpy;
             if (h->capturelen == 0) {
                 h->capturebuf = NULL;
-                PULSEAUDIO_pa_stream_drop(h->stream);  /* done with this fragment. */
+                PULSEAUDIO_pa_stream_drop(h->stream); /* done with this fragment. */
             }
-            return cpy;  /* new data, return it. */
+            return cpy; /* new data, return it. */
         }
 
         if (PULSEAUDIO_pa_context_get_state(h->context) != PA_CONTEXT_READY ||
             PULSEAUDIO_pa_stream_get_state(h->stream) != PA_STREAM_READY ||
             PULSEAUDIO_pa_mainloop_iterate(h->mainloop, 1, NULL) < 0) {
             SDL_OpenedAudioDeviceDisconnected(this);
-            return -1;  /* uhoh, pulse failed! */
+            return -1; /* uhoh, pulse failed! */
         }
 
         if (PULSEAUDIO_pa_stream_readable_size(h->stream) == 0) {
-            continue;  /* no data available yet. */
+            continue; /* no data available yet. */
         }
 
         /* a new fragment is available! */
         PULSEAUDIO_pa_stream_peek(h->stream, &data, &nbytes);
         SDL_assert(nbytes > 0);
-        if (data == NULL) {  /* NULL==buffer had a hole. Ignore that. */
-            PULSEAUDIO_pa_stream_drop(h->stream);  /* drop this fragment. */
+        /* If data == NULL, then the buffer had a hole, ignore that */
+        if (data == NULL) {
+            PULSEAUDIO_pa_stream_drop(h->stream); /* drop this fragment. */
         } else {
             /* store this fragment's data, start feeding it to SDL. */
             /*printf("PULSEAUDIO: captured %d new bytes\n", (int) nbytes);*/
-            h->capturebuf = (const Uint8 *) data;
+            h->capturebuf = (const Uint8 *)data;
             h->capturelen = nbytes;
         }
     }
 
-    return -1;  /* not enabled? */
+    return -1; /* not enabled? */
 }
 
-static void
-PULSEAUDIO_FlushCapture(_THIS)
+static void PULSEAUDIO_FlushCapture(_THIS)
 {
     struct SDL_PrivateAudioData *h = this->hidden;
     const void *data = NULL;
@@ -468,21 +449,20 @@ PULSEAUDIO_FlushCapture(_THIS)
             PULSEAUDIO_pa_stream_get_state(h->stream) != PA_STREAM_READY ||
             PULSEAUDIO_pa_mainloop_iterate(h->mainloop, 1, NULL) < 0) {
             SDL_OpenedAudioDeviceDisconnected(this);
-            return;  /* uhoh, pulse failed! */
+            return; /* uhoh, pulse failed! */
         }
 
         if (PULSEAUDIO_pa_stream_readable_size(h->stream) == 0) {
-            break;  /* no data available, so we're done. */
+            break; /* no data available, so we're done. */
         }
 
         /* a new fragment is available! Just dump it. */
         PULSEAUDIO_pa_stream_peek(h->stream, &data, &nbytes);
-        PULSEAUDIO_pa_stream_drop(h->stream);  /* drop this fragment. */
+        PULSEAUDIO_pa_stream_drop(h->stream); /* drop this fragment. */
     }
 }
 
-static void
-PULSEAUDIO_CloseDevice(_THIS)
+static void PULSEAUDIO_CloseDevice(_THIS)
 {
     if (this->hidden->stream) {
         if (this->hidden->capturebuf != NULL) {
@@ -498,48 +478,44 @@ PULSEAUDIO_CloseDevice(_THIS)
     SDL_free(this->hidden);
 }
 
-static void
-SinkDeviceNameCallback(pa_context *c, const pa_sink_info *i, int is_last, void *data)
+static void SinkDeviceNameCallback(pa_context *c, const pa_sink_info *i, int is_last, void *data)
 {
     if (i) {
-        char **devname = (char **) data;
+        char **devname = (char **)data;
         *devname = SDL_strdup(i->name);
     }
 }
 
-static void
-SourceDeviceNameCallback(pa_context *c, const pa_source_info *i, int is_last, void *data)
+static void SourceDeviceNameCallback(pa_context *c, const pa_source_info *i, int is_last, void *data)
 {
     if (i) {
-        char **devname = (char **) data;
+        char **devname = (char **)data;
         *devname = SDL_strdup(i->name);
     }
 }
 
-static SDL_bool
-FindDeviceName(struct SDL_PrivateAudioData *h, const SDL_bool iscapture, void *handle)
+static SDL_bool FindDeviceName(struct SDL_PrivateAudioData *h, const SDL_bool iscapture, void *handle)
 {
-    const uint32_t idx = ((uint32_t) ((intptr_t) handle)) - 1;
+    const uint32_t idx = ((uint32_t)((intptr_t)handle)) - 1;
 
-    if (handle == NULL) {  /* NULL == default device. */
+    if (handle == NULL) { /* NULL == default device. */
         return SDL_TRUE;
     }
 
     if (iscapture) {
         WaitForPulseOperation(h->mainloop,
-            PULSEAUDIO_pa_context_get_source_info_by_index(h->context, idx,
-                SourceDeviceNameCallback, &h->device_name));
+                              PULSEAUDIO_pa_context_get_source_info_by_index(h->context, idx,
+                                                                             SourceDeviceNameCallback, &h->device_name));
     } else {
         WaitForPulseOperation(h->mainloop,
-            PULSEAUDIO_pa_context_get_sink_info_by_index(h->context, idx,
-                SinkDeviceNameCallback, &h->device_name));
+                              PULSEAUDIO_pa_context_get_sink_info_by_index(h->context, idx,
+                                                                           SinkDeviceNameCallback, &h->device_name));
     }
 
     return h->device_name != NULL;
 }
 
-static int
-PULSEAUDIO_OpenDevice(_THIS, const char *devname)
+static int PULSEAUDIO_OpenDevice(_THIS, const char *devname)
 {
     struct SDL_PrivateAudioData *h = NULL;
     SDL_AudioFormat test_format;
@@ -604,7 +580,7 @@ PULSEAUDIO_OpenDevice(_THIS, const char *devname)
     /* Allocate mixing buffer */
     if (!iscapture) {
         h->mixlen = this->spec.size;
-        h->mixbuf = (Uint8 *) SDL_malloc(h->mixlen);
+        h->mixbuf = (Uint8 *)SDL_malloc(h->mixlen);
         if (h->mixbuf == NULL) {
             return SDL_OutOfMemory();
         }
@@ -640,9 +616,9 @@ PULSEAUDIO_OpenDevice(_THIS, const char *devname)
     h->stream = PULSEAUDIO_pa_stream_new(
         h->context,
         (name && *name) ? name : "Audio Stream", /* stream description */
-        &paspec,    /* sample format spec */
-        &pacmap     /* channel map */
-        );
+        &paspec,                                 /* sample format spec */
+        &pacmap                                  /* channel map */
+    );
 
     if (h->stream == NULL) {
         return SDL_SetError("Could not set up PulseAudio stream");
@@ -692,8 +668,7 @@ static char *default_source_name = NULL;
 
 /* device handles are device index + 1, cast to void*, so we never pass a NULL. */
 
-static SDL_AudioFormat
-PulseFormatToSDLFormat(pa_sample_format_t format)
+static SDL_AudioFormat PulseFormatToSDLFormat(pa_sample_format_t format)
 {
     switch (format) {
     case PA_SAMPLE_U8:
@@ -716,11 +691,10 @@ PulseFormatToSDLFormat(pa_sample_format_t format)
 }
 
 /* This is called when PulseAudio adds an output ("sink") device. */
-static void
-SinkInfoCallback(pa_context *c, const pa_sink_info *i, int is_last, void *data)
+static void SinkInfoCallback(pa_context *c, const pa_sink_info *i, int is_last, void *data)
 {
     SDL_AudioSpec spec;
-    SDL_bool add = (SDL_bool) ((intptr_t) data);
+    SDL_bool add = (SDL_bool)((intptr_t)data);
     if (i) {
         spec.freq = i->sample_spec.rate;
         spec.channels = i->sample_spec.channels;
@@ -732,7 +706,7 @@ SinkInfoCallback(pa_context *c, const pa_sink_info *i, int is_last, void *data)
         spec.userdata = NULL;
 
         if (add) {
-            SDL_AddAudioDevice(SDL_FALSE, i->description, &spec, (void *) ((intptr_t) i->index+1));
+            SDL_AddAudioDevice(SDL_FALSE, i->description, &spec, (void *)((intptr_t)i->index + 1));
         }
 
         if (default_sink_path != NULL && SDL_strcmp(i->name, default_sink_path) == 0) {
@@ -745,11 +719,10 @@ SinkInfoCallback(pa_context *c, const pa_sink_info *i, int is_last, void *data)
 }
 
 /* This is called when PulseAudio adds a capture ("source") device. */
-static void
-SourceInfoCallback(pa_context *c, const pa_source_info *i, int is_last, void *data)
+static void SourceInfoCallback(pa_context *c, const pa_source_info *i, int is_last, void *data)
 {
     SDL_AudioSpec spec;
-    SDL_bool add = (SDL_bool) ((intptr_t) data);
+    SDL_bool add = (SDL_bool)((intptr_t)data);
     if (i) {
         /* Maybe skip "monitor" sources. These are just output from other sinks. */
         if (include_monitors || (i->monitor_of_sink == PA_INVALID_INDEX)) {
@@ -763,7 +736,7 @@ SourceInfoCallback(pa_context *c, const pa_source_info *i, int is_last, void *da
             spec.userdata = NULL;
 
             if (add) {
-                SDL_AddAudioDevice(SDL_TRUE, i->description, &spec, (void *) ((intptr_t) i->index+1));
+                SDL_AddAudioDevice(SDL_TRUE, i->description, &spec, (void *)((intptr_t)i->index + 1));
             }
 
             if (default_source_path != NULL && SDL_strcmp(i->name, default_source_path) == 0) {
@@ -776,8 +749,7 @@ SourceInfoCallback(pa_context *c, const pa_source_info *i, int is_last, void *da
     }
 }
 
-static void
-ServerInfoCallback(pa_context *c, const pa_server_info *i, void *data)
+static void ServerInfoCallback(pa_context *c, const pa_server_info *i, void *data)
 {
     if (default_sink_path != NULL) {
         SDL_free(default_sink_path);
@@ -790,14 +762,13 @@ ServerInfoCallback(pa_context *c, const pa_server_info *i, void *data)
 }
 
 /* This is called when PulseAudio has a device connected/removed/changed. */
-static void
-HotplugCallback(pa_context *c, pa_subscription_event_type_t t, uint32_t idx, void *data)
+static void HotplugCallback(pa_context *c, pa_subscription_event_type_t t, uint32_t idx, void *data)
 {
     const SDL_bool added = ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_NEW);
     const SDL_bool removed = ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE);
     const SDL_bool changed = ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_CHANGE);
 
-    if (added || removed || changed) {  /* we only care about add/remove events. */
+    if (added || removed || changed) { /* we only care about add/remove events. */
         const SDL_bool sink = ((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_SINK);
         const SDL_bool source = ((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) == PA_SUBSCRIPTION_EVENT_SOURCE);
 
@@ -806,45 +777,42 @@ HotplugCallback(pa_context *c, pa_subscription_event_type_t t, uint32_t idx, voi
             if (changed) {
                 PULSEAUDIO_pa_context_get_server_info(hotplug_context, ServerInfoCallback, NULL);
             }
-            PULSEAUDIO_pa_context_get_sink_info_by_index(hotplug_context, idx, SinkInfoCallback, (void*) ((intptr_t) added));
+            PULSEAUDIO_pa_context_get_sink_info_by_index(hotplug_context, idx, SinkInfoCallback, (void *)((intptr_t)added));
         } else if ((added || changed) && source) {
             if (changed) {
                 PULSEAUDIO_pa_context_get_server_info(hotplug_context, ServerInfoCallback, NULL);
             }
-            PULSEAUDIO_pa_context_get_source_info_by_index(hotplug_context, idx, SourceInfoCallback, (void*) ((intptr_t) added));
+            PULSEAUDIO_pa_context_get_source_info_by_index(hotplug_context, idx, SourceInfoCallback, (void *)((intptr_t)added));
         } else if (removed && (sink || source)) {
             /* removes we can handle just with the device index. */
-            SDL_RemoveAudioDevice(source != 0, (void *) ((intptr_t) idx+1));
+            SDL_RemoveAudioDevice(source != 0, (void *)((intptr_t)idx + 1));
         }
     }
 }
 
 /* this runs as a thread while the Pulse target is initialized to catch hotplug events. */
-static int SDLCALL
-HotplugThread(void *data)
+static int SDLCALL HotplugThread(void *data)
 {
     pa_operation *o;
     SDL_SetThreadPriority(SDL_THREAD_PRIORITY_LOW);
     PULSEAUDIO_pa_context_set_subscribe_callback(hotplug_context, HotplugCallback, NULL);
     o = PULSEAUDIO_pa_context_subscribe(hotplug_context, PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SOURCE, NULL, NULL);
-    PULSEAUDIO_pa_operation_unref(o);  /* don't wait for it, just do our thing. */
+    PULSEAUDIO_pa_operation_unref(o); /* don't wait for it, just do our thing. */
     PULSEAUDIO_pa_mainloop_run(hotplug_mainloop, NULL);
     return 0;
 }
 
-static void
-PULSEAUDIO_DetectDevices()
+static void PULSEAUDIO_DetectDevices()
 {
     WaitForPulseOperation(hotplug_mainloop, PULSEAUDIO_pa_context_get_server_info(hotplug_context, ServerInfoCallback, NULL));
-    WaitForPulseOperation(hotplug_mainloop, PULSEAUDIO_pa_context_get_sink_info_list(hotplug_context, SinkInfoCallback, (void*) ((intptr_t) SDL_TRUE)));
-    WaitForPulseOperation(hotplug_mainloop, PULSEAUDIO_pa_context_get_source_info_list(hotplug_context, SourceInfoCallback, (void*) ((intptr_t) SDL_TRUE)));
+    WaitForPulseOperation(hotplug_mainloop, PULSEAUDIO_pa_context_get_sink_info_list(hotplug_context, SinkInfoCallback, (void *)((intptr_t)SDL_TRUE)));
+    WaitForPulseOperation(hotplug_mainloop, PULSEAUDIO_pa_context_get_source_info_list(hotplug_context, SourceInfoCallback, (void *)((intptr_t)SDL_TRUE)));
 
     /* ok, we have a sane list, let's set up hotplug notifications now... */
     hotplug_thread = SDL_CreateThreadInternal(HotplugThread, "PulseHotplug", 256 * 1024, NULL);
 }
 
-static int
-PULSEAUDIO_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
+static int PULSEAUDIO_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
 {
     int i;
     int numdevices;
@@ -875,8 +843,7 @@ PULSEAUDIO_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
     return SDL_SetError("Could not find default PulseAudio device");
 }
 
-static void
-PULSEAUDIO_Deinitialize(void)
+static void PULSEAUDIO_Deinitialize(void)
 {
     if (hotplug_thread) {
         PULSEAUDIO_pa_mainloop_quit(hotplug_mainloop, 0);
@@ -908,8 +875,7 @@ PULSEAUDIO_Deinitialize(void)
     UnloadPulseAudioLibrary();
 }
 
-static SDL_bool
-PULSEAUDIO_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool PULSEAUDIO_Init(SDL_AudioDriverImpl *impl)
 {
     if (LoadPulseAudioLibrary() < 0) {
         return SDL_FALSE;
@@ -937,7 +903,7 @@ PULSEAUDIO_Init(SDL_AudioDriverImpl * impl)
     impl->HasCaptureSupport = SDL_TRUE;
     impl->SupportsNonPow2Samples = SDL_TRUE;
 
-    return SDL_TRUE;   /* this audio target is available. */
+    return SDL_TRUE; /* this audio target is available. */
 }
 
 AudioBootStrap PULSEAUDIO_bootstrap = {

src/audio/pulseaudio/SDL_pulseaudio.h

@@ -43,7 +43,7 @@ struct SDL_PrivateAudioData
     Uint8 *mixbuf;
     int mixlen;
 
-    int bytes_requested;  /* bytes of data the hardware wants _now_. */
+    int bytes_requested; /* bytes of data the hardware wants _now_. */
 
     const Uint8 *capturebuf;
     int capturelen;

src/audio/sndio/SDL_sndioaudio.c

@@ -50,7 +50,7 @@
 #define SIO_DEVANY "default"
 #endif
 
-static struct sio_hdl * (*SNDIO_sio_open)(const char *, unsigned int, int);
+static struct sio_hdl *(*SNDIO_sio_open)(const char *, unsigned int, int);
 static void (*SNDIO_sio_close)(struct sio_hdl *);
 static int (*SNDIO_sio_setpar)(struct sio_hdl *, struct sio_par *);
 static int (*SNDIO_sio_getpar)(struct sio_hdl *, struct sio_par *);
@@ -68,8 +68,7 @@ static void (*SNDIO_sio_initpar)(struct sio_par *);
 static const char *sndio_library = SDL_AUDIO_DRIVER_SNDIO_DYNAMIC;
 static void *sndio_handle = NULL;
 
-static int
-load_sndio_sym(const char *fn, void **addr)
+static int load_sndio_sym(const char *fn, void **addr)
 {
     *addr = SDL_LoadFunction(sndio_handle, fn);
     if (*addr == NULL) {
@@ -81,14 +80,14 @@ load_sndio_sym(const char *fn, void **addr)
 }
 
 /* cast funcs to char* first, to please GCC's strict aliasing rules. */
-#define SDL_SNDIO_SYM(x) \
-    if (!load_sndio_sym(#x, (void **) (char *) &SNDIO_##x)) return -1
+#define SDL_SNDIO_SYM(x)                                  \
+    if (!load_sndio_sym(#x, (void **)(char *)&SNDIO_##x)) \
+    return -1
 #else
 #define SDL_SNDIO_SYM(x) SNDIO_##x = x
 #endif
 
-static int
-load_sndio_syms(void)
+static int load_sndio_syms(void)
 {
     SDL_SNDIO_SYM(sio_open);
     SDL_SNDIO_SYM(sio_close);
@@ -110,8 +109,7 @@ load_sndio_syms(void)
 
 #ifdef SDL_AUDIO_DRIVER_SNDIO_DYNAMIC
 
-static void
-UnloadSNDIOLibrary(void)
+static void UnloadSNDIOLibrary(void)
 {
     if (sndio_handle != NULL) {
         SDL_UnloadObject(sndio_handle);
@@ -119,8 +117,7 @@ UnloadSNDIOLibrary(void)
     }
 }
 
-static int
-LoadSNDIOLibrary(void)
+static int LoadSNDIOLibrary(void)
 {
     int retval = 0;
     if (sndio_handle == NULL) {
@@ -140,13 +137,11 @@ LoadSNDIOLibrary(void)
 
 #else
 
-static void
-UnloadSNDIOLibrary(void)
+static void UnloadSNDIOLibrary(void)
 {
 }
 
-static int
-LoadSNDIOLibrary(void)
+static int LoadSNDIOLibrary(void)
 {
     load_sndio_syms();
     return 0;
@@ -154,24 +149,19 @@ LoadSNDIOLibrary(void)
 
 #endif /* SDL_AUDIO_DRIVER_SNDIO_DYNAMIC */
 
-
-
-
-static void
-SNDIO_WaitDevice(_THIS)
+static void SNDIO_WaitDevice(_THIS)
 {
     /* no-op; SNDIO_sio_write() blocks if necessary. */
 }
 
-static void
-SNDIO_PlayDevice(_THIS)
+static void SNDIO_PlayDevice(_THIS)
 {
     const int written = SNDIO_sio_write(this->hidden->dev,
                                         this->hidden->mixbuf,
                                         this->hidden->mixlen);
 
     /* If we couldn't write, assume fatal error for now */
-    if ( written == 0 ) {
+    if (written == 0) {
         SDL_OpenedAudioDeviceDisconnected(this);
     }
 #ifdef DEBUG_AUDIO
@@ -179,8 +169,7 @@ SNDIO_PlayDevice(_THIS)
 #endif
 }
 
-static int
-SNDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
+static int SNDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
 {
     size_t r;
     int revents;
@@ -189,8 +178,7 @@ SNDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
     /* Emulate a blocking read */
     r = SNDIO_sio_read(this->hidden->dev, buffer, buflen);
     while (r == 0 && !SNDIO_sio_eof(this->hidden->dev)) {
-        if ((nfds = SNDIO_sio_pollfd(this->hidden->dev, this->hidden->pfd, POLLIN)) <= 0
-            || poll(this->hidden->pfd, nfds, INFTIM) < 0) {
+        if ((nfds = SNDIO_sio_pollfd(this->hidden->dev, this->hidden->pfd, POLLIN)) <= 0 || poll(this->hidden->pfd, nfds, INFTIM) < 0) {
             return -1;
         }
         revents = SNDIO_sio_revents(this->hidden->dev, this->hidden->pfd);
@@ -201,11 +189,10 @@ SNDIO_CaptureFromDevice(_THIS, void *buffer, int buflen)
             break;
         }
     }
-    return (int) r;
+    return (int)r;
 }
 
-static void
-SNDIO_FlushCapture(_THIS)
+static void SNDIO_FlushCapture(_THIS)
 {
     char buf[512];
 
@@ -214,19 +201,17 @@ SNDIO_FlushCapture(_THIS)
     }
 }
 
-static Uint8 *
-SNDIO_GetDeviceBuf(_THIS)
+static Uint8 *SNDIO_GetDeviceBuf(_THIS)
 {
     return this->hidden->mixbuf;
 }
 
-static void
-SNDIO_CloseDevice(_THIS)
+static void SNDIO_CloseDevice(_THIS)
 {
-    if ( this->hidden->pfd != NULL ) {
+    if (this->hidden->pfd != NULL) {
         SDL_free(this->hidden->pfd);
     }
-    if ( this->hidden->dev != NULL ) {
+    if (this->hidden->dev != NULL) {
         SNDIO_sio_stop(this->hidden->dev);
         SNDIO_sio_close(this->hidden->dev);
     }
@@ -234,8 +219,7 @@ SNDIO_CloseDevice(_THIS)
     SDL_free(this->hidden);
 }
 
-static int
-SNDIO_OpenDevice(_THIS, const char *devname)
+static int SNDIO_OpenDevice(_THIS, const char *devname)
 {
     SDL_AudioFormat test_format;
     struct sio_par par;
@@ -252,14 +236,14 @@ SNDIO_OpenDevice(_THIS, const char *devname)
 
     /* Capture devices must be non-blocking for SNDIO_FlushCapture */
     if ((this->hidden->dev =
-        SNDIO_sio_open(devname != NULL ? devname : SIO_DEVANY,
-                       iscapture ? SIO_REC : SIO_PLAY, iscapture)) == NULL) {
+             SNDIO_sio_open(devname != NULL ? devname : SIO_DEVANY,
+                            iscapture ? SIO_REC : SIO_PLAY, iscapture)) == NULL) {
         return SDL_SetError("sio_open() failed");
     }
 
     /* Allocate the pollfd array for capture devices */
     if (iscapture && (this->hidden->pfd =
-        SDL_malloc(sizeof(struct pollfd) * SNDIO_sio_nfds(this->hidden->dev))) == NULL) {
+                          SDL_malloc(sizeof(struct pollfd) * SNDIO_sio_nfds(this->hidden->dev))) == NULL) {
         return SDL_OutOfMemory();
     }
 
@@ -325,7 +309,7 @@ SNDIO_OpenDevice(_THIS, const char *devname)
 
     /* Allocate mixing buffer */
     this->hidden->mixlen = this->spec.size;
-    this->hidden->mixbuf = (Uint8 *) SDL_malloc(this->hidden->mixlen);
+    this->hidden->mixbuf = (Uint8 *)SDL_malloc(this->hidden->mixlen);
     if (this->hidden->mixbuf == NULL) {
         return SDL_OutOfMemory();
     }
@@ -339,21 +323,18 @@ SNDIO_OpenDevice(_THIS, const char *devname)
     return 0;
 }
 
-static void
-SNDIO_Deinitialize(void)
+static void SNDIO_Deinitialize(void)
 {
     UnloadSNDIOLibrary();
 }
 
-static void
-SNDIO_DetectDevices(void)
+static void SNDIO_DetectDevices(void)
 {
-	SDL_AddAudioDevice(SDL_FALSE, DEFAULT_OUTPUT_DEVNAME, NULL, (void *) 0x1);
-	SDL_AddAudioDevice(SDL_TRUE, DEFAULT_INPUT_DEVNAME, NULL, (void *) 0x2);
+    SDL_AddAudioDevice(SDL_FALSE, DEFAULT_OUTPUT_DEVNAME, NULL, (void *)0x1);
+    SDL_AddAudioDevice(SDL_TRUE, DEFAULT_INPUT_DEVNAME, NULL, (void *)0x2);
 }
 
-static SDL_bool
-SNDIO_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool SNDIO_Init(SDL_AudioDriverImpl *impl)
 {
     if (LoadSNDIOLibrary() < 0) {
         return SDL_FALSE;
@@ -373,7 +354,7 @@ SNDIO_Init(SDL_AudioDriverImpl * impl)
     impl->AllowsArbitraryDeviceNames = SDL_TRUE;
     impl->HasCaptureSupport = SDL_TRUE;
 
-    return SDL_TRUE;   /* this audio target is available. */
+    return SDL_TRUE; /* this audio target is available. */
 }
 
 AudioBootStrap SNDIO_bootstrap = {

src/audio/sndio/SDL_sndioaudio.h

@@ -29,7 +29,7 @@
 #include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the audio functions */
-#define _THIS   SDL_AudioDevice *this
+#define _THIS SDL_AudioDevice *this
 
 struct SDL_PrivateAudioData
 {

src/audio/vita/SDL_vitaaudio.c

@@ -36,11 +36,10 @@
 #include <psp2/audioout.h>
 #include <psp2/audioin.h>
 
-#define SCE_AUDIO_SAMPLE_ALIGN(s)   (((s) + 63) & ~63)
-#define SCE_AUDIO_MAX_VOLUME    0x8000
+#define SCE_AUDIO_SAMPLE_ALIGN(s) (((s) + 63) & ~63)
+#define SCE_AUDIO_MAX_VOLUME      0x8000
 
-static int
-VITAAUD_OpenCaptureDevice(_THIS)
+static int VITAAUD_OpenCaptureDevice(_THIS)
 {
     this->spec.freq = 16000;
     this->spec.samples = 512;
@@ -48,7 +47,7 @@ VITAAUD_OpenCaptureDevice(_THIS)
 
     SDL_CalculateAudioSpec(&this->spec);
 
-    this->hidden->port = sceAudioInOpenPort(SCE_AUDIO_IN_PORT_TYPE_VOICE , 512, 16000, SCE_AUDIO_IN_PARAM_FORMAT_S16_MONO);
+    this->hidden->port = sceAudioInOpenPort(SCE_AUDIO_IN_PORT_TYPE_VOICE, 512, 16000, SCE_AUDIO_IN_PARAM_FORMAT_S16_MONO);
 
     if (this->hidden->port < 0) {
         return SDL_SetError("Couldn't open audio in port: %x", this->hidden->port);
@@ -57,11 +56,10 @@ VITAAUD_OpenCaptureDevice(_THIS)
     return 0;
 }
 
-static int
-VITAAUD_OpenDevice(_THIS, const char *devname)
+static int VITAAUD_OpenDevice(_THIS, const char *devname)
 {
     int format, mixlen, i, port = SCE_AUDIO_OUT_PORT_TYPE_MAIN;
-    int vols[2] = {SCE_AUDIO_MAX_VOLUME, SCE_AUDIO_MAX_VOLUME};
+    int vols[2] = { SCE_AUDIO_MAX_VOLUME, SCE_AUDIO_MAX_VOLUME };
     SDL_AudioFormat test_format;
 
     this->hidden = (struct SDL_PrivateAudioData *)
@@ -96,7 +94,7 @@ VITAAUD_OpenDevice(_THIS, const char *devname)
        be a multiple of 64 bytes.  Our sample count is already a multiple of
        64, so spec->size should be a multiple of 64 as well. */
     mixlen = this->spec.size * NUM_BUFFERS;
-    this->hidden->rawbuf = (Uint8 *) memalign(64, mixlen);
+    this->hidden->rawbuf = (Uint8 *)memalign(64, mixlen);
     if (this->hidden->rawbuf == NULL) {
         return SDL_SetError("Couldn't allocate mixing buffer");
     }
@@ -119,7 +117,7 @@ VITAAUD_OpenDevice(_THIS, const char *devname)
         return SDL_SetError("Couldn't open audio out port: %x", this->hidden->port);
     }
 
-    sceAudioOutSetVolume(this->hidden->port, SCE_AUDIO_VOLUME_FLAG_L_CH|SCE_AUDIO_VOLUME_FLAG_R_CH, vols);
+    sceAudioOutSetVolume(this->hidden->port, SCE_AUDIO_VOLUME_FLAG_L_CH | SCE_AUDIO_VOLUME_FLAG_R_CH, vols);
 
     SDL_memset(this->hidden->rawbuf, 0, mixlen);
     for (i = 0; i < NUM_BUFFERS; i++) {
@@ -162,7 +160,7 @@ static void VITAAUD_CloseDevice(_THIS)
     }
 
     if (!this->iscapture && this->hidden->rawbuf != NULL) {
-        free(this->hidden->rawbuf);         /* this uses memalign(), not SDL_malloc(). */
+        free(this->hidden->rawbuf); /* this uses memalign(), not SDL_malloc(). */
         this->hidden->rawbuf = NULL;
     }
 }
@@ -191,8 +189,7 @@ static void VITAAUD_ThreadInit(_THIS)
     }
 }
 
-static SDL_bool
-VITAAUD_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool VITAAUD_Init(SDL_AudioDriverImpl *impl)
 {
     /* Set the function pointers */
     impl->OpenDevice = VITAAUD_OpenDevice;
@@ -209,7 +206,7 @@ VITAAUD_Init(SDL_AudioDriverImpl * impl)
     impl->OnlyHasDefaultOutputDevice = SDL_TRUE;
     impl->OnlyHasDefaultCaptureDevice = SDL_TRUE;
 
-    return SDL_TRUE;   /* this audio target is available. */
+    return SDL_TRUE; /* this audio target is available. */
 }
 
 AudioBootStrap VITAAUD_bootstrap = {

src/audio/vita/SDL_vitaaudio.h

@@ -25,19 +25,20 @@
 #include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the audio functions */
-#define _THIS   SDL_AudioDevice *this
+#define _THIS SDL_AudioDevice *this
 
 #define NUM_BUFFERS 2
 
-struct SDL_PrivateAudioData {
+struct SDL_PrivateAudioData
+{
     /* The hardware input/output port. */
-    int     port;
+    int port;
     /* The raw allocated mixing buffer. */
-    Uint8   *rawbuf;
+    Uint8 *rawbuf;
     /* Individual mixing buffers. */
-    Uint8   *mixbufs[NUM_BUFFERS];
+    Uint8 *mixbufs[NUM_BUFFERS];
     /* Index of the next available mixing buffer. */
-    int     next_buffer;
+    int next_buffer;
 };
 
 #endif /* _SDL_vitaaudio_h */

src/audio/wasapi/SDL_wasapi.c

@@ -34,7 +34,7 @@
 
 /* These constants aren't available in older SDKs */
 #ifndef AUDCLNT_STREAMFLAGS_RATEADJUST
-#define AUDCLNT_STREAMFLAGS_RATEADJUST  0x00100000
+#define AUDCLNT_STREAMFLAGS_RATEADJUST 0x00100000
 #endif
 #ifndef AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY
 #define AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY 0x08000000
@@ -44,17 +44,15 @@
 #endif
 
 /* Some GUIDs we need to know without linking to libraries that aren't available before Vista. */
-static const IID SDL_IID_IAudioRenderClient = { 0xf294acfc, 0x3146, 0x4483,{ 0xa7, 0xbf, 0xad, 0xdc, 0xa7, 0xc2, 0x60, 0xe2 } };
-static const IID SDL_IID_IAudioCaptureClient = { 0xc8adbd64, 0xe71e, 0x48a0,{ 0xa4, 0xde, 0x18, 0x5c, 0x39, 0x5c, 0xd3, 0x17 } };
+static const IID SDL_IID_IAudioRenderClient = { 0xf294acfc, 0x3146, 0x4483, { 0xa7, 0xbf, 0xad, 0xdc, 0xa7, 0xc2, 0x60, 0xe2 } };
+static const IID SDL_IID_IAudioCaptureClient = { 0xc8adbd64, 0xe71e, 0x48a0, { 0xa4, 0xde, 0x18, 0x5c, 0x39, 0x5c, 0xd3, 0x17 } };
 
-static void
-WASAPI_DetectDevices(void)
+static void WASAPI_DetectDevices(void)
 {
     WASAPI_EnumerateEndpoints();
 }
 
-static SDL_INLINE SDL_bool
-WasapiFailed(_THIS, const HRESULT err)
+static SDL_INLINE SDL_bool WasapiFailed(_THIS, const HRESULT err)
 {
     if (err == S_OK) {
         return SDL_FALSE;
@@ -71,39 +69,38 @@ WasapiFailed(_THIS, const HRESULT err)
     return SDL_TRUE;
 }
 
-static int
-UpdateAudioStream(_THIS, const SDL_AudioSpec *oldspec)
+static int UpdateAudioStream(_THIS, const SDL_AudioSpec *oldspec)
 {
     /* Since WASAPI requires us to handle all audio conversion, and our
        device format might have changed, we might have to add/remove/change
        the audio stream that the higher level uses to convert data, so
        SDL keeps firing the callback as if nothing happened here. */
 
-    if ( (this->callbackspec.channels == this->spec.channels) &&
-         (this->callbackspec.format == this->spec.format) &&
-         (this->callbackspec.freq == this->spec.freq) &&
-         (this->callbackspec.samples == this->spec.samples) ) {
+    if ((this->callbackspec.channels == this->spec.channels) &&
+        (this->callbackspec.format == this->spec.format) &&
+        (this->callbackspec.freq == this->spec.freq) &&
+        (this->callbackspec.samples == this->spec.samples)) {
         /* no need to buffer/convert in an AudioStream! */
         SDL_FreeAudioStream(this->stream);
         this->stream = NULL;
-    } else if ( (oldspec->channels == this->spec.channels) &&
-         (oldspec->format == this->spec.format) &&
-         (oldspec->freq == this->spec.freq) ) {
+    } else if ((oldspec->channels == this->spec.channels) &&
+               (oldspec->format == this->spec.format) &&
+               (oldspec->freq == this->spec.freq)) {
         /* The existing audio stream is okay to keep using. */
     } else {
         /* replace the audiostream for new format */
         SDL_FreeAudioStream(this->stream);
         if (this->iscapture) {
             this->stream = SDL_NewAudioStream(this->spec.format,
-                                this->spec.channels, this->spec.freq,
-                                this->callbackspec.format,
-                                this->callbackspec.channels,
-                                this->callbackspec.freq);
+                                              this->spec.channels, this->spec.freq,
+                                              this->callbackspec.format,
+                                              this->callbackspec.channels,
+                                              this->callbackspec.freq);
         } else {
             this->stream = SDL_NewAudioStream(this->callbackspec.format,
-                                this->callbackspec.channels,
-                                this->callbackspec.freq, this->spec.format,
-                                this->spec.channels, this->spec.freq);
+                                              this->callbackspec.channels,
+                                              this->callbackspec.freq, this->spec.format,
+                                              this->spec.channels, this->spec.freq);
         }
 
         if (!this->stream) {
@@ -113,7 +110,7 @@ UpdateAudioStream(_THIS, const SDL_AudioSpec *oldspec)
 
     /* make sure our scratch buffer can cover the new device spec. */
     if (this->spec.size > this->work_buffer_len) {
-        Uint8 *ptr = (Uint8 *) SDL_realloc(this->work_buffer, this->spec.size);
+        Uint8 *ptr = (Uint8 *)SDL_realloc(this->work_buffer, this->spec.size);
         if (ptr == NULL) {
             return SDL_OutOfMemory();
         }
@@ -124,16 +121,14 @@ UpdateAudioStream(_THIS, const SDL_AudioSpec *oldspec)
     return 0;
 }
 
-
 static void ReleaseWasapiDevice(_THIS);
 
-static SDL_bool
-RecoverWasapiDevice(_THIS)
+static SDL_bool RecoverWasapiDevice(_THIS)
 {
-    ReleaseWasapiDevice(this);  /* dump the lost device's handles. */
+    ReleaseWasapiDevice(this); /* dump the lost device's handles. */
 
     if (this->hidden->default_device_generation) {
-        this->hidden->default_device_generation = SDL_AtomicGet(this->iscapture ?  &SDL_IMMDevice_DefaultCaptureGeneration : &SDL_IMMDevice_DefaultPlaybackGeneration);
+        this->hidden->default_device_generation = SDL_AtomicGet(this->iscapture ? &SDL_IMMDevice_DefaultCaptureGeneration : &SDL_IMMDevice_DefaultPlaybackGeneration);
     }
 
     /* this can fail for lots of reasons, but the most likely is we had a
@@ -148,26 +143,25 @@ RecoverWasapiDevice(_THIS)
 
     this->hidden->device_lost = SDL_FALSE;
 
-    return SDL_TRUE;  /* okay, carry on with new device details! */
+    return SDL_TRUE; /* okay, carry on with new device details! */
 }
 
-static SDL_bool
-RecoverWasapiIfLost(_THIS)
+static SDL_bool RecoverWasapiIfLost(_THIS)
 {
     const int generation = this->hidden->default_device_generation;
     SDL_bool lost = this->hidden->device_lost;
 
     if (!SDL_AtomicGet(&this->enabled)) {
-        return SDL_FALSE;  /* already failed. */
+        return SDL_FALSE; /* already failed. */
     }
 
     if (!this->hidden->client) {
-        return SDL_TRUE;  /* still waiting for activation. */
+        return SDL_TRUE; /* still waiting for activation. */
     }
 
     if (!lost && (generation > 0)) { /* is a default device? */
         const int newgen = SDL_AtomicGet(this->iscapture ? &SDL_IMMDevice_DefaultCaptureGeneration : &SDL_IMMDevice_DefaultPlaybackGeneration);
-        if (generation != newgen) {  /* the desired default device was changed, jump over to it. */
+        if (generation != newgen) { /* the desired default device was changed, jump over to it. */
             lost = SDL_TRUE;
         }
     }
@@ -175,33 +169,30 @@ RecoverWasapiIfLost(_THIS)
     return lost ? RecoverWasapiDevice(this) : SDL_TRUE;
 }
 
-static Uint8 *
-WASAPI_GetDeviceBuf(_THIS)
+static Uint8 *WASAPI_GetDeviceBuf(_THIS)
 {
     /* get an endpoint buffer from WASAPI. */
     BYTE *buffer = NULL;
 
     while (RecoverWasapiIfLost(this) && this->hidden->render) {
         if (!WasapiFailed(this, IAudioRenderClient_GetBuffer(this->hidden->render, this->spec.samples, &buffer))) {
-            return (Uint8 *) buffer;
+            return (Uint8 *)buffer;
         }
         SDL_assert(buffer == NULL);
     }
 
-    return (Uint8 *) buffer;
+    return (Uint8 *)buffer;
 }
 
-static void
-WASAPI_PlayDevice(_THIS)
+static void WASAPI_PlayDevice(_THIS)
 {
-    if (this->hidden->render != NULL) {  /* definitely activated? */
+    if (this->hidden->render != NULL) { /* definitely activated? */
         /* WasapiFailed() will mark the device for reacquisition or removal elsewhere. */
         WasapiFailed(this, IAudioRenderClient_ReleaseBuffer(this->hidden->render, this->spec.samples, 0));
     }
 }
 
-static void
-WASAPI_WaitDevice(_THIS)
+static void WASAPI_WaitDevice(_THIS)
 {
     while (RecoverWasapiIfLost(this) && this->hidden->client && this->hidden->event) {
         DWORD waitResult = WaitForSingleObjectEx(this->hidden->event, 200, FALSE);
@@ -228,8 +219,7 @@ WASAPI_WaitDevice(_THIS)
     }
 }
 
-static int
-WASAPI_CaptureFromDevice(_THIS, void *buffer, int buflen)
+static int WASAPI_CaptureFromDevice(_THIS, void *buffer, int buflen)
 {
     SDL_AudioStream *stream = this->hidden->capturestream;
     const int avail = SDL_AudioStreamAvailable(stream);
@@ -261,7 +251,7 @@ WASAPI_CaptureFromDevice(_THIS, void *buffer, int buflen)
         if ((ret == AUDCLNT_S_BUFFER_EMPTY) || !frames) {
             WASAPI_WaitDevice(this);
         } else if (ret == S_OK) {
-            const int total = ((int) frames) * this->hidden->framesize;
+            const int total = ((int)frames) * this->hidden->framesize;
             const int cpy = SDL_min(buflen, total);
             const int leftover = total - cpy;
             const SDL_bool silent = (flags & AUDCLNT_BUFFERFLAGS_SILENT) ? SDL_TRUE : SDL_FALSE;
@@ -271,15 +261,15 @@ WASAPI_CaptureFromDevice(_THIS, void *buffer, int buflen)
             } else {
                 SDL_memcpy(buffer, ptr, cpy);
             }
-            
+
             if (leftover > 0) {
                 ptr += cpy;
                 if (silent) {
-                    SDL_memset(ptr, this->spec.silence, leftover);  /* I guess this is safe? */
+                    SDL_memset(ptr, this->spec.silence, leftover); /* I guess this is safe? */
                 }
 
                 if (SDL_AudioStreamPut(stream, ptr, leftover) == -1) {
-                    return -1;  /* uhoh, out of memory, etc. Kill device.  :( */
+                    return -1; /* uhoh, out of memory, etc. Kill device.  :( */
                 }
             }
 
@@ -290,36 +280,34 @@ WASAPI_CaptureFromDevice(_THIS, void *buffer, int buflen)
         }
     }
 
-    return -1;  /* unrecoverable error. */
+    return -1; /* unrecoverable error. */
 }
 
-static void
-WASAPI_FlushCapture(_THIS)
+static void WASAPI_FlushCapture(_THIS)
 {
     BYTE *ptr = NULL;
     UINT32 frames = 0;
     DWORD flags = 0;
 
     if (!this->hidden->capture) {
-        return;  /* not activated yet? */
+        return; /* not activated yet? */
     }
 
     /* just read until we stop getting packets, throwing them away. */
     while (SDL_TRUE) {
         const HRESULT ret = IAudioCaptureClient_GetBuffer(this->hidden->capture, &ptr, &frames, &flags, NULL, NULL);
         if (ret == AUDCLNT_S_BUFFER_EMPTY) {
-            break;  /* no more buffered data; we're done. */
+            break; /* no more buffered data; we're done. */
         } else if (WasapiFailed(this, ret)) {
-            break;  /* failed for some other reason, abort. */
+            break; /* failed for some other reason, abort. */
         } else if (WasapiFailed(this, IAudioCaptureClient_ReleaseBuffer(this->hidden->capture, frames))) {
-            break;  /* something broke. */
+            break; /* something broke. */
         }
     }
     SDL_AudioStreamClear(this->hidden->capturestream);
 }
 
-static void
-ReleaseWasapiDevice(_THIS)
+static void ReleaseWasapiDevice(_THIS)
 {
     if (this->hidden->client) {
         IAudioClient_Stop(this->hidden->client);
@@ -358,20 +346,17 @@ ReleaseWasapiDevice(_THIS)
     }
 }
 
-static void
-WASAPI_CloseDevice(_THIS)
+static void WASAPI_CloseDevice(_THIS)
 {
     WASAPI_UnrefDevice(this);
 }
 
-void
-WASAPI_RefDevice(_THIS)
+void WASAPI_RefDevice(_THIS)
 {
     SDL_AtomicIncRef(&this->hidden->refcount);
 }
 
-void
-WASAPI_UnrefDevice(_THIS)
+void WASAPI_UnrefDevice(_THIS)
 {
     if (!SDL_AtomicDecRef(&this->hidden->refcount)) {
         return;
@@ -388,8 +373,7 @@ WASAPI_UnrefDevice(_THIS)
 }
 
 /* This is called once a device is activated, possibly asynchronously. */
-int
-WASAPI_PrepDevice(_THIS, const SDL_bool updatestream)
+int WASAPI_PrepDevice(_THIS, const SDL_bool updatestream)
 {
     /* !!! FIXME: we could request an exclusive mode stream, which is lower latency;
        !!!  it will write into the kernel's audio buffer directly instead of
@@ -404,7 +388,7 @@ WASAPI_PrepDevice(_THIS, const SDL_bool updatestream)
        !!!  do in any case. */
     const SDL_AudioSpec oldspec = this->spec;
     const AUDCLNT_SHAREMODE sharemode = AUDCLNT_SHAREMODE_SHARED;
-    UINT32 bufsize = 0;  /* this is in sample frames, not samples, not bytes. */
+    UINT32 bufsize = 0; /* this is in sample frames, not samples, not bytes. */
     REFERENCE_TIME default_period = 0;
     IAudioClient *client = this->hidden->client;
     IAudioRenderClient *render = NULL;
@@ -435,7 +419,7 @@ WASAPI_PrepDevice(_THIS, const SDL_bool updatestream)
     SDL_assert(waveformat != NULL);
     this->hidden->waveformat = waveformat;
 
-    this->spec.channels = (Uint8) waveformat->nChannels;
+    this->spec.channels = (Uint8)waveformat->nChannels;
 
     /* Make sure we have a valid format that we can convert to whatever WASAPI wants. */
     wasapi_format = WaveFormatToSDLFormat(waveformat);
@@ -502,10 +486,10 @@ WASAPI_PrepDevice(_THIS, const SDL_bool updatestream)
     if (this->iscapture) {
         this->hidden->capturestream = SDL_NewAudioStream(this->spec.format, this->spec.channels, this->spec.freq, this->spec.format, this->spec.channels, this->spec.freq);
         if (!this->hidden->capturestream) {
-            return -1;  /* already set SDL_Error */
+            return -1; /* already set SDL_Error */
         }
 
-        ret = IAudioClient_GetService(client, &SDL_IID_IAudioCaptureClient, (void**) &capture);
+        ret = IAudioClient_GetService(client, &SDL_IID_IAudioCaptureClient, (void **)&capture);
         if (FAILED(ret)) {
             return WIN_SetErrorFromHRESULT("WASAPI can't get capture client service", ret);
         }
@@ -517,9 +501,9 @@ WASAPI_PrepDevice(_THIS, const SDL_bool updatestream)
             return WIN_SetErrorFromHRESULT("WASAPI can't start capture", ret);
         }
 
-        WASAPI_FlushCapture(this);  /* MSDN says you should flush capture endpoint right after startup. */
+        WASAPI_FlushCapture(this); /* MSDN says you should flush capture endpoint right after startup. */
     } else {
-        ret = IAudioClient_GetService(client, &SDL_IID_IAudioRenderClient, (void**) &render);
+        ret = IAudioClient_GetService(client, &SDL_IID_IAudioRenderClient, (void **)&render);
         if (FAILED(ret)) {
             return WIN_SetErrorFromHRESULT("WASAPI can't get render client service", ret);
         }
@@ -536,14 +520,12 @@ WASAPI_PrepDevice(_THIS, const SDL_bool updatestream)
         return UpdateAudioStream(this, &oldspec);
     }
 
-    return 0;  /* good to go. */
+    return 0; /* good to go. */
 }
 
-
-static int
-WASAPI_OpenDevice(_THIS, const char *devname)
+static int WASAPI_OpenDevice(_THIS, const char *devname)
 {
-    LPCWSTR devid = (LPCWSTR) this->handle;
+    LPCWSTR devid = (LPCWSTR)this->handle;
 
     /* Initialize all variables that we clean on shutdown */
     this->hidden = (struct SDL_PrivateAudioData *)
@@ -553,9 +535,9 @@ WASAPI_OpenDevice(_THIS, const char *devname)
     }
     SDL_zerop(this->hidden);
 
-    WASAPI_RefDevice(this);   /* so CloseDevice() will unref to zero. */
+    WASAPI_RefDevice(this); /* so CloseDevice() will unref to zero. */
 
-    if (!devid) {  /* is default device? */
+    if (!devid) { /* is default device? */
         this->hidden->default_device_generation = SDL_AtomicGet(this->iscapture ? &SDL_IMMDevice_DefaultCaptureGeneration : &SDL_IMMDevice_DefaultPlaybackGeneration);
     } else {
         this->hidden->devid = SDL_wcsdup(devid);
@@ -565,7 +547,7 @@ WASAPI_OpenDevice(_THIS, const char *devname)
     }
 
     if (WASAPI_ActivateDevice(this, SDL_FALSE) == -1) {
-        return -1;  /* already set error. */
+        return -1; /* already set error. */
     }
 
     /* Ready, but waiting for async device activation.
@@ -579,26 +561,22 @@ WASAPI_OpenDevice(_THIS, const char *devname)
     return 0;
 }
 
-static void
-WASAPI_ThreadInit(_THIS)
+static void WASAPI_ThreadInit(_THIS)
 {
     WASAPI_PlatformThreadInit(this);
 }
 
-static void
-WASAPI_ThreadDeinit(_THIS)
+static void WASAPI_ThreadDeinit(_THIS)
 {
     WASAPI_PlatformThreadDeinit(this);
 }
 
-static void
-WASAPI_Deinitialize(void)
+static void WASAPI_Deinitialize(void)
 {
     WASAPI_PlatformDeinit();
 }
 
-static SDL_bool
-WASAPI_Init(SDL_AudioDriverImpl * impl)
+static SDL_bool WASAPI_Init(SDL_AudioDriverImpl *impl)
 {
     if (WASAPI_PlatformInit() == -1) {
         return SDL_FALSE;
@@ -620,13 +598,13 @@ WASAPI_Init(SDL_AudioDriverImpl * impl)
     impl->HasCaptureSupport = SDL_TRUE;
     impl->SupportsNonPow2Samples = SDL_TRUE;
 
-    return SDL_TRUE;   /* this audio target is available. */
+    return SDL_TRUE; /* this audio target is available. */
 }
 
 AudioBootStrap WASAPI_bootstrap = {
     "wasapi", "WASAPI", WASAPI_Init, SDL_FALSE
 };
 
-#endif  /* SDL_AUDIO_DRIVER_WASAPI */
+#endif /* SDL_AUDIO_DRIVER_WASAPI */
 
 /* vi: set ts=4 sw=4 expandtab: */

src/audio/wasapi/SDL_wasapi_win32.c

@@ -45,26 +45,24 @@ static pfnAvSetMmThreadCharacteristicsW pAvSetMmThreadCharacteristicsW = NULL;
 static pfnAvRevertMmThreadCharacteristics pAvRevertMmThreadCharacteristics = NULL;
 
 /* Some GUIDs we need to know without linking to libraries that aren't available before Vista. */
-static const IID SDL_IID_IAudioClient = { 0x1cb9ad4c, 0xdbfa, 0x4c32,{ 0xb1, 0x78, 0xc2, 0xf5, 0x68, 0xa7, 0x03, 0xb2 } };
+static const IID SDL_IID_IAudioClient = { 0x1cb9ad4c, 0xdbfa, 0x4c32, { 0xb1, 0x78, 0xc2, 0xf5, 0x68, 0xa7, 0x03, 0xb2 } };
 
-int
-WASAPI_PlatformInit(void)
+int WASAPI_PlatformInit(void)
 {
     if (SDL_IMMDevice_Init() < 0) {
         return -1; /* This is set by SDL_IMMDevice_Init */
     }
 
-    libavrt = LoadLibrary(TEXT("avrt.dll"));  /* this library is available in Vista and later. No WinXP, so have to LoadLibrary to use it for now! */
+    libavrt = LoadLibrary(TEXT("avrt.dll")); /* this library is available in Vista and later. No WinXP, so have to LoadLibrary to use it for now! */
     if (libavrt) {
-        pAvSetMmThreadCharacteristicsW = (pfnAvSetMmThreadCharacteristicsW) GetProcAddress(libavrt, "AvSetMmThreadCharacteristicsW");
-        pAvRevertMmThreadCharacteristics = (pfnAvRevertMmThreadCharacteristics) GetProcAddress(libavrt, "AvRevertMmThreadCharacteristics");
+        pAvSetMmThreadCharacteristicsW = (pfnAvSetMmThreadCharacteristicsW)GetProcAddress(libavrt, "AvSetMmThreadCharacteristicsW");
+        pAvRevertMmThreadCharacteristics = (pfnAvRevertMmThreadCharacteristics)GetProcAddress(libavrt, "AvRevertMmThreadCharacteristics");
     }
 
     return 0;
 }
 
-void
-WASAPI_PlatformDeinit(void)
+void WASAPI_PlatformDeinit(void)
 {
     if (libavrt) {
         FreeLibrary(libavrt);
@@ -77,11 +75,10 @@ WASAPI_PlatformDeinit(void)
     SDL_IMMDevice_Quit();
 }
 
-void
-WASAPI_PlatformThreadInit(_THIS)
+void WASAPI_PlatformThreadInit(_THIS)
 {
     /* this thread uses COM. */
-    if (SUCCEEDED(WIN_CoInitialize())) {    /* can't report errors, hope it worked! */
+    if (SUCCEEDED(WIN_CoInitialize())) { /* can't report errors, hope it worked! */
         this->hidden->coinitialized = SDL_TRUE;
     }
 
@@ -92,8 +89,7 @@ WASAPI_PlatformThreadInit(_THIS)
     }
 }
 
-void
-WASAPI_PlatformThreadDeinit(_THIS)
+void WASAPI_PlatformThreadDeinit(_THIS)
 {
     /* Set this thread back to normal priority. */
     if (this->hidden->task && pAvRevertMmThreadCharacteristics) {
@@ -107,8 +103,7 @@ WASAPI_PlatformThreadDeinit(_THIS)
     }
 }
 
-int
-WASAPI_ActivateDevice(_THIS, const SDL_bool isrecovery)
+int WASAPI_ActivateDevice(_THIS, const SDL_bool isrecovery)
 {
     IMMDevice *device = NULL;
     HRESULT ret;
@@ -119,7 +114,7 @@ WASAPI_ActivateDevice(_THIS, const SDL_bool isrecovery)
     }
 
     /* this is not async in standard win32, yay! */
-    ret = IMMDevice_Activate(device, &SDL_IID_IAudioClient, CLSCTX_ALL, NULL, (void **) &this->hidden->client);
+    ret = IMMDevice_Activate(device, &SDL_IID_IAudioClient, CLSCTX_ALL, NULL, (void **)&this->hidden->client);
     IMMDevice_Release(device);
 
     if (FAILED(ret)) {
@@ -128,33 +123,29 @@ WASAPI_ActivateDevice(_THIS, const SDL_bool isrecovery)
     }
 
     SDL_assert(this->hidden->client != NULL);
-    if (WASAPI_PrepDevice(this, isrecovery) == -1) {   /* not async, fire it right away. */
+    if (WASAPI_PrepDevice(this, isrecovery) == -1) { /* not async, fire it right away. */
         return -1;
     }
 
-    return 0;  /* good to go. */
+    return 0; /* good to go. */
 }
 
-void
-WASAPI_EnumerateEndpoints(void)
+void WASAPI_EnumerateEndpoints(void)
 {
     SDL_IMMDevice_EnumerateEndpoints(SDL_FALSE);
 }
 
-int
-WASAPI_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
+int WASAPI_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
 {
     return SDL_IMMDevice_GetDefaultAudioInfo(name, spec, iscapture);
 }
 
-void
-WASAPI_PlatformDeleteActivationHandler(void *handler)
+void WASAPI_PlatformDeleteActivationHandler(void *handler)
 {
     /* not asynchronous. */
     SDL_assert(!"This function should have only been called on WinRT.");
 }
 
-#endif  /* SDL_AUDIO_DRIVER_WASAPI && !defined(__WINRT__) */
+#endif /* SDL_AUDIO_DRIVER_WASAPI && !defined(__WINRT__) */
 
 /* vi: set ts=4 sw=4 expandtab: */
-

src/audio/wasapi/SDL_wasapi_winrt.cpp

@@ -51,13 +51,13 @@ using namespace Windows::Media::Devices;
 using namespace Windows::Foundation;
 using namespace Microsoft::WRL;
 
-static Platform::String^ SDL_PKEY_AudioEngine_DeviceFormat = L"{f19f064d-082c-4e27-bc73-6882a1bb8e4c} 0";
+static Platform::String ^ SDL_PKEY_AudioEngine_DeviceFormat = L"{f19f064d-082c-4e27-bc73-6882a1bb8e4c} 0";
 
 static void WASAPI_AddDevice(const SDL_bool iscapture, const char *devname, WAVEFORMATEXTENSIBLE *fmt, LPCWSTR devid);
 static void WASAPI_RemoveDevice(const SDL_bool iscapture, LPCWSTR devid);
 extern "C" {
-    SDL_atomic_t SDL_IMMDevice_DefaultPlaybackGeneration;
-    SDL_atomic_t SDL_IMMDevice_DefaultCaptureGeneration;
+SDL_atomic_t SDL_IMMDevice_DefaultPlaybackGeneration;
+SDL_atomic_t SDL_IMMDevice_DefaultCaptureGeneration;
 }
 
 /* This is a list of device id strings we have inflight, so we have consistent pointers to the same device. */
@@ -71,20 +71,20 @@ static DevIdList *deviceid_list = NULL;
 
 class SDL_WasapiDeviceEventHandler
 {
-public:
+  public:
     SDL_WasapiDeviceEventHandler(const SDL_bool _iscapture);
     ~SDL_WasapiDeviceEventHandler();
-    void OnDeviceAdded(DeviceWatcher^ sender, DeviceInformation^ args);
-    void OnDeviceRemoved(DeviceWatcher^ sender, DeviceInformationUpdate^ args);
-    void OnDeviceUpdated(DeviceWatcher^ sender, DeviceInformationUpdate^ args);
-    void OnEnumerationCompleted(DeviceWatcher^ sender, Platform::Object^ args);
-    void OnDefaultRenderDeviceChanged(Platform::Object^ sender, DefaultAudioRenderDeviceChangedEventArgs^ args);
-    void OnDefaultCaptureDeviceChanged(Platform::Object^ sender, DefaultAudioCaptureDeviceChangedEventArgs^ args);
-    SDL_semaphore* completed;
-
-private:
+    void OnDeviceAdded(DeviceWatcher ^ sender, DeviceInformation ^ args);
+    void OnDeviceRemoved(DeviceWatcher ^ sender, DeviceInformationUpdate ^ args);
+    void OnDeviceUpdated(DeviceWatcher ^ sender, DeviceInformationUpdate ^ args);
+    void OnEnumerationCompleted(DeviceWatcher ^ sender, Platform::Object ^ args);
+    void OnDefaultRenderDeviceChanged(Platform::Object ^ sender, DefaultAudioRenderDeviceChangedEventArgs ^ args);
+    void OnDefaultCaptureDeviceChanged(Platform::Object ^ sender, DefaultAudioCaptureDeviceChangedEventArgs ^ args);
+    SDL_semaphore *completed;
+
+  private:
     const SDL_bool iscapture;
-    DeviceWatcher^ watcher;
+    DeviceWatcher ^ watcher;
     Windows::Foundation::EventRegistrationToken added_handler;
     Windows::Foundation::EventRegistrationToken removed_handler;
     Windows::Foundation::EventRegistrationToken updated_handler;
@@ -93,29 +93,27 @@ private:
 };
 
 SDL_WasapiDeviceEventHandler::SDL_WasapiDeviceEventHandler(const SDL_bool _iscapture)
-    : iscapture(_iscapture)
-    , completed(SDL_CreateSemaphore(0))
+    : iscapture(_iscapture), completed(SDL_CreateSemaphore(0))
 {
     if (!completed)
-        return;  // uhoh.
+        return; // uhoh.
 
-    Platform::String^ selector = _iscapture ? MediaDevice::GetAudioCaptureSelector() :
-                                              MediaDevice::GetAudioRenderSelector();
-    Platform::Collections::Vector<Platform::String^> properties;
+    Platform::String ^ selector = _iscapture ? MediaDevice::GetAudioCaptureSelector() : MediaDevice::GetAudioRenderSelector();
+    Platform::Collections::Vector<Platform::String ^> properties;
     properties.Append(SDL_PKEY_AudioEngine_DeviceFormat);
     watcher = DeviceInformation::CreateWatcher(selector, properties.GetView());
     if (!watcher)
-        return;  // uhoh.
+        return; // uhoh.
 
     // !!! FIXME: this doesn't need a lambda here, I think, if I make SDL_WasapiDeviceEventHandler a proper C++/CX class. --ryan.
-    added_handler = watcher->Added += ref new TypedEventHandler<DeviceWatcher^, DeviceInformation^>([this](DeviceWatcher^ sender, DeviceInformation^ args) { OnDeviceAdded(sender, args); } );
-    removed_handler = watcher->Removed += ref new TypedEventHandler<DeviceWatcher^, DeviceInformationUpdate^>([this](DeviceWatcher^ sender, DeviceInformationUpdate^ args) { OnDeviceRemoved(sender, args); } );
-    updated_handler = watcher->Updated += ref new TypedEventHandler<DeviceWatcher^, DeviceInformationUpdate^>([this](DeviceWatcher^ sender, DeviceInformationUpdate^ args) { OnDeviceUpdated(sender, args); } );
-    completed_handler = watcher->EnumerationCompleted += ref new TypedEventHandler<DeviceWatcher^, Platform::Object^>([this](DeviceWatcher^ sender, Platform::Object^ args) { OnEnumerationCompleted(sender, args); } );
+    added_handler = watcher->Added += ref new TypedEventHandler<DeviceWatcher ^, DeviceInformation ^>([this](DeviceWatcher ^ sender, DeviceInformation ^ args) { OnDeviceAdded(sender, args); });
+    removed_handler = watcher->Removed += ref new TypedEventHandler<DeviceWatcher ^, DeviceInformationUpdate ^>([this](DeviceWatcher ^ sender, DeviceInformationUpdate ^ args) { OnDeviceRemoved(sender, args); });
+    updated_handler = watcher->Updated += ref new TypedEventHandler<DeviceWatcher ^, DeviceInformationUpdate ^>([this](DeviceWatcher ^ sender, DeviceInformationUpdate ^ args) { OnDeviceUpdated(sender, args); });
+    completed_handler = watcher->EnumerationCompleted += ref new TypedEventHandler<DeviceWatcher ^, Platform::Object ^>([this](DeviceWatcher ^ sender, Platform::Object ^ args) { OnEnumerationCompleted(sender, args); });
     if (iscapture) {
-        default_changed_handler = MediaDevice::DefaultAudioCaptureDeviceChanged += ref new TypedEventHandler<Platform::Object^, DefaultAudioCaptureDeviceChangedEventArgs^>([this](Platform::Object^ sender, DefaultAudioCaptureDeviceChangedEventArgs^ args) { OnDefaultCaptureDeviceChanged(sender, args); } );
+        default_changed_handler = MediaDevice::DefaultAudioCaptureDeviceChanged += ref new TypedEventHandler<Platform::Object ^, DefaultAudioCaptureDeviceChangedEventArgs ^>([this](Platform::Object ^ sender, DefaultAudioCaptureDeviceChangedEventArgs ^ args) { OnDefaultCaptureDeviceChanged(sender, args); });
     } else {
-        default_changed_handler = MediaDevice::DefaultAudioRenderDeviceChanged += ref new TypedEventHandler<Platform::Object^, DefaultAudioRenderDeviceChangedEventArgs^>([this](Platform::Object^ sender, DefaultAudioRenderDeviceChangedEventArgs^ args) { OnDefaultRenderDeviceChanged(sender, args); } );
+        default_changed_handler = MediaDevice::DefaultAudioRenderDeviceChanged += ref new TypedEventHandler<Platform::Object ^, DefaultAudioRenderDeviceChangedEventArgs ^>([this](Platform::Object ^ sender, DefaultAudioRenderDeviceChangedEventArgs ^ args) { OnDefaultRenderDeviceChanged(sender, args); });
     }
     watcher->Start();
 }
@@ -142,17 +140,16 @@ SDL_WasapiDeviceEventHandler::~SDL_WasapiDeviceEventHandler()
     }
 }
 
-void
-SDL_WasapiDeviceEventHandler::OnDeviceAdded(DeviceWatcher^ sender, DeviceInformation^ info)
+void SDL_WasapiDeviceEventHandler::OnDeviceAdded(DeviceWatcher ^ sender, DeviceInformation ^ info)
 {
     SDL_assert(sender == this->watcher);
     char *utf8dev = WIN_StringToUTF8(info->Name->Data());
     if (utf8dev) {
         WAVEFORMATEXTENSIBLE fmt;
-        Platform::Object^ obj = info->Properties->Lookup(SDL_PKEY_AudioEngine_DeviceFormat);
+        Platform::Object ^ obj = info->Properties->Lookup(SDL_PKEY_AudioEngine_DeviceFormat);
         if (obj) {
-            IPropertyValue^ property = (IPropertyValue^) obj;
-            Platform::Array<unsigned char>^ data;
+            IPropertyValue ^ property = (IPropertyValue ^) obj;
+            Platform::Array<unsigned char> ^ data;
             property->GetUInt8Array(&data);
             SDL_memcpy(&fmt, data->Data, SDL_min(data->Length, sizeof(WAVEFORMATEXTENSIBLE)));
         } else {
@@ -164,41 +161,35 @@ SDL_WasapiDeviceEventHandler::OnDeviceAdded(DeviceWatcher^ sender, DeviceInforma
     }
 }
 
-void
-SDL_WasapiDeviceEventHandler::OnDeviceRemoved(DeviceWatcher^ sender, DeviceInformationUpdate^ info)
+void SDL_WasapiDeviceEventHandler::OnDeviceRemoved(DeviceWatcher ^ sender, DeviceInformationUpdate ^ info)
 {
     SDL_assert(sender == this->watcher);
     WASAPI_RemoveDevice(this->iscapture, info->Id->Data());
 }
 
-void
-SDL_WasapiDeviceEventHandler::OnDeviceUpdated(DeviceWatcher^ sender, DeviceInformationUpdate^ args)
+void SDL_WasapiDeviceEventHandler::OnDeviceUpdated(DeviceWatcher ^ sender, DeviceInformationUpdate ^ args)
 {
     SDL_assert(sender == this->watcher);
 }
 
-void
-SDL_WasapiDeviceEventHandler::OnEnumerationCompleted(DeviceWatcher^ sender, Platform::Object^ args)
+void SDL_WasapiDeviceEventHandler::OnEnumerationCompleted(DeviceWatcher ^ sender, Platform::Object ^ args)
 {
     SDL_assert(sender == this->watcher);
     SDL_SemPost(this->completed);
 }
 
-void
-SDL_WasapiDeviceEventHandler::OnDefaultRenderDeviceChanged(Platform::Object^ sender, DefaultAudioRenderDeviceChangedEventArgs^ args)
+void SDL_WasapiDeviceEventHandler::OnDefaultRenderDeviceChanged(Platform::Object ^ sender, DefaultAudioRenderDeviceChangedEventArgs ^ args)
 {
     SDL_assert(this->iscapture);
     SDL_AtomicAdd(&SDL_IMMDevice_DefaultPlaybackGeneration, 1);
 }
 
-void
-SDL_WasapiDeviceEventHandler::OnDefaultCaptureDeviceChanged(Platform::Object^ sender, DefaultAudioCaptureDeviceChangedEventArgs^ args)
+void SDL_WasapiDeviceEventHandler::OnDefaultCaptureDeviceChanged(Platform::Object ^ sender, DefaultAudioCaptureDeviceChangedEventArgs ^ args)
 {
     SDL_assert(!this->iscapture);
     SDL_AtomicAdd(&SDL_IMMDevice_DefaultCaptureGeneration, 1);
 }
 
-
 static SDL_WasapiDeviceEventHandler *playback_device_event_handler;
 static SDL_WasapiDeviceEventHandler *capture_device_event_handler;
 
@@ -238,10 +229,11 @@ void WASAPI_EnumerateEndpoints(void)
     SDL_SemWait(capture_device_event_handler->completed);
 }
 
-struct SDL_WasapiActivationHandler : public RuntimeClass< RuntimeClassFlags< ClassicCom >, FtmBase, IActivateAudioInterfaceCompletionHandler >
+struct SDL_WasapiActivationHandler : public RuntimeClass<RuntimeClassFlags<ClassicCom>, FtmBase, IActivateAudioInterfaceCompletionHandler>
 {
     SDL_WasapiActivationHandler() : device(nullptr) {}
-    STDMETHOD(ActivateCompleted)(IActivateAudioInterfaceAsyncOperation *operation);
+    STDMETHOD(ActivateCompleted)
+    (IActivateAudioInterfaceAsyncOperation *operation);
     SDL_AudioDevice *device;
 };
 
@@ -254,23 +246,20 @@ SDL_WasapiActivationHandler::ActivateCompleted(IActivateAudioInterfaceAsyncOpera
     return S_OK;
 }
 
-void
-WASAPI_PlatformDeleteActivationHandler(void *handler)
+void WASAPI_PlatformDeleteActivationHandler(void *handler)
 {
-    ((SDL_WasapiActivationHandler *) handler)->Release();
+    ((SDL_WasapiActivationHandler *)handler)->Release();
 }
 
-int
-WASAPI_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
+int WASAPI_GetDefaultAudioInfo(char **name, SDL_AudioSpec *spec, int iscapture)
 {
     return SDL_Unsupported();
 }
 
-int
-WASAPI_ActivateDevice(_THIS, const SDL_bool isrecovery)
+int WASAPI_ActivateDevice(_THIS, const SDL_bool isrecovery)
 {
     LPCWSTR devid = _this->hidden->devid;
-    Platform::String^ defdevid;
+    Platform::String ^ defdevid;
 
     if (devid == nullptr) {
         defdevid = _this->iscapture ? MediaDevice::GetDefaultAudioCaptureId(AudioDeviceRole::Default) : MediaDevice::GetDefaultAudioRenderId(AudioDeviceRole::Default);
@@ -286,11 +275,11 @@ WASAPI_ActivateDevice(_THIS, const SDL_bool isrecovery)
         return SDL_SetError("Failed to allocate WASAPI activation handler");
     }
 
-    handler.Get()->AddRef();  // we hold a reference after ComPtr destructs on return, causing a Release, and Release ourselves in WASAPI_PlatformDeleteActivationHandler(), etc.
+    handler.Get()->AddRef(); // we hold a reference after ComPtr destructs on return, causing a Release, and Release ourselves in WASAPI_PlatformDeleteActivationHandler(), etc.
     handler.Get()->device = _this;
     _this->hidden->activation_handler = handler.Get();
 
-    WASAPI_RefDevice(_this);  /* completion handler will unref it. */
+    WASAPI_RefDevice(_this); /* completion handler will unref it. */
     IActivateAudioInterfaceAsyncOperation *async = nullptr;
     const HRESULT ret = ActivateAudioInterfaceAsync(devid, __uuidof(IAudioClient), nullptr, handler.Get(), &async);
 
@@ -337,22 +326,20 @@ WASAPI_ActivateDevice(_THIS, const SDL_bool isrecovery)
     return 0;
 }
 
-void
-WASAPI_PlatformThreadInit(_THIS)
+void WASAPI_PlatformThreadInit(_THIS)
 {
     // !!! FIXME: set this thread to "Pro Audio" priority.
 }
 
-void
-WASAPI_PlatformThreadDeinit(_THIS)
+void WASAPI_PlatformThreadDeinit(_THIS)
 {
     // !!! FIXME: set this thread to "Pro Audio" priority.
 }
 
 /* Everything below was copied from SDL_wasapi.c, before it got moved to SDL_immdevice.c! */
 
-static const GUID SDL_KSDATAFORMAT_SUBTYPE_PCM = { 0x00000001, 0x0000, 0x0010,{ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } };
-static const GUID SDL_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = { 0x00000003, 0x0000, 0x0010,{ 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } };
+static const GUID SDL_KSDATAFORMAT_SUBTYPE_PCM = { 0x00000001, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } };
+static const GUID SDL_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = { 0x00000003, 0x0000, 0x0010, { 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 } };
 
 extern "C" SDL_AudioFormat
 WaveFormatToSDLFormat(WAVEFORMATEX *waveformat)
@@ -376,8 +363,7 @@ WaveFormatToSDLFormat(WAVEFORMATEX *waveformat)
     return 0;
 }
 
-static void
-WASAPI_RemoveDevice(const SDL_bool iscapture, LPCWSTR devid)
+static void WASAPI_RemoveDevice(const SDL_bool iscapture, LPCWSTR devid)
 {
     DevIdList *i;
     DevIdList *next;
@@ -399,8 +385,7 @@ WASAPI_RemoveDevice(const SDL_bool iscapture, LPCWSTR devid)
     }
 }
 
-static void
-WASAPI_AddDevice(const SDL_bool iscapture, const char *devname, WAVEFORMATEXTENSIBLE *fmt, LPCWSTR devid)
+static void WASAPI_AddDevice(const SDL_bool iscapture, const char *devname, WAVEFORMATEXTENSIBLE *fmt, LPCWSTR devid)
 {
     DevIdList *devidlist;
     SDL_AudioSpec spec;
@@ -410,22 +395,22 @@ WASAPI_AddDevice(const SDL_bool iscapture, const char *devname, WAVEFORMATEXTENS
        phones and tablets, where you might have an internal speaker and a headphone jack and expect both to be
        available and switch automatically. (!!! FIXME...?) */
 
-       /* see if we already have this one. */
+    /* see if we already have this one. */
     for (devidlist = deviceid_list; devidlist; devidlist = devidlist->next) {
         if (SDL_wcscmp(devidlist->str, devid) == 0) {
-            return;  /* we already have this. */
+            return; /* we already have this. */
         }
     }
 
     devidlist = (DevIdList *)SDL_malloc(sizeof(*devidlist));
     if (devidlist == NULL) {
-        return;  /* oh well. */
+        return; /* oh well. */
     }
 
     devid = SDL_wcsdup(devid);
     if (!devid) {
         SDL_free(devidlist);
-        return;  /* oh well. */
+        return; /* oh well. */
     }
 
     devidlist->str = (WCHAR *)devid;
@@ -439,6 +424,6 @@ WASAPI_AddDevice(const SDL_bool iscapture, const char *devname, WAVEFORMATEXTENS
     SDL_AddAudioDevice(iscapture, devname, &spec, (void *)devid);
 }
 
-#endif  // SDL_AUDIO_DRIVER_WASAPI && defined(__WINRT__)
+#endif // SDL_AUDIO_DRIVER_WASAPI && defined(__WINRT__)
 
 /* vi: set ts=4 sw=4 expandtab: */

src/core/android/SDL_android.c

@@ -20,7 +20,6 @@
 */
 #include "SDL_internal.h"
 
-
 #ifdef __ANDROID__
 
 #include "SDL_android.h"
@@ -43,176 +42,176 @@
 #include <unistd.h>
 #include <dlfcn.h>
 
-#define SDL_JAVA_PREFIX                                 org_libsdl_app
-#define CONCAT1(prefix, class, function)                CONCAT2(prefix, class, function)
-#define CONCAT2(prefix, class, function)                Java_ ## prefix ## _ ## class ## _ ## function
-#define SDL_JAVA_INTERFACE(function)                    CONCAT1(SDL_JAVA_PREFIX, SDLActivity, function)
-#define SDL_JAVA_AUDIO_INTERFACE(function)              CONCAT1(SDL_JAVA_PREFIX, SDLAudioManager, function)
-#define SDL_JAVA_CONTROLLER_INTERFACE(function)         CONCAT1(SDL_JAVA_PREFIX, SDLControllerManager, function)
-#define SDL_JAVA_INTERFACE_INPUT_CONNECTION(function)   CONCAT1(SDL_JAVA_PREFIX, SDLInputConnection, function)
+#define SDL_JAVA_PREFIX                               org_libsdl_app
+#define CONCAT1(prefix, class, function)              CONCAT2(prefix, class, function)
+#define CONCAT2(prefix, class, function)              Java_##prefix##_##class##_##function
+#define SDL_JAVA_INTERFACE(function)                  CONCAT1(SDL_JAVA_PREFIX, SDLActivity, function)
+#define SDL_JAVA_AUDIO_INTERFACE(function)            CONCAT1(SDL_JAVA_PREFIX, SDLAudioManager, function)
+#define SDL_JAVA_CONTROLLER_INTERFACE(function)       CONCAT1(SDL_JAVA_PREFIX, SDLControllerManager, function)
+#define SDL_JAVA_INTERFACE_INPUT_CONNECTION(function) CONCAT1(SDL_JAVA_PREFIX, SDLInputConnection, function)
 
 /* Audio encoding definitions */
-#define ENCODING_PCM_8BIT   3
-#define ENCODING_PCM_16BIT  2
-#define ENCODING_PCM_FLOAT  4
+#define ENCODING_PCM_8BIT  3
+#define ENCODING_PCM_16BIT 2
+#define ENCODING_PCM_FLOAT 4
 
 /* Java class SDLActivity */
 JNIEXPORT jstring JNICALL SDL_JAVA_INTERFACE(nativeGetVersion)(
-        JNIEnv *env, jclass cls);
+    JNIEnv *env, jclass cls);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetupJNI)(
-        JNIEnv *env, jclass cls);
+    JNIEnv *env, jclass cls);
 
 JNIEXPORT int JNICALL SDL_JAVA_INTERFACE(nativeRunMain)(
-        JNIEnv *env, jclass cls,
-        jstring library, jstring function, jobject array);
+    JNIEnv *env, jclass cls,
+    jstring library, jstring function, jobject array);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeDropFile)(
-        JNIEnv *env, jclass jcls,
-        jstring filename);
+    JNIEnv *env, jclass jcls,
+    jstring filename);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetScreenResolution)(
-        JNIEnv *env, jclass jcls,
-        jint surfaceWidth, jint surfaceHeight,
-        jint deviceWidth, jint deviceHeight, jfloat rate);
+    JNIEnv *env, jclass jcls,
+    jint surfaceWidth, jint surfaceHeight,
+    jint deviceWidth, jint deviceHeight, jfloat rate);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeResize)(
-        JNIEnv *env, jclass cls);
+    JNIEnv *env, jclass cls);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeSurfaceCreated)(
-        JNIEnv *env, jclass jcls);
+    JNIEnv *env, jclass jcls);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeSurfaceChanged)(
-        JNIEnv *env, jclass jcls);
+    JNIEnv *env, jclass jcls);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeSurfaceDestroyed)(
-        JNIEnv *env, jclass jcls);
+    JNIEnv *env, jclass jcls);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeKeyDown)(
-        JNIEnv *env, jclass jcls,
-        jint keycode);
+    JNIEnv *env, jclass jcls,
+    jint keycode);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeKeyUp)(
-        JNIEnv *env, jclass jcls,
-        jint keycode);
+    JNIEnv *env, jclass jcls,
+    jint keycode);
 
 JNIEXPORT jboolean JNICALL SDL_JAVA_INTERFACE(onNativeSoftReturnKey)(
-        JNIEnv *env, jclass jcls);
+    JNIEnv *env, jclass jcls);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeKeyboardFocusLost)(
-        JNIEnv *env, jclass jcls);
+    JNIEnv *env, jclass jcls);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeTouch)(
-        JNIEnv *env, jclass jcls,
-        jint touch_device_id_in, jint pointer_finger_id_in,
-        jint action, jfloat x, jfloat y, jfloat p);
+    JNIEnv *env, jclass jcls,
+    jint touch_device_id_in, jint pointer_finger_id_in,
+    jint action, jfloat x, jfloat y, jfloat p);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeMouse)(
-        JNIEnv *env, jclass jcls,
-        jint button, jint action, jfloat x, jfloat y, jboolean relative);
+    JNIEnv *env, jclass jcls,
+    jint button, jint action, jfloat x, jfloat y, jboolean relative);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeAccel)(
-        JNIEnv *env, jclass jcls,
-        jfloat x, jfloat y, jfloat z);
+    JNIEnv *env, jclass jcls,
+    jfloat x, jfloat y, jfloat z);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeClipboardChanged)(
-        JNIEnv *env, jclass jcls);
+    JNIEnv *env, jclass jcls);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeLowMemory)(
-        JNIEnv *env, jclass cls);
+    JNIEnv *env, jclass cls);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeLocaleChanged)(
-        JNIEnv *env, jclass cls);
+    JNIEnv *env, jclass cls);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSendQuit)(
-        JNIEnv *env, jclass cls);
+    JNIEnv *env, jclass cls);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeQuit)(
-        JNIEnv *env, jclass cls);
+    JNIEnv *env, jclass cls);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativePause)(
-        JNIEnv *env, jclass cls);
+    JNIEnv *env, jclass cls);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeResume)(
-        JNIEnv *env, jclass cls);
+    JNIEnv *env, jclass cls);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeFocusChanged)(
-        JNIEnv *env, jclass cls, jboolean hasFocus);
+    JNIEnv *env, jclass cls, jboolean hasFocus);
 
 JNIEXPORT jstring JNICALL SDL_JAVA_INTERFACE(nativeGetHint)(
-        JNIEnv *env, jclass cls,
-        jstring name);
+    JNIEnv *env, jclass cls,
+    jstring name);
 
 JNIEXPORT jboolean JNICALL SDL_JAVA_INTERFACE(nativeGetHintBoolean)(
-        JNIEnv *env, jclass cls,
-        jstring name, jboolean default_value);
+    JNIEnv *env, jclass cls,
+    jstring name, jboolean default_value);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetenv)(
-        JNIEnv *env, jclass cls,
-        jstring name, jstring value);
+    JNIEnv *env, jclass cls,
+    jstring name, jstring value);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeOrientationChanged)(
-        JNIEnv *env, jclass cls,
-        jint orientation);
+    JNIEnv *env, jclass cls,
+    jint orientation);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeAddTouch)(
-        JNIEnv* env, jclass cls,
-        jint touchId, jstring name);
+    JNIEnv *env, jclass cls,
+    jint touchId, jstring name);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativePermissionResult)(
-        JNIEnv* env, jclass cls,
-        jint requestCode, jboolean result);
+    JNIEnv *env, jclass cls,
+    jint requestCode, jboolean result);
 
 static JNINativeMethod SDLActivity_tab[] = {
-    { "nativeGetVersion",           "()Ljava/lang/String;", SDL_JAVA_INTERFACE(nativeGetVersion) },
-    { "nativeSetupJNI",             "()I", SDL_JAVA_INTERFACE(nativeSetupJNI) },
-    { "nativeRunMain",              "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)I", SDL_JAVA_INTERFACE(nativeRunMain) },
-    { "onNativeDropFile",           "(Ljava/lang/String;)V", SDL_JAVA_INTERFACE(onNativeDropFile) },
-    { "nativeSetScreenResolution",  "(IIIIF)V", SDL_JAVA_INTERFACE(nativeSetScreenResolution) },
-    { "onNativeResize",             "()V", SDL_JAVA_INTERFACE(onNativeResize) },
-    { "onNativeSurfaceCreated",     "()V", SDL_JAVA_INTERFACE(onNativeSurfaceCreated) },
-    { "onNativeSurfaceChanged",     "()V", SDL_JAVA_INTERFACE(onNativeSurfaceChanged) },
-    { "onNativeSurfaceDestroyed",   "()V", SDL_JAVA_INTERFACE(onNativeSurfaceDestroyed) },
-    { "onNativeKeyDown",            "(I)V", SDL_JAVA_INTERFACE(onNativeKeyDown) },
-    { "onNativeKeyUp",              "(I)V", SDL_JAVA_INTERFACE(onNativeKeyUp) },
-    { "onNativeSoftReturnKey",      "()Z", SDL_JAVA_INTERFACE(onNativeSoftReturnKey) },
-    { "onNativeKeyboardFocusLost",  "()V", SDL_JAVA_INTERFACE(onNativeKeyboardFocusLost) },
-    { "onNativeTouch",              "(IIIFFF)V", SDL_JAVA_INTERFACE(onNativeTouch) },
-    { "onNativeMouse",              "(IIFFZ)V", SDL_JAVA_INTERFACE(onNativeMouse) },
-    { "onNativeAccel",              "(FFF)V", SDL_JAVA_INTERFACE(onNativeAccel) },
-    { "onNativeClipboardChanged",   "()V", SDL_JAVA_INTERFACE(onNativeClipboardChanged) },
-    { "nativeLowMemory",            "()V", SDL_JAVA_INTERFACE(nativeLowMemory) },
-    { "onNativeLocaleChanged",      "()V", SDL_JAVA_INTERFACE(onNativeLocaleChanged) },
-    { "nativeSendQuit",             "()V", SDL_JAVA_INTERFACE(nativeSendQuit) },
-    { "nativeQuit",                 "()V", SDL_JAVA_INTERFACE(nativeQuit) },
-    { "nativePause",                "()V", SDL_JAVA_INTERFACE(nativePause) },
-    { "nativeResume",               "()V", SDL_JAVA_INTERFACE(nativeResume) },
-    { "nativeFocusChanged",         "(Z)V", SDL_JAVA_INTERFACE(nativeFocusChanged) },
-    { "nativeGetHint",              "(Ljava/lang/String;)Ljava/lang/String;", SDL_JAVA_INTERFACE(nativeGetHint) },
-    { "nativeGetHintBoolean",       "(Ljava/lang/String;Z)Z", SDL_JAVA_INTERFACE(nativeGetHintBoolean) },
-    { "nativeSetenv",               "(Ljava/lang/String;Ljava/lang/String;)V", SDL_JAVA_INTERFACE(nativeSetenv) },
+    { "nativeGetVersion", "()Ljava/lang/String;", SDL_JAVA_INTERFACE(nativeGetVersion) },
+    { "nativeSetupJNI", "()I", SDL_JAVA_INTERFACE(nativeSetupJNI) },
+    { "nativeRunMain", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)I", SDL_JAVA_INTERFACE(nativeRunMain) },
+    { "onNativeDropFile", "(Ljava/lang/String;)V", SDL_JAVA_INTERFACE(onNativeDropFile) },
+    { "nativeSetScreenResolution", "(IIIIF)V", SDL_JAVA_INTERFACE(nativeSetScreenResolution) },
+    { "onNativeResize", "()V", SDL_JAVA_INTERFACE(onNativeResize) },
+    { "onNativeSurfaceCreated", "()V", SDL_JAVA_INTERFACE(onNativeSurfaceCreated) },
+    { "onNativeSurfaceChanged", "()V", SDL_JAVA_INTERFACE(onNativeSurfaceChanged) },
+    { "onNativeSurfaceDestroyed", "()V", SDL_JAVA_INTERFACE(onNativeSurfaceDestroyed) },
+    { "onNativeKeyDown", "(I)V", SDL_JAVA_INTERFACE(onNativeKeyDown) },
+    { "onNativeKeyUp", "(I)V", SDL_JAVA_INTERFACE(onNativeKeyUp) },
+    { "onNativeSoftReturnKey", "()Z", SDL_JAVA_INTERFACE(onNativeSoftReturnKey) },
+    { "onNativeKeyboardFocusLost", "()V", SDL_JAVA_INTERFACE(onNativeKeyboardFocusLost) },
+    { "onNativeTouch", "(IIIFFF)V", SDL_JAVA_INTERFACE(onNativeTouch) },
+    { "onNativeMouse", "(IIFFZ)V", SDL_JAVA_INTERFACE(onNativeMouse) },
+    { "onNativeAccel", "(FFF)V", SDL_JAVA_INTERFACE(onNativeAccel) },
+    { "onNativeClipboardChanged", "()V", SDL_JAVA_INTERFACE(onNativeClipboardChanged) },
+    { "nativeLowMemory", "()V", SDL_JAVA_INTERFACE(nativeLowMemory) },
+    { "onNativeLocaleChanged", "()V", SDL_JAVA_INTERFACE(onNativeLocaleChanged) },
+    { "nativeSendQuit", "()V", SDL_JAVA_INTERFACE(nativeSendQuit) },
+    { "nativeQuit", "()V", SDL_JAVA_INTERFACE(nativeQuit) },
+    { "nativePause", "()V", SDL_JAVA_INTERFACE(nativePause) },
+    { "nativeResume", "()V", SDL_JAVA_INTERFACE(nativeResume) },
+    { "nativeFocusChanged", "(Z)V", SDL_JAVA_INTERFACE(nativeFocusChanged) },
+    { "nativeGetHint", "(Ljava/lang/String;)Ljava/lang/String;", SDL_JAVA_INTERFACE(nativeGetHint) },
+    { "nativeGetHintBoolean", "(Ljava/lang/String;Z)Z", SDL_JAVA_INTERFACE(nativeGetHintBoolean) },
+    { "nativeSetenv", "(Ljava/lang/String;Ljava/lang/String;)V", SDL_JAVA_INTERFACE(nativeSetenv) },
     { "onNativeOrientationChanged", "(I)V", SDL_JAVA_INTERFACE(onNativeOrientationChanged) },
-    { "nativeAddTouch",             "(ILjava/lang/String;)V", SDL_JAVA_INTERFACE(nativeAddTouch) },
-    { "nativePermissionResult",     "(IZ)V", SDL_JAVA_INTERFACE(nativePermissionResult) }
+    { "nativeAddTouch", "(ILjava/lang/String;)V", SDL_JAVA_INTERFACE(nativeAddTouch) },
+    { "nativePermissionResult", "(IZ)V", SDL_JAVA_INTERFACE(nativePermissionResult) }
 };
 
 /* Java class SDLInputConnection */
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE_INPUT_CONNECTION(nativeCommitText)(
-        JNIEnv *env, jclass cls,
-        jstring text, jint newCursorPosition);
+    JNIEnv *env, jclass cls,
+    jstring text, jint newCursorPosition);
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE_INPUT_CONNECTION(nativeGenerateScancodeForUnichar)(
-        JNIEnv *env, jclass cls,
-        jchar chUnicode);
+    JNIEnv *env, jclass cls,
+    jchar chUnicode);
 
 static JNINativeMethod SDLInputConnection_tab[] = {
-    { "nativeCommitText",                   "(Ljava/lang/String;I)V", SDL_JAVA_INTERFACE_INPUT_CONNECTION(nativeCommitText) },
-    { "nativeGenerateScancodeForUnichar",   "(C)V", SDL_JAVA_INTERFACE_INPUT_CONNECTION(nativeGenerateScancodeForUnichar) }
+    { "nativeCommitText", "(Ljava/lang/String;I)V", SDL_JAVA_INTERFACE_INPUT_CONNECTION(nativeCommitText) },
+    { "nativeGenerateScancodeForUnichar", "(C)V", SDL_JAVA_INTERFACE_INPUT_CONNECTION(nativeGenerateScancodeForUnichar) }
 };
 
 /* Java class SDLAudioManager */
 JNIEXPORT void JNICALL SDL_JAVA_AUDIO_INTERFACE(nativeSetupJNI)(
-        JNIEnv *env, jclass jcls);
+    JNIEnv *env, jclass jcls);
 
 static JNINativeMethod SDLAudioManager_tab[] = {
     { "nativeSetupJNI", "()I", SDL_JAVA_AUDIO_INTERFACE(nativeSetupJNI) }
@@ -220,54 +219,53 @@ static JNINativeMethod SDLAudioManager_tab[] = {
 
 /* Java class SDLControllerManager */
 JNIEXPORT void JNICALL SDL_JAVA_CONTROLLER_INTERFACE(nativeSetupJNI)(
-        JNIEnv *env, jclass jcls);
+    JNIEnv *env, jclass jcls);
 
 JNIEXPORT jint JNICALL SDL_JAVA_CONTROLLER_INTERFACE(onNativePadDown)(
-        JNIEnv *env, jclass jcls,
-        jint device_id, jint keycode);
+    JNIEnv *env, jclass jcls,
+    jint device_id, jint keycode);
 
 JNIEXPORT jint JNICALL SDL_JAVA_CONTROLLER_INTERFACE(onNativePadUp)(
-        JNIEnv *env, jclass jcls,
-        jint device_id, jint keycode);
+    JNIEnv *env, jclass jcls,
+    jint device_id, jint keycode);
 
 JNIEXPORT void JNICALL SDL_JAVA_CONTROLLER_INTERFACE(onNativeJoy)(
-        JNIEnv *env, jclass jcls,
-        jint device_id, jint axis, jfloat value);
+    JNIEnv *env, jclass jcls,
+    jint device_id, jint axis, jfloat value);
 
 JNIEXPORT void JNICALL SDL_JAVA_CONTROLLER_INTERFACE(onNativeHat)(
-        JNIEnv *env, jclass jcls,
-        jint device_id, jint hat_id, jint x, jint y);
+    JNIEnv *env, jclass jcls,
+    jint device_id, jint hat_id, jint x, jint y);
 
 JNIEXPORT jint JNICALL SDL_JAVA_CONTROLLER_INTERFACE(nativeAddJoystick)(
-        JNIEnv *env, jclass jcls,
-        jint device_id, jstring device_name, jstring device_desc, jint vendor_id, jint product_id,
-        jboolean is_accelerometer, jint button_mask, jint naxes, jint nhats, jint nballs);
+    JNIEnv *env, jclass jcls,
+    jint device_id, jstring device_name, jstring device_desc, jint vendor_id, jint product_id,
+    jboolean is_accelerometer, jint button_mask, jint naxes, jint nhats, jint nballs);
 
 JNIEXPORT jint JNICALL SDL_JAVA_CONTROLLER_INTERFACE(nativeRemoveJoystick)(
-        JNIEnv *env, jclass jcls,
-        jint device_id);
+    JNIEnv *env, jclass jcls,
+    jint device_id);
 
 JNIEXPORT jint JNICALL SDL_JAVA_CONTROLLER_INTERFACE(nativeAddHaptic)(
-        JNIEnv *env, jclass jcls,
-        jint device_id, jstring device_name);
+    JNIEnv *env, jclass jcls,
+    jint device_id, jstring device_name);
 
 JNIEXPORT jint JNICALL SDL_JAVA_CONTROLLER_INTERFACE(nativeRemoveHaptic)(
-        JNIEnv *env, jclass jcls,
-        jint device_id);
+    JNIEnv *env, jclass jcls,
+    jint device_id);
 
 static JNINativeMethod SDLControllerManager_tab[] = {
-    { "nativeSetupJNI",         "()I", SDL_JAVA_CONTROLLER_INTERFACE(nativeSetupJNI) },
-    { "onNativePadDown",        "(II)I", SDL_JAVA_CONTROLLER_INTERFACE(onNativePadDown) },
-    { "onNativePadUp",          "(II)I", SDL_JAVA_CONTROLLER_INTERFACE(onNativePadUp) },
-    { "onNativeJoy",            "(IIF)V", SDL_JAVA_CONTROLLER_INTERFACE(onNativeJoy) },
-    { "onNativeHat",            "(IIII)V", SDL_JAVA_CONTROLLER_INTERFACE(onNativeHat) },
-    { "nativeAddJoystick",      "(ILjava/lang/String;Ljava/lang/String;IIZIIII)I", SDL_JAVA_CONTROLLER_INTERFACE(nativeAddJoystick) },
-    { "nativeRemoveJoystick",   "(I)I", SDL_JAVA_CONTROLLER_INTERFACE(nativeRemoveJoystick) },
-    { "nativeAddHaptic",        "(ILjava/lang/String;)I", SDL_JAVA_CONTROLLER_INTERFACE(nativeAddHaptic) },
-    { "nativeRemoveHaptic",     "(I)I", SDL_JAVA_CONTROLLER_INTERFACE(nativeRemoveHaptic) }
+    { "nativeSetupJNI", "()I", SDL_JAVA_CONTROLLER_INTERFACE(nativeSetupJNI) },
+    { "onNativePadDown", "(II)I", SDL_JAVA_CONTROLLER_INTERFACE(onNativePadDown) },
+    { "onNativePadUp", "(II)I", SDL_JAVA_CONTROLLER_INTERFACE(onNativePadUp) },
+    { "onNativeJoy", "(IIF)V", SDL_JAVA_CONTROLLER_INTERFACE(onNativeJoy) },
+    { "onNativeHat", "(IIII)V", SDL_JAVA_CONTROLLER_INTERFACE(onNativeHat) },
+    { "nativeAddJoystick", "(ILjava/lang/String;Ljava/lang/String;IIZIIII)I", SDL_JAVA_CONTROLLER_INTERFACE(nativeAddJoystick) },
+    { "nativeRemoveJoystick", "(I)I", SDL_JAVA_CONTROLLER_INTERFACE(nativeRemoveJoystick) },
+    { "nativeAddHaptic", "(ILjava/lang/String;)I", SDL_JAVA_CONTROLLER_INTERFACE(nativeAddHaptic) },
+    { "nativeRemoveHaptic", "(I)I", SDL_JAVA_CONTROLLER_INTERFACE(nativeRemoveHaptic) }
 };
 
-
 /* Uncomment this to log messages entering and exiting methods in this file */
 /* #define DEBUG_JNI */
 
@@ -278,7 +276,6 @@ static void checkJNIReady(void);
 *******************************************************************************/
 #include <jni.h>
 
-
 /*******************************************************************************
                                Globals
 *******************************************************************************/
@@ -389,8 +386,8 @@ static jobject javaAssetManagerRef = 0;
  */
 
 /* Set local storage value */
-static int
-Android_JNI_SetEnv(JNIEnv *env) {
+static int Android_JNI_SetEnv(JNIEnv *env)
+{
     int status = pthread_setspecific(mThreadKey, env);
     if (status < 0) {
         __android_log_print(ANDROID_LOG_ERROR, "SDL", "Failed pthread_setspecific() in Android_JNI_SetEnv() (err=%d)", status);
@@ -399,7 +396,7 @@ Android_JNI_SetEnv(JNIEnv *env) {
 }
 
 /* Get local storage value */
-JNIEnv* Android_JNI_GetEnv(void)
+JNIEnv *Android_JNI_GetEnv(void)
 {
     /* Get JNIEnv from the Thread local storage */
     JNIEnv *env = pthread_getspecific(mThreadKey);
@@ -459,11 +456,10 @@ int Android_JNI_SetupThread(void)
 }
 
 /* Destructor called for each thread where mThreadKey is not NULL */
-static void
-Android_JNI_ThreadDestroyed(void *value)
+static void Android_JNI_ThreadDestroyed(void *value)
 {
     /* The thread is being destroyed, detach it from the Java VM and set the mThreadKey value to NULL as required */
-    JNIEnv *env = (JNIEnv *) value;
+    JNIEnv *env = (JNIEnv *)value;
     if (env != NULL) {
         (*mJavaVM)->DetachCurrentThread(mJavaVM);
         Android_JNI_SetEnv(NULL);
@@ -471,8 +467,7 @@ Android_JNI_ThreadDestroyed(void *value)
 }
 
 /* Creation of local storage mThreadKey */
-static void
-Android_JNI_CreateKey(void)
+static void Android_JNI_CreateKey(void)
 {
     int status = pthread_key_create(&mThreadKey, Android_JNI_ThreadDestroyed);
     if (status < 0) {
@@ -480,8 +475,7 @@ Android_JNI_CreateKey(void)
     }
 }
 
-static void
-Android_JNI_CreateKey_once(void)
+static void Android_JNI_CreateKey_once(void)
 {
     int status = pthread_once(&key_once, Android_JNI_CreateKey);
     if (status < 0) {
@@ -489,8 +483,7 @@ Android_JNI_CreateKey_once(void)
     }
 }
 
-static void
-register_methods(JNIEnv *env, const char *classname, JNINativeMethod *methods, int nb)
+static void register_methods(JNIEnv *env, const char *classname, JNINativeMethod *methods, int nb)
 {
     jclass clazz = (*env)->FindClass(env, classname);
     if (clazz == NULL || (*env)->RegisterNatives(env, clazz, methods, nb) < 0) {
@@ -568,7 +561,6 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetupJNI)(JNIEnv *env, jclass cl
         __android_log_print(ANDROID_LOG_ERROR, "SDL", "failed to create Android_ActivityMutex mutex");
     }
 
-
     Android_PauseSem = SDL_CreateSemaphore(0);
     if (Android_PauseSem == NULL) {
         __android_log_print(ANDROID_LOG_ERROR, "SDL", "failed to create Android_PauseSem semaphore");
@@ -586,30 +578,30 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetupJNI)(JNIEnv *env, jclass cl
     midClipboardSetText = (*env)->GetStaticMethodID(env, mActivityClass, "clipboardSetText", "(Ljava/lang/String;)V");
     midCreateCustomCursor = (*env)->GetStaticMethodID(env, mActivityClass, "createCustomCursor", "([IIIII)I");
     midDestroyCustomCursor = (*env)->GetStaticMethodID(env, mActivityClass, "destroyCustomCursor", "(I)V");
-    midGetContext = (*env)->GetStaticMethodID(env, mActivityClass, "getContext","()Landroid/content/Context;");
+    midGetContext = (*env)->GetStaticMethodID(env, mActivityClass, "getContext", "()Landroid/content/Context;");
     midGetDisplayDPI = (*env)->GetStaticMethodID(env, mActivityClass, "getDisplayDPI", "()Landroid/util/DisplayMetrics;");
     midGetManifestEnvironmentVariables = (*env)->GetStaticMethodID(env, mActivityClass, "getManifestEnvironmentVariables", "()Z");
-    midGetNativeSurface = (*env)->GetStaticMethodID(env, mActivityClass, "getNativeSurface","()Landroid/view/Surface;");
+    midGetNativeSurface = (*env)->GetStaticMethodID(env, mActivityClass, "getNativeSurface", "()Landroid/view/Surface;");
     midInitTouch = (*env)->GetStaticMethodID(env, mActivityClass, "initTouch", "()V");
-    midIsAndroidTV = (*env)->GetStaticMethodID(env, mActivityClass, "isAndroidTV","()Z");
+    midIsAndroidTV = (*env)->GetStaticMethodID(env, mActivityClass, "isAndroidTV", "()Z");
     midIsChromebook = (*env)->GetStaticMethodID(env, mActivityClass, "isChromebook", "()Z");
     midIsDeXMode = (*env)->GetStaticMethodID(env, mActivityClass, "isDeXMode", "()Z");
-    midIsScreenKeyboardShown = (*env)->GetStaticMethodID(env, mActivityClass, "isScreenKeyboardShown","()Z");
+    midIsScreenKeyboardShown = (*env)->GetStaticMethodID(env, mActivityClass, "isScreenKeyboardShown", "()Z");
     midIsTablet = (*env)->GetStaticMethodID(env, mActivityClass, "isTablet", "()Z");
     midManualBackButton = (*env)->GetStaticMethodID(env, mActivityClass, "manualBackButton", "()V");
-    midMinimizeWindow = (*env)->GetStaticMethodID(env, mActivityClass, "minimizeWindow","()V");
+    midMinimizeWindow = (*env)->GetStaticMethodID(env, mActivityClass, "minimizeWindow", "()V");
     midOpenURL = (*env)->GetStaticMethodID(env, mActivityClass, "openURL", "(Ljava/lang/String;)I");
     midRequestPermission = (*env)->GetStaticMethodID(env, mActivityClass, "requestPermission", "(Ljava/lang/String;I)V");
     midShowToast = (*env)->GetStaticMethodID(env, mActivityClass, "showToast", "(Ljava/lang/String;IIII)I");
     midSendMessage = (*env)->GetStaticMethodID(env, mActivityClass, "sendMessage", "(II)Z");
-    midSetActivityTitle = (*env)->GetStaticMethodID(env, mActivityClass, "setActivityTitle","(Ljava/lang/String;)Z");
+    midSetActivityTitle = (*env)->GetStaticMethodID(env, mActivityClass, "setActivityTitle", "(Ljava/lang/String;)Z");
     midSetCustomCursor = (*env)->GetStaticMethodID(env, mActivityClass, "setCustomCursor", "(I)Z");
-    midSetOrientation = (*env)->GetStaticMethodID(env, mActivityClass, "setOrientation","(IIZLjava/lang/String;)V");
+    midSetOrientation = (*env)->GetStaticMethodID(env, mActivityClass, "setOrientation", "(IIZLjava/lang/String;)V");
     midSetRelativeMouseEnabled = (*env)->GetStaticMethodID(env, mActivityClass, "setRelativeMouseEnabled", "(Z)Z");
     midSetSystemCursor = (*env)->GetStaticMethodID(env, mActivityClass, "setSystemCursor", "(I)Z");
-    midSetWindowStyle = (*env)->GetStaticMethodID(env, mActivityClass, "setWindowStyle","(Z)V");
-    midShouldMinimizeOnFocusLoss = (*env)->GetStaticMethodID(env, mActivityClass, "shouldMinimizeOnFocusLoss","()Z");
-    midShowTextInput =  (*env)->GetStaticMethodID(env, mActivityClass, "showTextInput", "(IIII)Z");
+    midSetWindowStyle = (*env)->GetStaticMethodID(env, mActivityClass, "setWindowStyle", "(Z)V");
+    midShouldMinimizeOnFocusLoss = (*env)->GetStaticMethodID(env, mActivityClass, "shouldMinimizeOnFocusLoss", "()Z");
+    midShowTextInput = (*env)->GetStaticMethodID(env, mActivityClass, "showTextInput", "(IIII)Z");
     midSupportsRelativeMouse = (*env)->GetStaticMethodID(env, mActivityClass, "supportsRelativeMouse", "()Z");
 
     if (!midClipboardGetText ||
@@ -656,30 +648,30 @@ JNIEXPORT void JNICALL SDL_JAVA_AUDIO_INTERFACE(nativeSetupJNI)(JNIEnv *env, jcl
     mAudioManagerClass = (jclass)((*env)->NewGlobalRef(env, cls));
 
     midAudioOpen = (*env)->GetStaticMethodID(env, mAudioManagerClass,
-                                "audioOpen", "(IIII)[I");
+                                             "audioOpen", "(IIII)[I");
     midAudioWriteByteBuffer = (*env)->GetStaticMethodID(env, mAudioManagerClass,
-                                "audioWriteByteBuffer", "([B)V");
+                                                        "audioWriteByteBuffer", "([B)V");
     midAudioWriteShortBuffer = (*env)->GetStaticMethodID(env, mAudioManagerClass,
-                                "audioWriteShortBuffer", "([S)V");
+                                                         "audioWriteShortBuffer", "([S)V");
     midAudioWriteFloatBuffer = (*env)->GetStaticMethodID(env, mAudioManagerClass,
-                                "audioWriteFloatBuffer", "([F)V");
+                                                         "audioWriteFloatBuffer", "([F)V");
     midAudioClose = (*env)->GetStaticMethodID(env, mAudioManagerClass,
-                                "audioClose", "()V");
+                                              "audioClose", "()V");
     midCaptureOpen = (*env)->GetStaticMethodID(env, mAudioManagerClass,
-                                "captureOpen", "(IIII)[I");
+                                               "captureOpen", "(IIII)[I");
     midCaptureReadByteBuffer = (*env)->GetStaticMethodID(env, mAudioManagerClass,
-                                "captureReadByteBuffer", "([BZ)I");
+                                                         "captureReadByteBuffer", "([BZ)I");
     midCaptureReadShortBuffer = (*env)->GetStaticMethodID(env, mAudioManagerClass,
-                                "captureReadShortBuffer", "([SZ)I");
+                                                          "captureReadShortBuffer", "([SZ)I");
     midCaptureReadFloatBuffer = (*env)->GetStaticMethodID(env, mAudioManagerClass,
-                                "captureReadFloatBuffer", "([FZ)I");
+                                                          "captureReadFloatBuffer", "([FZ)I");
     midCaptureClose = (*env)->GetStaticMethodID(env, mAudioManagerClass,
-                                "captureClose", "()V");
+                                                "captureClose", "()V");
     midAudioSetThreadPriority = (*env)->GetStaticMethodID(env, mAudioManagerClass,
-                                "audioSetThreadPriority", "(ZI)V");
+                                                          "audioSetThreadPriority", "(ZI)V");
 
     if (!midAudioOpen || !midAudioWriteByteBuffer || !midAudioWriteShortBuffer || !midAudioWriteFloatBuffer || !midAudioClose ||
-       !midCaptureOpen || !midCaptureReadByteBuffer || !midCaptureReadShortBuffer || !midCaptureReadFloatBuffer || !midCaptureClose || !midAudioSetThreadPriority) {
+        !midCaptureOpen || !midCaptureReadByteBuffer || !midCaptureReadShortBuffer || !midCaptureReadFloatBuffer || !midCaptureClose || !midAudioSetThreadPriority) {
         __android_log_print(ANDROID_LOG_WARN, "SDL", "Missing some Java callbacks, do you have the latest version of SDLAudioManager.java?");
     }
 
@@ -694,13 +686,13 @@ JNIEXPORT void JNICALL SDL_JAVA_CONTROLLER_INTERFACE(nativeSetupJNI)(JNIEnv *env
     mControllerManagerClass = (jclass)((*env)->NewGlobalRef(env, cls));
 
     midPollInputDevices = (*env)->GetStaticMethodID(env, mControllerManagerClass,
-                                "pollInputDevices", "()V");
+                                                    "pollInputDevices", "()V");
     midPollHapticDevices = (*env)->GetStaticMethodID(env, mControllerManagerClass,
-                                "pollHapticDevices", "()V");
+                                                     "pollHapticDevices", "()V");
     midHapticRun = (*env)->GetStaticMethodID(env, mControllerManagerClass,
-                                "hapticRun", "(IFI)V");
+                                             "hapticRun", "(IFI)V");
     midHapticStop = (*env)->GetStaticMethodID(env, mControllerManagerClass,
-                                "hapticStop", "(I)V");
+                                              "hapticStop", "(I)V");
 
     if (!midPollInputDevices || !midPollHapticDevices || !midHapticRun || !midHapticStop) {
         __android_log_print(ANDROID_LOG_WARN, "SDL", "Missing some Java callbacks, do you have the latest version of SDLControllerManager.java?");
@@ -752,7 +744,7 @@ JNIEXPORT int JNICALL SDL_JAVA_INTERFACE(nativeRunMain)(JNIEnv *env, jclass cls,
 
             /* Prepare the arguments. */
             len = (*env)->GetArrayLength(env, array);
-            argv = SDL_small_alloc(char *, 1 + len + 1, &isstack);  /* !!! FIXME: check for NULL */
+            argv = SDL_small_alloc(char *, 1 + len + 1, &isstack); /* !!! FIXME: check for NULL */
             argc = 0;
             /* Use the name "app_process" so PHYSFS_platformCalcBaseDir() works.
                https://bitbucket.org/MartinFelis/love-android-sdl2/issue/23/release-build-crash-on-start
@@ -777,7 +769,6 @@ JNIEXPORT int JNICALL SDL_JAVA_INTERFACE(nativeRunMain)(JNIEnv *env, jclass cls,
             }
             argv[argc] = NULL;
 
-
             /* Run the application. */
             status = SDL_main(argc, argv);
 
@@ -811,8 +802,8 @@ JNIEXPORT int JNICALL SDL_JAVA_INTERFACE(nativeRunMain)(JNIEnv *env, jclass cls,
 
 /* Drop file */
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeDropFile)(
-                                    JNIEnv *env, jclass jcls,
-                                    jstring filename)
+    JNIEnv *env, jclass jcls,
+    jstring filename)
 {
     const char *path = (*env)->GetStringUTFChars(env, filename, NULL);
     SDL_SendDropFile(NULL, path);
@@ -821,16 +812,19 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeDropFile)(
 }
 
 /* Lock / Unlock Mutex */
-void Android_ActivityMutex_Lock() {
+void Android_ActivityMutex_Lock()
+{
     SDL_LockMutex(Android_ActivityMutex);
 }
 
-void Android_ActivityMutex_Unlock() {
+void Android_ActivityMutex_Unlock()
+{
     SDL_UnlockMutex(Android_ActivityMutex);
 }
 
 /* Lock the Mutex when the Activity is in its 'Running' state */
-void Android_ActivityMutex_Lock_Running() {
+void Android_ActivityMutex_Lock_Running()
+{
     int pauseSignaled = 0;
     int resumeSignaled = 0;
 
@@ -850,9 +844,9 @@ retry:
 
 /* Set screen resolution */
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetScreenResolution)(
-                                    JNIEnv *env, jclass jcls,
-                                    jint surfaceWidth, jint surfaceHeight,
-                                    jint deviceWidth, jint deviceHeight, jfloat rate)
+    JNIEnv *env, jclass jcls,
+    jint surfaceWidth, jint surfaceHeight,
+    jint deviceWidth, jint deviceHeight, jfloat rate)
 {
     SDL_LockMutex(Android_ActivityMutex);
 
@@ -863,7 +857,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetScreenResolution)(
 
 /* Resize */
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeResize)(
-                                    JNIEnv *env, jclass jcls)
+    JNIEnv *env, jclass jcls)
 {
     SDL_LockMutex(Android_ActivityMutex);
 
@@ -875,8 +869,8 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeResize)(
 }
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeOrientationChanged)(
-                                    JNIEnv *env, jclass jcls,
-                                    jint orientation)
+    JNIEnv *env, jclass jcls,
+    jint orientation)
 {
     SDL_LockMutex(Android_ActivityMutex);
 
@@ -891,19 +885,19 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeOrientationChanged)(
 }
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeAddTouch)(
-        JNIEnv* env, jclass cls,
-        jint touchId, jstring name)
+    JNIEnv *env, jclass cls,
+    jint touchId, jstring name)
 {
     const char *utfname = (*env)->GetStringUTFChars(env, name, NULL);
 
-    SDL_AddTouch((SDL_TouchID) touchId, SDL_TOUCH_DEVICE_DIRECT, utfname);
+    SDL_AddTouch((SDL_TouchID)touchId, SDL_TOUCH_DEVICE_DIRECT, utfname);
 
     (*env)->ReleaseStringUTFChars(env, name, utfname);
 }
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativePermissionResult)(
-        JNIEnv* env, jclass cls,
-        jint requestCode, jboolean result)
+    JNIEnv *env, jclass cls,
+    jint requestCode, jboolean result)
 {
     bPermissionRequestResult = result;
     SDL_AtomicSet(&bPermissionRequestPending, SDL_FALSE);
@@ -911,42 +905,41 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativePermissionResult)(
 
 /* Paddown */
 JNIEXPORT jint JNICALL SDL_JAVA_CONTROLLER_INTERFACE(onNativePadDown)(
-                                    JNIEnv *env, jclass jcls,
-                                    jint device_id, jint keycode)
+    JNIEnv *env, jclass jcls,
+    jint device_id, jint keycode)
 {
     return Android_OnPadDown(device_id, keycode);
 }
 
 /* Padup */
 JNIEXPORT jint JNICALL SDL_JAVA_CONTROLLER_INTERFACE(onNativePadUp)(
-                                    JNIEnv *env, jclass jcls,
-                                    jint device_id, jint keycode)
+    JNIEnv *env, jclass jcls,
+    jint device_id, jint keycode)
 {
     return Android_OnPadUp(device_id, keycode);
 }
 
 /* Joy */
 JNIEXPORT void JNICALL SDL_JAVA_CONTROLLER_INTERFACE(onNativeJoy)(
-                                    JNIEnv *env, jclass jcls,
-                                    jint device_id, jint axis, jfloat value)
+    JNIEnv *env, jclass jcls,
+    jint device_id, jint axis, jfloat value)
 {
     Android_OnJoy(device_id, axis, value);
 }
 
 /* POV Hat */
 JNIEXPORT void JNICALL SDL_JAVA_CONTROLLER_INTERFACE(onNativeHat)(
-                                    JNIEnv *env, jclass jcls,
-                                    jint device_id, jint hat_id, jint x, jint y)
+    JNIEnv *env, jclass jcls,
+    jint device_id, jint hat_id, jint x, jint y)
 {
     Android_OnHat(device_id, hat_id, x, y);
 }
 
-
 JNIEXPORT jint JNICALL SDL_JAVA_CONTROLLER_INTERFACE(nativeAddJoystick)(
-                                    JNIEnv *env, jclass jcls,
-                                    jint device_id, jstring device_name, jstring device_desc,
-                                    jint vendor_id, jint product_id, jboolean is_accelerometer,
-                                    jint button_mask, jint naxes, jint nhats, jint nballs)
+    JNIEnv *env, jclass jcls,
+    jint device_id, jstring device_name, jstring device_desc,
+    jint vendor_id, jint product_id, jboolean is_accelerometer,
+    jint button_mask, jint naxes, jint nhats, jint nballs)
 {
     int retval;
     const char *name = (*env)->GetStringUTFChars(env, device_name, NULL);
@@ -961,8 +954,8 @@ JNIEXPORT jint JNICALL SDL_JAVA_CONTROLLER_INTERFACE(nativeAddJoystick)(
 }
 
 JNIEXPORT jint JNICALL SDL_JAVA_CONTROLLER_INTERFACE(nativeRemoveJoystick)(
-                                    JNIEnv *env, jclass jcls,
-                                    jint device_id)
+    JNIEnv *env, jclass jcls,
+    jint device_id)
 {
     return Android_RemoveJoystick(device_id);
 }
@@ -992,7 +985,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeSurfaceCreated)(JNIEnv *env, j
     SDL_LockMutex(Android_ActivityMutex);
 
     if (Android_Window) {
-        SDL_WindowData *data = (SDL_WindowData *) Android_Window->driverdata;
+        SDL_WindowData *data = (SDL_WindowData *)Android_Window->driverdata;
 
         data->native_window = Android_JNI_GetNativeWindow();
         if (data->native_window == NULL) {
@@ -1011,11 +1004,11 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeSurfaceChanged)(JNIEnv *env, j
 #if SDL_VIDEO_OPENGL_EGL
     if (Android_Window) {
         SDL_VideoDevice *_this = SDL_GetVideoDevice();
-        SDL_WindowData  *data  = (SDL_WindowData *) Android_Window->driverdata;
+        SDL_WindowData *data = (SDL_WindowData *)Android_Window->driverdata;
 
         /* If the surface has been previously destroyed by onNativeSurfaceDestroyed, recreate it here */
         if (data->egl_surface == EGL_NO_SURFACE) {
-            data->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType) data->native_window);
+            data->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType)data->native_window);
         }
 
         /* GL Context handling is done in the event loop because this function is run from the Java thread */
@@ -1036,10 +1029,10 @@ retry:
 
     if (Android_Window) {
         SDL_VideoDevice *_this = SDL_GetVideoDevice();
-        SDL_WindowData  *data  = (SDL_WindowData *) Android_Window->driverdata;
+        SDL_WindowData *data = (SDL_WindowData *)Android_Window->driverdata;
 
         /* Wait for Main thread being paused and context un-activated to release 'egl_surface' */
-        if (! data->backup_done) {
+        if (!data->backup_done) {
             nb_attempt -= 1;
             if (nb_attempt == 0) {
                 SDL_SetError("Try to release egl_surface with context probably still active");
@@ -1070,23 +1063,23 @@ retry:
 
 /* Keydown */
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeKeyDown)(
-                                    JNIEnv *env, jclass jcls,
-                                    jint keycode)
+    JNIEnv *env, jclass jcls,
+    jint keycode)
 {
     Android_OnKeyDown(keycode);
 }
 
 /* Keyup */
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeKeyUp)(
-                                    JNIEnv *env, jclass jcls,
-                                    jint keycode)
+    JNIEnv *env, jclass jcls,
+    jint keycode)
 {
     Android_OnKeyUp(keycode);
 }
 
 /* Virtual keyboard return key might stop text input */
 JNIEXPORT jboolean JNICALL SDL_JAVA_INTERFACE(onNativeSoftReturnKey)(
-                                    JNIEnv *env, jclass jcls)
+    JNIEnv *env, jclass jcls)
 {
     if (SDL_GetHintBoolean(SDL_HINT_RETURN_KEY_HIDES_IME, SDL_FALSE)) {
         SDL_StopTextInput();
@@ -1097,18 +1090,17 @@ JNIEXPORT jboolean JNICALL SDL_JAVA_INTERFACE(onNativeSoftReturnKey)(
 
 /* Keyboard Focus Lost */
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeKeyboardFocusLost)(
-                                    JNIEnv *env, jclass jcls)
+    JNIEnv *env, jclass jcls)
 {
     /* Calling SDL_StopTextInput will take care of hiding the keyboard and cleaning up the DummyText widget */
     SDL_StopTextInput();
 }
 
-
 /* Touch */
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeTouch)(
-                                    JNIEnv *env, jclass jcls,
-                                    jint touch_device_id_in, jint pointer_finger_id_in,
-                                    jint action, jfloat x, jfloat y, jfloat p)
+    JNIEnv *env, jclass jcls,
+    jint touch_device_id_in, jint pointer_finger_id_in,
+    jint action, jfloat x, jfloat y, jfloat p)
 {
     SDL_LockMutex(Android_ActivityMutex);
 
@@ -1119,8 +1111,8 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeTouch)(
 
 /* Mouse */
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeMouse)(
-                                    JNIEnv *env, jclass jcls,
-                                    jint button, jint action, jfloat x, jfloat y, jboolean relative)
+    JNIEnv *env, jclass jcls,
+    jint button, jint action, jfloat x, jfloat y, jboolean relative)
 {
     SDL_LockMutex(Android_ActivityMutex);
 
@@ -1131,8 +1123,8 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeMouse)(
 
 /* Accelerometer */
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeAccel)(
-                                    JNIEnv *env, jclass jcls,
-                                    jfloat x, jfloat y, jfloat z)
+    JNIEnv *env, jclass jcls,
+    jfloat x, jfloat y, jfloat z)
 {
     fLastAccelerometer[0] = x;
     fLastAccelerometer[1] = y;
@@ -1142,14 +1134,14 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeAccel)(
 
 /* Clipboard */
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeClipboardChanged)(
-                                    JNIEnv *env, jclass jcls)
+    JNIEnv *env, jclass jcls)
 {
     SDL_SendClipboardUpdate();
 }
 
 /* Low memory */
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeLowMemory)(
-                                    JNIEnv *env, jclass cls)
+    JNIEnv *env, jclass cls)
 {
     SDL_SendAppEvent(SDL_APP_LOWMEMORY);
 }
@@ -1157,15 +1149,14 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeLowMemory)(
 /* Locale
  * requires android:configChanges="layoutDirection|locale" in AndroidManifest.xml */
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(onNativeLocaleChanged)(
-                                    JNIEnv *env, jclass cls)
+    JNIEnv *env, jclass cls)
 {
     SDL_SendAppEvent(SDL_LOCALECHANGED);
 }
 
-
 /* Send Quit event to "SDLThread" thread */
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSendQuit)(
-                                    JNIEnv *env, jclass cls)
+    JNIEnv *env, jclass cls)
 {
     /* Discard previous events. The user should have handled state storage
      * in SDL_APP_WILLENTERBACKGROUND. After nativeSendQuit() is called, no
@@ -1185,7 +1176,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSendQuit)(
 
 /* Activity ends */
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeQuit)(
-                                    JNIEnv *env, jclass cls)
+    JNIEnv *env, jclass cls)
 {
     const char *str;
 
@@ -1216,7 +1207,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeQuit)(
 
 /* Pause */
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativePause)(
-                                    JNIEnv *env, jclass cls)
+    JNIEnv *env, jclass cls)
 {
     __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "nativePause()");
 
@@ -1227,7 +1218,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativePause)(
 
 /* Resume */
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeResume)(
-                                    JNIEnv *env, jclass cls)
+    JNIEnv *env, jclass cls)
 {
     __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "nativeResume()");
 
@@ -1239,7 +1230,7 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeResume)(
 }
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeFocusChanged)(
-                                    JNIEnv *env, jclass cls, jboolean hasFocus)
+    JNIEnv *env, jclass cls, jboolean hasFocus)
 {
     SDL_LockMutex(Android_ActivityMutex);
 
@@ -1252,8 +1243,8 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeFocusChanged)(
 }
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE_INPUT_CONNECTION(nativeCommitText)(
-                                    JNIEnv *env, jclass cls,
-                                    jstring text, jint newCursorPosition)
+    JNIEnv *env, jclass cls,
+    jstring text, jint newCursorPosition)
 {
     const char *utftext = (*env)->GetStringUTFChars(env, text, NULL);
 
@@ -1263,15 +1254,15 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE_INPUT_CONNECTION(nativeCommitText)(
 }
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE_INPUT_CONNECTION(nativeGenerateScancodeForUnichar)(
-                                    JNIEnv *env, jclass cls,
-                                    jchar chUnicode)
+    JNIEnv *env, jclass cls,
+    jchar chUnicode)
 {
     SDL_SendKeyboardUnicodeKey(chUnicode);
 }
 
 JNIEXPORT jstring JNICALL SDL_JAVA_INTERFACE(nativeGetHint)(
-                                    JNIEnv *env, jclass cls,
-                                    jstring name)
+    JNIEnv *env, jclass cls,
+    jstring name)
 {
     const char *utfname = (*env)->GetStringUTFChars(env, name, NULL);
     const char *hint = SDL_GetHint(utfname);
@@ -1283,8 +1274,8 @@ JNIEXPORT jstring JNICALL SDL_JAVA_INTERFACE(nativeGetHint)(
 }
 
 JNIEXPORT jboolean JNICALL SDL_JAVA_INTERFACE(nativeGetHintBoolean)(
-                                    JNIEnv *env, jclass cls,
-                                    jstring name, jboolean default_value)
+    JNIEnv *env, jclass cls,
+    jstring name, jboolean default_value)
 {
     jboolean result;
 
@@ -1296,8 +1287,8 @@ JNIEXPORT jboolean JNICALL SDL_JAVA_INTERFACE(nativeGetHintBoolean)(
 }
 
 JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetenv)(
-                                    JNIEnv *env, jclass cls,
-                                    jstring name, jstring value)
+    JNIEnv *env, jclass cls,
+    jstring name, jstring value)
 {
     const char *utfname = (*env)->GetStringUTFChars(env, name, NULL);
     const char *utfvalue = (*env)->GetStringUTFChars(env, value, NULL);
@@ -1306,7 +1297,6 @@ JNIEXPORT void JNICALL SDL_JAVA_INTERFACE(nativeSetenv)(
 
     (*env)->ReleaseStringUTFChars(env, name, utfname);
     (*env)->ReleaseStringUTFChars(env, value, utfvalue);
-
 }
 
 /*******************************************************************************
@@ -1355,7 +1345,7 @@ static void LocalReferenceHolder_Cleanup(struct LocalReferenceHolder *refholder)
     }
 }
 
-ANativeWindow* Android_JNI_GetNativeWindow(void)
+ANativeWindow *Android_JNI_GetNativeWindow(void)
 {
     ANativeWindow *anw = NULL;
     jobject s;
@@ -1390,7 +1380,7 @@ void Android_JNI_SetOrientation(int w, int h, int resizable, const char *hint)
     JNIEnv *env = Android_JNI_GetEnv();
 
     jstring jhint = (*env)->NewStringUTF(env, (hint ? hint : ""));
-    (*env)->CallStaticVoidMethod(env, mActivityClass, midSetOrientation, w, h, (resizable? 1 : 0), jhint);
+    (*env)->CallStaticVoidMethod(env, mActivityClass, midSetOrientation, w, h, (resizable ? 1 : 0), jhint);
     (*env)->DeleteLocalRef(env, jhint);
 }
 
@@ -1496,32 +1486,29 @@ int Android_JNI_OpenAudioDevice(int iscapture, SDL_AudioSpec *spec)
      * Android >= 4.2 due to a "stale global reference" error. So now we allocate this buffer directly from this side. */
     switch (audioformat) {
     case ENCODING_PCM_8BIT:
-        {
-            jbyteArray audioBufferLocal = (*env)->NewByteArray(env, spec->samples * spec->channels);
-            if (audioBufferLocal) {
-                jbufobj = (*env)->NewGlobalRef(env, audioBufferLocal);
-                (*env)->DeleteLocalRef(env, audioBufferLocal);
-            }
+    {
+        jbyteArray audioBufferLocal = (*env)->NewByteArray(env, spec->samples * spec->channels);
+        if (audioBufferLocal) {
+            jbufobj = (*env)->NewGlobalRef(env, audioBufferLocal);
+            (*env)->DeleteLocalRef(env, audioBufferLocal);
         }
-        break;
+    } break;
     case ENCODING_PCM_16BIT:
-        {
-            jshortArray audioBufferLocal = (*env)->NewShortArray(env, spec->samples * spec->channels);
-            if (audioBufferLocal) {
-                jbufobj = (*env)->NewGlobalRef(env, audioBufferLocal);
-                (*env)->DeleteLocalRef(env, audioBufferLocal);
-            }
+    {
+        jshortArray audioBufferLocal = (*env)->NewShortArray(env, spec->samples * spec->channels);
+        if (audioBufferLocal) {
+            jbufobj = (*env)->NewGlobalRef(env, audioBufferLocal);
+            (*env)->DeleteLocalRef(env, audioBufferLocal);
         }
-        break;
+    } break;
     case ENCODING_PCM_FLOAT:
-        {
-            jfloatArray audioBufferLocal = (*env)->NewFloatArray(env, spec->samples * spec->channels);
-            if (audioBufferLocal) {
-                jbufobj = (*env)->NewGlobalRef(env, audioBufferLocal);
-                (*env)->DeleteLocalRef(env, audioBufferLocal);
-            }
+    {
+        jfloatArray audioBufferLocal = (*env)->NewFloatArray(env, spec->samples * spec->channels);
+        if (audioBufferLocal) {
+            jbufobj = (*env)->NewGlobalRef(env, audioBufferLocal);
+            (*env)->DeleteLocalRef(env, audioBufferLocal);
         }
-        break;
+    } break;
     default:
         return SDL_SetError("Unexpected audio format from Java: %d\n", audioformat);
     }
@@ -1579,7 +1566,6 @@ int Android_JNI_GetDisplayDPI(float *ddpi, float *xdpi, float *ydpi)
     float nativeYdpi = (*env)->GetFloatField(env, jDisplayObj, fidYdpi);
     int nativeDdpi = (*env)->GetIntField(env, jDisplayObj, fidDdpi);
 
-
     (*env)->DeleteLocalRef(env, jDisplayObj);
     (*env)->DeleteLocalRef(env, jDisplayClass);
 
@@ -1596,7 +1582,7 @@ int Android_JNI_GetDisplayDPI(float *ddpi, float *xdpi, float *ydpi)
     return 0;
 }
 
-void * Android_JNI_GetAudioBuffer(void)
+void *Android_JNI_GetAudioBuffer(void)
 {
     return audioBufferPinned;
 }
@@ -1672,7 +1658,7 @@ int Android_JNI_CaptureAudioBuffer(void *buffer, int buflen)
 void Android_JNI_FlushCapturedAudio(void)
 {
     JNIEnv *env = Android_JNI_GetEnv();
-#if 0  /* !!! FIXME: this needs API 23, or it'll do blocking reads and never end. */
+#if 0 /* !!! FIXME: this needs API 23, or it'll do blocking reads and never end. */
     switch (captureBufferFormat) {
     case ENCODING_PCM_8BIT:
         {
@@ -1788,7 +1774,8 @@ static SDL_bool Android_JNI_ExceptionOccurred(SDL_bool silent)
     return SDL_FALSE;
 }
 
-static void Internal_Android_Create_AssetManager() {
+static void Internal_Android_Create_AssetManager()
+{
 
     struct LocalReferenceHolder refs = LocalReferenceHolder_Setup(__FUNCTION__);
     JNIEnv *env = Android_JNI_GetEnv();
@@ -1806,7 +1793,7 @@ static void Internal_Android_Create_AssetManager() {
 
     /* javaAssetManager = context.getAssets(); */
     mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, context),
-            "getAssets", "()Landroid/content/res/AssetManager;");
+                              "getAssets", "()Landroid/content/res/AssetManager;");
     javaAssetManager = (*env)->CallObjectMethod(env, context, mid);
 
     /**
@@ -1826,7 +1813,8 @@ static void Internal_Android_Create_AssetManager() {
     LocalReferenceHolder_Cleanup(&refs);
 }
 
-static void Internal_Android_Destroy_AssetManager() {
+static void Internal_Android_Destroy_AssetManager()
+{
     JNIEnv *env = Android_JNI_GetEnv();
 
     if (asset_manager) {
@@ -1836,7 +1824,7 @@ static void Internal_Android_Destroy_AssetManager() {
 }
 
 int Android_JNI_FileOpen(SDL_RWops *ctx,
-        const char *fileName, const char *mode)
+                         const char *fileName, const char *mode)
 {
     AAsset *asset = NULL;
     ctx->hidden.androidio.asset = NULL;
@@ -1854,16 +1842,15 @@ int Android_JNI_FileOpen(SDL_RWops *ctx,
         return -1;
     }
 
-
-    ctx->hidden.androidio.asset = (void*) asset;
+    ctx->hidden.androidio.asset = (void *)asset;
     return 0;
 }
 
-size_t Android_JNI_FileRead(SDL_RWops* ctx, void* buffer,
-        size_t size, size_t maxnum)
+size_t Android_JNI_FileRead(SDL_RWops *ctx, void *buffer,
+                            size_t size, size_t maxnum)
 {
     size_t result;
-    AAsset *asset = (AAsset*) ctx->hidden.androidio.asset;
+    AAsset *asset = (AAsset *)ctx->hidden.androidio.asset;
     result = AAsset_read(asset, buffer, size * maxnum);
 
     if (result > 0) {
@@ -1876,7 +1863,7 @@ size_t Android_JNI_FileRead(SDL_RWops* ctx, void* buffer,
 }
 
 size_t Android_JNI_FileWrite(SDL_RWops *ctx, const void *buffer,
-        size_t size, size_t num)
+                             size_t size, size_t num)
 {
     SDL_SetError("Cannot write to Android package filesystem");
     return 0;
@@ -1885,22 +1872,22 @@ size_t Android_JNI_FileWrite(SDL_RWops *ctx, const void *buffer,
 Sint64 Android_JNI_FileSize(SDL_RWops *ctx)
 {
     off64_t result;
-    AAsset *asset = (AAsset*) ctx->hidden.androidio.asset;
+    AAsset *asset = (AAsset *)ctx->hidden.androidio.asset;
     result = AAsset_getLength64(asset);
     return result;
 }
 
-Sint64 Android_JNI_FileSeek(SDL_RWops* ctx, Sint64 offset, int whence)
+Sint64 Android_JNI_FileSeek(SDL_RWops *ctx, Sint64 offset, int whence)
 {
     off64_t result;
-    AAsset *asset = (AAsset*) ctx->hidden.androidio.asset;
+    AAsset *asset = (AAsset *)ctx->hidden.androidio.asset;
     result = AAsset_seek64(asset, offset, whence);
     return result;
 }
 
 int Android_JNI_FileClose(SDL_RWops *ctx)
 {
-    AAsset *asset = (AAsset*) ctx->hidden.androidio.asset;
+    AAsset *asset = (AAsset *)ctx->hidden.androidio.asset;
     AAsset_close(asset);
     return 0;
 }
@@ -1914,7 +1901,7 @@ int Android_JNI_SetClipboardText(const char *text)
     return 0;
 }
 
-char* Android_JNI_GetClipboardText(void)
+char *Android_JNI_GetClipboardText(void)
 {
     JNIEnv *env = Android_JNI_GetEnv();
     char *text = NULL;
@@ -1963,7 +1950,6 @@ int Android_JNI_GetPowerInfo(int *plugged, int *charged, int *battery, int *seco
         return -1;
     }
 
-
     /* context = SDLActivity.getContext(); */
     context = (*env)->CallStaticObjectMethod(env, mActivityClass, midGetContext);
 
@@ -1986,18 +1972,18 @@ int Android_JNI_GetPowerInfo(int *plugged, int *charged, int *battery, int *seco
     imid = (*env)->GetMethodID(env, cls, "getIntExtra", "(Ljava/lang/String;I)I");
 
     /* Watch out for C89 scoping rules because of the macro */
-#define GET_INT_EXTRA(var, key) \
-    int var; \
-    iname = (*env)->NewStringUTF(env, key); \
+#define GET_INT_EXTRA(var, key)                                  \
+    int var;                                                     \
+    iname = (*env)->NewStringUTF(env, key);                      \
     (var) = (*env)->CallIntMethod(env, intent, imid, iname, -1); \
     (*env)->DeleteLocalRef(env, iname);
 
     bmid = (*env)->GetMethodID(env, cls, "getBooleanExtra", "(Ljava/lang/String;Z)Z");
 
     /* Watch out for C89 scoping rules because of the macro */
-#define GET_BOOL_EXTRA(var, key) \
-    int var; \
-    bname = (*env)->NewStringUTF(env, key); \
+#define GET_BOOL_EXTRA(var, key)                                            \
+    int var;                                                                \
+    bname = (*env)->NewStringUTF(env, key);                                 \
     (var) = (*env)->CallBooleanMethod(env, intent, bmid, bname, JNI_FALSE); \
     (*env)->DeleteLocalRef(env, bname);
 
@@ -2062,8 +2048,9 @@ int Android_JNI_GetPowerInfo(int *plugged, int *charged, int *battery, int *seco
 }
 
 /* Add all touch devices */
-void Android_JNI_InitTouch() {
-     JNIEnv *env = Android_JNI_GetEnv();
+void Android_JNI_InitTouch()
+{
+    JNIEnv *env = Android_JNI_GetEnv();
     (*env)->CallStaticVoidMethod(env, mActivityClass, midInitTouch);
 }
 
@@ -2092,8 +2079,7 @@ void Android_JNI_HapticStop(int device_id)
 }
 
 /* See SDLActivity.java for constants. */
-#define COMMAND_SET_KEEP_SCREEN_ON    5
-
+#define COMMAND_SET_KEEP_SCREEN_ON 5
 
 int SDL_AndroidSendMessage(Uint32 command, int param)
 {
@@ -2121,10 +2107,10 @@ void Android_JNI_ShowTextInput(SDL_Rect *inputRect)
 {
     JNIEnv *env = Android_JNI_GetEnv();
     (*env)->CallStaticBooleanMethod(env, mActivityClass, midShowTextInput,
-                               inputRect->x,
-                               inputRect->y,
-                               inputRect->w,
-                               inputRect->h );
+                                    inputRect->x,
+                                    inputRect->y,
+                                    inputRect->w,
+                                    inputRect->h);
 }
 
 void Android_JNI_HideTextInput(void)
@@ -2142,7 +2128,6 @@ SDL_bool Android_JNI_IsScreenKeyboardShown(void)
     return is_shown;
 }
 
-
 int Android_JNI_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
 {
     JNIEnv *env;
@@ -2171,7 +2156,7 @@ int Android_JNI_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *bu
     button_flags = (*env)->NewIntArray(env, messageboxdata->numbuttons);
     button_ids = (*env)->NewIntArray(env, messageboxdata->numbuttons);
     button_texts = (*env)->NewObjectArray(env, messageboxdata->numbuttons,
-        clazz, NULL);
+                                          clazz, NULL);
     for (i = 0; i < messageboxdata->numbuttons; ++i) {
         const SDL_MessageBoxButtonData *sdlButton;
 
@@ -2211,15 +2196,15 @@ int Android_JNI_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *bu
     clazz = (*env)->GetObjectClass(env, context);
 
     mid = (*env)->GetMethodID(env, clazz,
-        "messageboxShowMessageBox", "(ILjava/lang/String;Ljava/lang/String;[I[I[Ljava/lang/String;[I)I");
+                              "messageboxShowMessageBox", "(ILjava/lang/String;Ljava/lang/String;[I[I[Ljava/lang/String;[I)I");
     *buttonid = (*env)->CallIntMethod(env, context, mid,
-        messageboxdata->flags,
-        title,
-        message,
-        button_flags,
-        button_ids,
-        button_texts,
-        colors);
+                                      messageboxdata->flags,
+                                      title,
+                                      message,
+                                      button_flags,
+                                      button_ids,
+                                      button_texts,
+                                      colors);
 
     (*env)->DeleteLocalRef(env, context);
     (*env)->DeleteLocalRef(env, clazz);
@@ -2265,7 +2250,7 @@ int SDL_GetAndroidSDKVersion(void)
 {
     static int sdk_version;
     if (!sdk_version) {
-        char sdk[PROP_VALUE_MAX] = {0};
+        char sdk[PROP_VALUE_MAX] = { 0 };
         if (__system_property_get("ro.build.version.sdk", sdk) != 0) {
             sdk_version = SDL_atoi(sdk);
         }
@@ -2303,7 +2288,7 @@ void SDL_AndroidBackButton(void)
     (*env)->CallStaticVoidMethod(env, mActivityClass, midManualBackButton);
 }
 
-const char * SDL_AndroidGetInternalStoragePath(void)
+const char *SDL_AndroidGetInternalStoragePath(void)
 {
     static char *s_AndroidInternalFilesPath = NULL;
 
@@ -2331,7 +2316,7 @@ const char * SDL_AndroidGetInternalStoragePath(void)
 
         /* fileObj = context.getFilesDir(); */
         mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, context),
-                "getFilesDir", "()Ljava/io/File;");
+                                  "getFilesDir", "()Ljava/io/File;");
         fileObject = (*env)->CallObjectMethod(env, context, mid);
         if (!fileObject) {
             SDL_SetError("Couldn't get internal directory");
@@ -2341,7 +2326,7 @@ const char * SDL_AndroidGetInternalStoragePath(void)
 
         /* path = fileObject.getCanonicalPath(); */
         mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, fileObject),
-                "getCanonicalPath", "()Ljava/lang/String;");
+                                  "getCanonicalPath", "()Ljava/lang/String;");
         pathString = (jstring)(*env)->CallObjectMethod(env, fileObject, mid);
         if (Android_JNI_ExceptionOccurred(SDL_FALSE)) {
             LocalReferenceHolder_Cleanup(&refs);
@@ -2374,7 +2359,7 @@ int SDL_AndroidGetExternalStorageState(void)
 
     cls = (*env)->FindClass(env, "android/os/Environment");
     mid = (*env)->GetStaticMethodID(env, cls,
-            "getExternalStorageState", "()Ljava/lang/String;");
+                                    "getExternalStorageState", "()Ljava/lang/String;");
     stateString = (jstring)(*env)->CallStaticObjectMethod(env, cls, mid);
 
     state = (*env)->GetStringUTFChars(env, stateString, NULL);
@@ -2396,7 +2381,7 @@ int SDL_AndroidGetExternalStorageState(void)
     return stateFlags;
 }
 
-const char * SDL_AndroidGetExternalStoragePath(void)
+const char *SDL_AndroidGetExternalStoragePath(void)
 {
     static char *s_AndroidExternalFilesPath = NULL;
 
@@ -2419,7 +2404,7 @@ const char * SDL_AndroidGetExternalStoragePath(void)
 
         /* fileObj = context.getExternalFilesDir(); */
         mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, context),
-                "getExternalFilesDir", "(Ljava/lang/String;)Ljava/io/File;");
+                                  "getExternalFilesDir", "(Ljava/lang/String;)Ljava/io/File;");
         fileObject = (*env)->CallObjectMethod(env, context, mid, NULL);
         if (!fileObject) {
             SDL_SetError("Couldn't get external directory");
@@ -2429,7 +2414,7 @@ const char * SDL_AndroidGetExternalStoragePath(void)
 
         /* path = fileObject.getAbsolutePath(); */
         mid = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, fileObject),
-                "getAbsolutePath", "()Ljava/lang/String;");
+                                  "getAbsolutePath", "()Ljava/lang/String;");
         pathString = (jstring)(*env)->CallObjectMethod(env, fileObject, mid);
 
         path = (*env)->GetStringUTFChars(env, pathString, NULL);
@@ -2446,7 +2431,7 @@ SDL_bool SDL_AndroidRequestPermission(const char *permission)
     return Android_JNI_RequestPermission(permission);
 }
 
-int SDL_AndroidShowToast(const char* message, int duration, int gravity, int xOffset, int yOffset)
+int SDL_AndroidShowToast(const char *message, int duration, int gravity, int xOffset, int yOffset)
 {
     return Android_JNI_ShowToast(message, duration, gravity, xOffset, yOffset);
 }
@@ -2538,7 +2523,7 @@ SDL_bool Android_JNI_RequestPermission(const char *permission)
 }
 
 /* Show toast notification */
-int Android_JNI_ShowToast(const char* message, int duration, int gravity, int xOffset, int yOffset)
+int Android_JNI_ShowToast(const char *message, int duration, int gravity, int xOffset, int yOffset)
 {
     int result = 0;
     JNIEnv *env = Android_JNI_GetEnv();
@@ -2596,7 +2581,7 @@ int Android_JNI_GetLocale(char *buf, size_t buflen)
                 buf[id++] = country[1];
             }
         }
-        
+
         buf[id++] = '\0';
         SDL_assert(id <= buflen);
     }
@@ -2606,8 +2591,7 @@ int Android_JNI_GetLocale(char *buf, size_t buflen)
     return 0;
 }
 
-int
-Android_JNI_OpenURL(const char *url)
+int Android_JNI_OpenURL(const char *url)
 {
     JNIEnv *env = Android_JNI_GetEnv();
     jstring jurl = (*env)->NewStringUTF(env, url);

src/core/android/SDL_android.h

@@ -30,7 +30,6 @@ extern "C" {
 #include <EGL/eglplatform.h>
 #include <android/native_window_jni.h>
 
-
 /* Interface from the SDL library into the Android Java activity */
 extern void Android_JNI_SetActivityTitle(const char *title);
 extern void Android_JNI_SetWindowStyle(SDL_bool fullscreen);
@@ -42,14 +41,14 @@ extern SDL_bool Android_JNI_GetAccelerometerValues(float values[3]);
 extern void Android_JNI_ShowTextInput(SDL_Rect *inputRect);
 extern void Android_JNI_HideTextInput(void);
 extern SDL_bool Android_JNI_IsScreenKeyboardShown(void);
-extern ANativeWindow* Android_JNI_GetNativeWindow(void);
+extern ANativeWindow *Android_JNI_GetNativeWindow(void);
 
 extern SDL_DisplayOrientation Android_JNI_GetDisplayOrientation(void);
 extern int Android_JNI_GetDisplayDPI(float *ddpi, float *xdpi, float *ydpi);
 
 /* Audio support */
 extern int Android_JNI_OpenAudioDevice(int iscapture, SDL_AudioSpec *spec);
-extern void* Android_JNI_GetAudioBuffer(void);
+extern void *Android_JNI_GetAudioBuffer(void);
 extern void Android_JNI_WriteAudioBuffer(void);
 extern int Android_JNI_CaptureAudioBuffer(void *buffer, int buflen);
 extern void Android_JNI_FlushCapturedAudio(void);
@@ -60,24 +59,23 @@ extern void Android_JNI_AudioSetThreadPriority(int iscapture, int device_id);
 extern SDL_bool Android_IsDeXMode(void);
 extern SDL_bool Android_IsChromebook(void);
 
-
-int Android_JNI_FileOpen(SDL_RWops* ctx, const char* fileName, const char* mode);
-Sint64 Android_JNI_FileSize(SDL_RWops* ctx);
-Sint64 Android_JNI_FileSeek(SDL_RWops* ctx, Sint64 offset, int whence);
-size_t Android_JNI_FileRead(SDL_RWops* ctx, void* buffer, size_t size, size_t maxnum);
-size_t Android_JNI_FileWrite(SDL_RWops* ctx, const void* buffer, size_t size, size_t num);
-int Android_JNI_FileClose(SDL_RWops* ctx);
+int Android_JNI_FileOpen(SDL_RWops *ctx, const char *fileName, const char *mode);
+Sint64 Android_JNI_FileSize(SDL_RWops *ctx);
+Sint64 Android_JNI_FileSeek(SDL_RWops *ctx, Sint64 offset, int whence);
+size_t Android_JNI_FileRead(SDL_RWops *ctx, void *buffer, size_t size, size_t maxnum);
+size_t Android_JNI_FileWrite(SDL_RWops *ctx, const void *buffer, size_t size, size_t num);
+int Android_JNI_FileClose(SDL_RWops *ctx);
 
 /* Environment support */
 void Android_JNI_GetManifestEnvironmentVariables(void);
 
 /* Clipboard support */
-int Android_JNI_SetClipboardText(const char* text);
-char* Android_JNI_GetClipboardText(void);
+int Android_JNI_SetClipboardText(const char *text);
+char *Android_JNI_GetClipboardText(void);
 SDL_bool Android_JNI_HasClipboardText(void);
 
 /* Power support */
-int Android_JNI_GetPowerInfo(int* plugged, int* charged, int* battery, int* seconds, int* percent);
+int Android_JNI_GetPowerInfo(int *plugged, int *charged, int *battery, int *seconds, int *percent);
 
 /* Joystick support */
 void Android_JNI_PollInputDevices(void);
@@ -105,7 +103,7 @@ int Android_JNI_GetLocale(char *buf, size_t buflen);
 int Android_JNI_SendMessage(int command, int param);
 
 /* Init */
-JNIEXPORT void JNICALL SDL_Android_Init(JNIEnv* mEnv, jclass cls);
+JNIEXPORT void JNICALL SDL_Android_Init(JNIEnv *mEnv, jclass cls);
 
 /* MessageBox */
 int Android_JNI_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
@@ -124,7 +122,7 @@ SDL_bool Android_JNI_SetRelativeMouseEnabled(SDL_bool enabled);
 SDL_bool Android_JNI_RequestPermission(const char *permission);
 
 /* Show toast notification */
-int Android_JNI_ShowToast(const char* message, int duration, int gravity, int xOffset, int yOffset);
+int Android_JNI_ShowToast(const char *message, int duration, int gravity, int xOffset, int yOffset);
 
 int Android_JNI_OpenURL(const char *url);
 

src/core/freebsd/SDL_evdev_kbd_default_keyaccmap.h

@@ -1,5 +1,6 @@
 #include <sys/kbio.h>
 
+/* *INDENT-OFF* */ /* clang-format off */
 /*
  * Automatically generated from /usr/share/vt/keymaps/us.acc.kbd.
  * DO NOT EDIT!
@@ -163,3 +164,4 @@ static accentmap_t accentmap_default_us_acc = { 11, {
     { 0x00 }, 
 } };
 
+/* *INDENT-ON* */ /* clang-format on */

src/core/freebsd/SDL_evdev_kbd_freebsd.c

@@ -38,7 +38,7 @@
 #include "../../events/SDL_events_c.h"
 #include "SDL_evdev_kbd_default_keyaccmap.h"
 
-typedef void (fn_handler_fn)(SDL_EVDEV_keyboard_state *kbd);
+typedef void(fn_handler_fn)(SDL_EVDEV_keyboard_state *kbd);
 
 /*
  * Keyboard State
@@ -50,14 +50,14 @@ struct SDL_EVDEV_keyboard_state
     int keyboard_fd;
     unsigned long old_kbd_mode;
     unsigned short **key_maps;
-    keymap_t* key_map;
-    keyboard_info_t* kbInfo;
-    unsigned char shift_down[4];        /* shift state counters.. */
+    keymap_t *key_map;
+    keyboard_info_t *kbInfo;
+    unsigned char shift_down[4]; /* shift state counters.. */
     SDL_bool dead_key_next;
-    int npadch;                    /* -1 or number assembled on pad */
+    int npadch; /* -1 or number assembled on pad */
     accentmap_t *accents;
     unsigned int diacr;
-    SDL_bool rep;                    /* flag telling character repeat */
+    SDL_bool rep; /* flag telling character repeat */
     unsigned char lockstate;
     unsigned char ledflagstate;
     char shift_state;
@@ -70,24 +70,23 @@ static int SDL_EVDEV_kbd_load_keymaps(SDL_EVDEV_keyboard_state *kbd)
     return ioctl(kbd->keyboard_fd, GIO_KEYMAP, kbd->key_map) >= 0;
 }
 
-static SDL_EVDEV_keyboard_state * kbd_cleanup_state = NULL;
+static SDL_EVDEV_keyboard_state *kbd_cleanup_state = NULL;
 static int kbd_cleanup_sigactions_installed = 0;
 static int kbd_cleanup_atexit_installed = 0;
 
 static struct sigaction old_sigaction[NSIG];
 
-static int fatal_signals[] =
-{
+static int fatal_signals[] = {
     /* Handlers for SIGTERM and SIGINT are installed in SDL_QuitInit. */
-    SIGHUP,  SIGQUIT, SIGILL,  SIGABRT,
-    SIGFPE,  SIGSEGV, SIGPIPE, SIGBUS,
+    SIGHUP, SIGQUIT, SIGILL, SIGABRT,
+    SIGFPE, SIGSEGV, SIGPIPE, SIGBUS,
     SIGSYS
 };
 
 static void kbd_cleanup(void)
 {
     struct mouse_info mData;
-    SDL_EVDEV_keyboard_state* kbd = kbd_cleanup_state;
+    SDL_EVDEV_keyboard_state *kbd = kbd_cleanup_state;
     if (kbd == NULL) {
         return;
     }
@@ -102,18 +101,17 @@ static void kbd_cleanup(void)
     ioctl(kbd->console_fd, CONS_MOUSECTL, &mData);
 }
 
-void
-SDL_EVDEV_kbd_reraise_signal(int sig)
+void SDL_EVDEV_kbd_reraise_signal(int sig)
 {
     raise(sig);
 }
 
-siginfo_t* SDL_EVDEV_kdb_cleanup_siginfo = NULL;
-void*      SDL_EVDEV_kdb_cleanup_ucontext = NULL;
+siginfo_t *SDL_EVDEV_kdb_cleanup_siginfo = NULL;
+void *SDL_EVDEV_kdb_cleanup_ucontext = NULL;
 
-static void kbd_cleanup_signal_action(int signum, siginfo_t* info, void* ucontext)
+static void kbd_cleanup_signal_action(int signum, siginfo_t *info, void *ucontext)
 {
-    struct sigaction* old_action_p = &(old_sigaction[signum]);
+    struct sigaction *old_action_p = &(old_sigaction[signum]);
     sigset_t sigset;
 
     /* Restore original signal handler before going any further. */
@@ -147,7 +145,7 @@ static void kbd_unregister_emerg_cleanup()
     kbd_cleanup_sigactions_installed = 0;
 
     for (tabidx = 0; tabidx < sizeof(fatal_signals) / sizeof(fatal_signals[0]); ++tabidx) {
-        struct sigaction* old_action_p;
+        struct sigaction *old_action_p;
         struct sigaction cur_action;
         signum = fatal_signals[tabidx];
         old_action_p = &(old_sigaction[signum]);
@@ -176,7 +174,7 @@ static void kbd_cleanup_atexit(void)
     kbd_unregister_emerg_cleanup();
 }
 
-static void kbd_register_emerg_cleanup(SDL_EVDEV_keyboard_state * kbd)
+static void kbd_register_emerg_cleanup(SDL_EVDEV_keyboard_state *kbd)
 {
     int tabidx, signum;
 
@@ -200,9 +198,9 @@ static void kbd_register_emerg_cleanup(SDL_EVDEV_keyboard_state * kbd)
     kbd_cleanup_sigactions_installed = 1;
 
     for (tabidx = 0; tabidx < sizeof(fatal_signals) / sizeof(fatal_signals[0]); ++tabidx) {
-        struct sigaction* old_action_p;
+        struct sigaction *old_action_p;
         struct sigaction new_action;
-        signum = fatal_signals[tabidx];   
+        signum = fatal_signals[tabidx];
         old_action_p = &(old_sigaction[signum]);
         if (sigaction(signum, NULL, old_action_p)) {
             continue;
@@ -211,7 +209,7 @@ static void kbd_register_emerg_cleanup(SDL_EVDEV_keyboard_state * kbd)
         /* Skip SIGHUP and SIGPIPE if handler is already installed
          * - assume the handler will do the cleanup
          */
-        if ((signum == SIGHUP || signum == SIGPIPE) && (old_action_p->sa_handler != SIG_DFL || (void(*)(int))old_action_p->sa_sigaction != SIG_DFL)) {
+        if ((signum == SIGHUP || signum == SIGPIPE) && (old_action_p->sa_handler != SIG_DFL || (void (*)(int))old_action_p->sa_sigaction != SIG_DFL)) {
             continue;
         }
 
@@ -228,7 +226,7 @@ SDL_EVDEV_kbd_init(void)
     SDL_EVDEV_keyboard_state *kbd;
     struct mouse_info mData;
     char flag_state;
-    char* devicePath;
+    char *devicePath;
 
     SDL_zero(mData);
     mData.operation = MOUSE_HIDE;
@@ -246,15 +244,15 @@ SDL_EVDEV_kbd_init(void)
 
     kbd->accents = SDL_calloc(sizeof(accentmap_t), 1);
     kbd->key_map = SDL_calloc(sizeof(keymap_t), 1);
-    kbd->kbInfo = SDL_calloc(sizeof(keyboard_info_t), 1);    
+    kbd->kbInfo = SDL_calloc(sizeof(keyboard_info_t), 1);
 
     ioctl(kbd->console_fd, KDGKBINFO, kbd->kbInfo);
     ioctl(kbd->console_fd, CONS_MOUSECTL, &mData);
-    
+
     if (ioctl(kbd->console_fd, KDGKBSTATE, &flag_state) == 0) {
         kbd->ledflagstate = flag_state;
     }
-    
+
     if (ioctl(kbd->console_fd, GIO_DEADKEYMAP, kbd->accents) < 0) {
         SDL_free(kbd->accents);
         kbd->accents = &accentmap_default_us_acc;
@@ -288,14 +286,14 @@ SDL_EVDEV_kbd_init(void)
                 kbd_register_emerg_cleanup(kbd);
             }
             SDL_free(devicePath);
-        } else kbd->keyboard_fd = kbd->console_fd;
+        } else
+            kbd->keyboard_fd = kbd->console_fd;
     }
 
     return kbd;
 }
 
-void
-SDL_EVDEV_kbd_quit(SDL_EVDEV_keyboard_state *kbd)
+void SDL_EVDEV_kbd_quit(SDL_EVDEV_keyboard_state *kbd)
 {
     struct mouse_info mData;
 
@@ -329,7 +327,7 @@ SDL_EVDEV_kbd_quit(SDL_EVDEV_keyboard_state *kbd)
 static void put_queue(SDL_EVDEV_keyboard_state *kbd, uint c)
 {
     /* c is already part of a UTF-8 sequence and safe to add as a character */
-    if (kbd->text_len < (sizeof(kbd->text)-1)) {
+    if (kbd->text_len < (sizeof(kbd->text) - 1)) {
         kbd->text[kbd->text_len++] = (char)c;
     }
 }
@@ -380,12 +378,12 @@ static unsigned int handle_diacr(SDL_EVDEV_keyboard_state *kbd, unsigned int ch)
     for (i = 0; i < kbd->accents->n_accs; i++) {
         if (kbd->accents->acc[i].accchar == d) {
             for (j = 0; j < NUM_ACCENTCHARS; ++j) {
-                    if (kbd->accents->acc[i].map[j][0] == 0) { /* end of table */
-                            break;
-                    } 
-                    if (kbd->accents->acc[i].map[j][0] == ch) {
-                            return kbd->accents->acc[i].map[j][1];
-                    }
+                if (kbd->accents->acc[i].map[j][0] == 0) { /* end of table */
+                    break;
+                }
+                if (kbd->accents->acc[i].map[j][0] == ch) {
+                    return kbd->accents->acc[i].map[j][1];
+                }
             }
         }
     }
@@ -470,8 +468,7 @@ static void k_shift(SDL_EVDEV_keyboard_state *kbd, unsigned char value, char up_
     }
 }
 
-void
-SDL_EVDEV_kbd_keycode(SDL_EVDEV_keyboard_state *kbd, unsigned int keycode, int down)
+void SDL_EVDEV_kbd_keycode(SDL_EVDEV_keyboard_state *kbd, unsigned int keycode, int down)
 {
     keymap_t key_map;
     struct keyent_t keysym;
@@ -525,7 +522,7 @@ SDL_EVDEV_kbd_keycode(SDL_EVDEV_keyboard_state *kbd, unsigned int keycode, int d
                 k_deadunicode(kbd, kbd->accents->acc[accent_index].accchar, !down);
             }
         } else {
-            switch(map_from_key_sym) {
+            switch (map_from_key_sym) {
             case ASH: /* alt/meta shift */
                 k_shift(kbd, 3, down == 0);
                 break;

src/core/gdk/SDL_gdk.cpp

@@ -35,16 +35,15 @@ PAPPSTATE_REGISTRATION hPLM = {};
 HANDLE plmSuspendComplete = nullptr;
 
 extern "C" DECLSPEC int
-SDL_GDKGetTaskQueue(XTaskQueueHandle * outTaskQueue)
+SDL_GDKGetTaskQueue(XTaskQueueHandle *outTaskQueue)
 {
     /* If this is the first call, first create the global task queue. */
     if (!GDK_GlobalTaskQueue) {
         HRESULT hr;
 
         hr = XTaskQueueCreate(XTaskQueueDispatchMode::ThreadPool,
-            XTaskQueueDispatchMode::Manual,
-            &GDK_GlobalTaskQueue
-            );
+                              XTaskQueueDispatchMode::Manual,
+                              &GDK_GlobalTaskQueue);
         if (FAILED(hr)) {
             return SDL_SetError("[GDK] Could not create global task queue");
         }
@@ -84,7 +83,7 @@ OutOfMemory(void)
 
 /* Gets the arguments with GetCommandLine, converts them to argc and argv
    and calls SDL_main */
-extern "C"  DECLSPEC int
+extern "C" DECLSPEC int
 SDL_GDKRunApp(SDL_main_func mainFunction, void *reserved)
 {
     LPWSTR *argvw;
@@ -104,7 +103,7 @@ SDL_GDKRunApp(SDL_main_func mainFunction, void *reserved)
      */
 
     /* Parse it into argv and argc */
-    argv = (char **) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (argc + 1) * sizeof(*argv));
+    argv = (char **)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (argc + 1) * sizeof(*argv));
     if (argv == NULL) {
         return OutOfMemory();
     }
@@ -114,8 +113,8 @@ SDL_GDKRunApp(SDL_main_func mainFunction, void *reserved)
         if (arg == NULL) {
             return OutOfMemory();
         }
-        len = (DWORD) SDL_strlen(arg);
-        argv[i] = (char *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len + 1);
+        len = (DWORD)SDL_strlen(arg);
+        argv[i] = (char *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len + 1);
         if (!argv[i]) {
             return OutOfMemory();
         }
@@ -150,12 +149,11 @@ SDL_GDKRunApp(SDL_main_func mainFunction, void *reserved)
 
         /* Register suspend/resume handling */
         plmSuspendComplete = CreateEventEx(nullptr, nullptr, 0, EVENT_MODIFY_STATE | SYNCHRONIZE);
-        if (!plmSuspendComplete ) {
+        if (!plmSuspendComplete) {
             SDL_SetError("[GDK] Unable to create plmSuspendComplete event");
             return -1;
         }
-        auto rascn = [](BOOLEAN quiesced, PVOID context)
-        {
+        auto rascn = [](BOOLEAN quiesced, PVOID context) {
             SDL_LogDebug(SDL_LOG_CATEGORY_APPLICATION, "[GDK] in RegisterAppStateChangeNotification handler");
             if (quiesced) {
                 ResetEvent(plmSuspendComplete);
@@ -210,7 +208,8 @@ SDL_GDKRunApp(SDL_main_func mainFunction, void *reserved)
 }
 
 extern "C" DECLSPEC void
-SDL_GDKSuspendComplete() {
+SDL_GDKSuspendComplete()
+{
     if (plmSuspendComplete) {
         SetEvent(plmSuspendComplete);
     }

src/core/linux/SDL_dbus.c

@@ -31,14 +31,14 @@ static char *inhibit_handle = NULL;
 static unsigned int screensaver_cookie = 0;
 static SDL_DBusContext dbus;
 
-static int
-LoadDBUSSyms(void)
+static int LoadDBUSSyms(void)
 {
-    #define SDL_DBUS_SYM2(x, y) \
-        if (!(dbus.x = SDL_LoadFunction(dbus_handle, #y))) return -1
-        
-    #define SDL_DBUS_SYM(x) \
-        SDL_DBUS_SYM2(x, dbus_##x)
+#define SDL_DBUS_SYM2(x, y)                            \
+    if (!(dbus.x = SDL_LoadFunction(dbus_handle, #y))) \
+    return -1
+
+#define SDL_DBUS_SYM(x) \
+    SDL_DBUS_SYM2(x, dbus_##x)
 
     SDL_DBUS_SYM(bus_get_private);
     SDL_DBUS_SYM(bus_register);
@@ -80,14 +80,13 @@ LoadDBUSSyms(void)
     SDL_DBUS_SYM(free_string_array);
     SDL_DBUS_SYM(shutdown);
 
-    #undef SDL_DBUS_SYM
-    #undef SDL_DBUS_SYM2
+#undef SDL_DBUS_SYM
+#undef SDL_DBUS_SYM2
 
     return 0;
 }
 
-static void
-UnloadDBUSLibrary(void)
+static void UnloadDBUSLibrary(void)
 {
     if (dbus_handle != NULL) {
         SDL_UnloadObject(dbus_handle);
@@ -95,8 +94,7 @@ UnloadDBUSLibrary(void)
     }
 }
 
-static int
-LoadDBUSLibrary(void)
+static int LoadDBUSLibrary(void)
 {
     int retval = 0;
     if (dbus_handle == NULL) {
@@ -115,24 +113,22 @@ LoadDBUSLibrary(void)
     return retval;
 }
 
-
 static SDL_SpinLock spinlock_dbus_init = 0;
 
 /* you must hold spinlock_dbus_init before calling this! */
-static void
-SDL_DBus_Init_Spinlocked(void)
+static void SDL_DBus_Init_Spinlocked(void)
 {
     static SDL_bool is_dbus_available = SDL_TRUE;
     if (!is_dbus_available) {
-        return;  /* don't keep trying if this fails. */
+        return; /* don't keep trying if this fails. */
     }
 
     if (!dbus.session_conn) {
         DBusError err;
 
         if (LoadDBUSLibrary() == -1) {
-            is_dbus_available = SDL_FALSE;  /* can't load at all? Don't keep trying. */
-            return;  /* oh well */
+            is_dbus_available = SDL_FALSE; /* can't load at all? Don't keep trying. */
+            return;
         }
 
         if (!dbus.threads_init_default()) {
@@ -148,7 +144,7 @@ SDL_DBus_Init_Spinlocked(void)
             dbus.error_free(&err);
             SDL_DBus_Quit();
             is_dbus_available = SDL_FALSE;
-            return;  /* oh well */
+            return; /* oh well */
         }
         dbus.connection_set_exit_on_disconnect(dbus.session_conn, 0);
 
@@ -162,16 +158,14 @@ SDL_DBus_Init_Spinlocked(void)
     }
 }
 
-void
-SDL_DBus_Init(void)
+void SDL_DBus_Init(void)
 {
-    SDL_AtomicLock(&spinlock_dbus_init);  /* make sure two threads can't init at same time, since this can happen before SDL_Init. */
+    SDL_AtomicLock(&spinlock_dbus_init); /* make sure two threads can't init at same time, since this can happen before SDL_Init. */
     SDL_DBus_Init_Spinlocked();
     SDL_AtomicUnlock(&spinlock_dbus_init);
 }
 
-void
-SDL_DBus_Quit(void)
+void SDL_DBus_Quit(void)
 {
     if (dbus.system_conn) {
         dbus.connection_close(dbus.system_conn);
@@ -201,12 +195,11 @@ SDL_DBus_GetContext(void)
     if (dbus_handle == NULL || !dbus.session_conn) {
         SDL_DBus_Init();
     }
-    
+
     return (dbus_handle && dbus.session_conn) ? &dbus : NULL;
 }
 
-static SDL_bool
-SDL_DBus_CallMethodInternal(DBusConnection *conn, const char *node, const char *path, const char *interface, const char *method, va_list ap)
+static SDL_bool SDL_DBus_CallMethodInternal(DBusConnection *conn, const char *node, const char *path, const char *interface, const char *method, va_list ap)
 {
     SDL_bool retval = SDL_FALSE;
 
@@ -215,7 +208,7 @@ SDL_DBus_CallMethodInternal(DBusConnection *conn, const char *node, const char *
         if (msg) {
             int firstarg;
             va_list ap_reply;
-            va_copy(ap_reply, ap);  /* copy the arg list so we don't compete with D-Bus for it */
+            va_copy(ap_reply, ap); /* copy the arg list so we don't compete with D-Bus for it */
             firstarg = va_arg(ap, int);
             if ((firstarg == DBUS_TYPE_INVALID) || dbus.message_append_args_valist(msg, firstarg, ap)) {
                 DBusMessage *reply = dbus.connection_send_with_reply_and_block(conn, msg, 300, NULL);
@@ -223,9 +216,15 @@ SDL_DBus_CallMethodInternal(DBusConnection *conn, const char *node, const char *
                     /* skip any input args, get to output args. */
                     while ((firstarg = va_arg(ap_reply, int)) != DBUS_TYPE_INVALID) {
                         /* we assume D-Bus already validated all this. */
-                        { void *dumpptr = va_arg(ap_reply, void*); (void) dumpptr; }
+                        {
+                            void *dumpptr = va_arg(ap_reply, void *);
+                            (void)dumpptr;
+                        }
                         if (firstarg == DBUS_TYPE_ARRAY) {
-                            { const int dumpint = va_arg(ap_reply, int); (void) dumpint; }
+                            {
+                                const int dumpint = va_arg(ap_reply, int);
+                                (void)dumpint;
+                            }
                         }
                     }
                     firstarg = va_arg(ap_reply, int);
@@ -265,8 +264,7 @@ SDL_DBus_CallMethod(const char *node, const char *path, const char *interface, c
     return retval;
 }
 
-static SDL_bool
-SDL_DBus_CallVoidMethodInternal(DBusConnection *conn, const char *node, const char *path, const char *interface, const char *method, va_list ap)
+static SDL_bool SDL_DBus_CallVoidMethodInternal(DBusConnection *conn, const char *node, const char *path, const char *interface, const char *method, va_list ap)
 {
     SDL_bool retval = SDL_FALSE;
 
@@ -288,8 +286,7 @@ SDL_DBus_CallVoidMethodInternal(DBusConnection *conn, const char *node, const ch
     return retval;
 }
 
-static SDL_bool
-SDL_DBus_CallWithBasicReply(DBusConnection *conn, DBusMessage *msg, const int expectedtype, void *result)
+static SDL_bool SDL_DBus_CallWithBasicReply(DBusConnection *conn, DBusMessage *msg, const int expectedtype, void *result)
 {
     SDL_bool retval = SDL_FALSE;
 
@@ -360,19 +357,16 @@ SDL_DBus_QueryProperty(const char *node, const char *path, const char *interface
     return SDL_DBus_QueryPropertyOnConnection(dbus.session_conn, node, path, interface, property, expectedtype, result);
 }
 
-
-void
-SDL_DBus_ScreensaverTickle(void)
+void SDL_DBus_ScreensaverTickle(void)
 {
-    if (screensaver_cookie == 0 && inhibit_handle == NULL) {  /* no need to tickle if we're inhibiting. */
+    if (screensaver_cookie == 0 && inhibit_handle == NULL) { /* no need to tickle if we're inhibiting. */
         /* org.gnome.ScreenSaver is the legacy interface, but it'll either do nothing or just be a second harmless tickle on newer systems, so we leave it for now. */
         SDL_DBus_CallVoidMethod("org.gnome.ScreenSaver", "/org/gnome/ScreenSaver", "org.gnome.ScreenSaver", "SimulateUserActivity", DBUS_TYPE_INVALID);
         SDL_DBus_CallVoidMethod("org.freedesktop.ScreenSaver", "/org/freedesktop/ScreenSaver", "org.freedesktop.ScreenSaver", "SimulateUserActivity", DBUS_TYPE_INVALID);
     }
 }
 
-static SDL_bool
-SDL_DBus_AppendDictWithKeyValue(DBusMessageIter *iterInit, const char *key, const char *value)
+static SDL_bool SDL_DBus_AppendDictWithKeyValue(DBusMessageIter *iterInit, const char *key, const char *value)
 {
     DBusMessageIter iterDict, iterEntry, iterValue;
 
@@ -396,9 +390,7 @@ SDL_DBus_AppendDictWithKeyValue(DBusMessageIter *iterInit, const char *key, cons
         goto failed;
     }
 
-    if (!dbus.message_iter_close_container(&iterEntry, &iterValue)
-        || !dbus.message_iter_close_container(&iterDict, &iterEntry)
-        || !dbus.message_iter_close_container(iterInit, &iterDict)) {
+    if (!dbus.message_iter_close_container(&iterEntry, &iterValue) || !dbus.message_iter_close_container(&iterDict, &iterEntry) || !dbus.message_iter_close_container(iterInit, &iterDict)) {
         goto failed;
     }
 
@@ -416,8 +408,7 @@ SDL_DBus_ScreensaverInhibit(SDL_bool inhibit)
 {
     const char *default_inhibit_reason = "Playing a game";
 
-    if ( (inhibit && (screensaver_cookie != 0 || inhibit_handle != NULL))
-        || (!inhibit && (screensaver_cookie == 0 && inhibit_handle == NULL)) ) {
+    if ((inhibit && (screensaver_cookie != 0 || inhibit_handle != NULL)) || (!inhibit && (screensaver_cookie == 0 && inhibit_handle == NULL))) {
         return SDL_TRUE;
     }
 
@@ -431,7 +422,7 @@ SDL_DBus_ScreensaverInhibit(SDL_bool inhibit)
         const char *bus_name = "org.freedesktop.portal.Desktop";
         const char *path = "/org/freedesktop/portal/desktop";
         const char *interface = "org.freedesktop.portal.Inhibit";
-        const char *window = ""; /* As a future improvement we could gather the X11 XID or Wayland surface identifier */
+        const char *window = "";                    /* As a future improvement we could gather the X11 XID or Wayland surface identifier */
         static const unsigned int INHIBIT_IDLE = 8; /* Taken from the portal API reference */
         DBusMessageIter iterInit;
 
@@ -484,15 +475,15 @@ SDL_DBus_ScreensaverInhibit(SDL_bool inhibit)
             const char *app = SDL_GetHint(SDL_HINT_APP_NAME);
             const char *reason = SDL_GetHint(SDL_HINT_SCREENSAVER_INHIBIT_ACTIVITY_NAME);
             if (app == NULL || !app[0]) {
-               app  = "My SDL application";
+                app = "My SDL application";
             }
             if (reason == NULL || !reason[0]) {
                 reason = default_inhibit_reason;
             }
 
             if (!SDL_DBus_CallMethod(bus_name, path, interface, "Inhibit",
-                    DBUS_TYPE_STRING, &app, DBUS_TYPE_STRING, &reason, DBUS_TYPE_INVALID,
-                    DBUS_TYPE_UINT32, &screensaver_cookie, DBUS_TYPE_INVALID)) {
+                                     DBUS_TYPE_STRING, &app, DBUS_TYPE_STRING, &reason, DBUS_TYPE_INVALID,
+                                     DBUS_TYPE_UINT32, &screensaver_cookie, DBUS_TYPE_INVALID)) {
                 return SDL_FALSE;
             }
             return (screensaver_cookie != 0) ? SDL_TRUE : SDL_FALSE;

src/core/linux/SDL_dbus.h

@@ -28,20 +28,20 @@
 #define SDL_USE_LIBDBUS 1
 #include <dbus/dbus.h>
 
-
-typedef struct SDL_DBusContext {
+typedef struct SDL_DBusContext
+{
     DBusConnection *session_conn;
     DBusConnection *system_conn;
 
     DBusConnection *(*bus_get_private)(DBusBusType, DBusError *);
     dbus_bool_t (*bus_register)(DBusConnection *, DBusError *);
     void (*bus_add_match)(DBusConnection *, const char *, DBusError *);
-    DBusConnection * (*connection_open_private)(const char *, DBusError *);
+    DBusConnection *(*connection_open_private)(const char *, DBusError *);
     void (*connection_set_exit_on_disconnect)(DBusConnection *, dbus_bool_t);
     dbus_bool_t (*connection_get_is_connected)(DBusConnection *);
     dbus_bool_t (*connection_add_filter)(DBusConnection *, DBusHandleMessageFunction, void *, DBusFreeFunction);
     dbus_bool_t (*connection_try_register_object_path)(DBusConnection *, const char *,
-        const DBusObjectPathVTable *, void *, DBusError *);
+                                                       const DBusObjectPathVTable *, void *, DBusError *);
     dbus_bool_t (*connection_send)(DBusConnection *, DBusMessage *, dbus_uint32_t *);
     DBusMessage *(*connection_send_with_reply_and_block)(DBusConnection *, DBusMessage *, int, DBusError *);
     void (*connection_close)(DBusConnection *);
@@ -49,7 +49,7 @@ typedef struct SDL_DBusContext {
     void (*connection_flush)(DBusConnection *);
     dbus_bool_t (*connection_read_write)(DBusConnection *, int);
     DBusDispatchStatus (*connection_dispatch)(DBusConnection *);
-    dbus_bool_t (*message_is_signal)(DBusMessage *, const char *, const char *); 
+    dbus_bool_t (*message_is_signal)(DBusMessage *, const char *, const char *);
     DBusMessage *(*message_new_method_call)(const char *, const char *, const char *, const char *);
     dbus_bool_t (*message_append_args)(DBusMessage *, int, ...);
     dbus_bool_t (*message_append_args_valist)(DBusMessage *, int, va_list);
@@ -63,7 +63,7 @@ typedef struct SDL_DBusContext {
     dbus_bool_t (*message_iter_next)(DBusMessageIter *);
     void (*message_iter_get_basic)(DBusMessageIter *, void *);
     int (*message_iter_get_arg_type)(DBusMessageIter *);
-    void (*message_iter_recurse)(DBusMessageIter *, DBusMessageIter *); 
+    void (*message_iter_recurse)(DBusMessageIter *, DBusMessageIter *);
     void (*message_unref)(DBusMessage *);
     dbus_bool_t (*threads_init_default)(void);
     void (*error_init)(DBusError *);
@@ -78,7 +78,7 @@ typedef struct SDL_DBusContext {
 
 extern void SDL_DBus_Init(void);
 extern void SDL_DBus_Quit(void);
-extern SDL_DBusContext * SDL_DBus_GetContext(void);
+extern SDL_DBusContext *SDL_DBus_GetContext(void);
 
 /* These use the built-in Session connection. */
 extern SDL_bool SDL_DBus_CallMethod(const char *node, const char *path, const char *interface, const char *method, ...);

src/core/linux/SDL_evdev.c

@@ -23,7 +23,7 @@
 #ifdef SDL_INPUT_LINUXEV
 
 /* This is based on the linux joystick driver */
-/* References: https://www.kernel.org/doc/Documentation/input/input.txt 
+/* References: https://www.kernel.org/doc/Documentation/input/input.txt
  *             https://www.kernel.org/doc/Documentation/input/event-codes.txt
  *             /usr/include/linux/input.h
  *             The evtest application is also useful to debug the protocol
@@ -48,15 +48,15 @@
 #define SYN_DROPPED 3
 #endif
 #ifndef ABS_MT_SLOT
-#define ABS_MT_SLOT         0x2f
-#define ABS_MT_POSITION_X   0x35
-#define ABS_MT_POSITION_Y   0x36
-#define ABS_MT_TRACKING_ID  0x39
-#define ABS_MT_PRESSURE     0x3a
+#define ABS_MT_SLOT        0x2f
+#define ABS_MT_POSITION_X  0x35
+#define ABS_MT_POSITION_Y  0x36
+#define ABS_MT_TRACKING_ID 0x39
+#define ABS_MT_PRESSURE    0x3a
 #endif
 #ifndef REL_WHEEL_HI_RES
-#define REL_WHEEL_HI_RES    0x0b
-#define REL_HWHEEL_HI_RES   0x0c
+#define REL_WHEEL_HI_RES  0x0b
+#define REL_HWHEEL_HI_RES 0x0c
 #endif
 
 typedef struct SDL_evdevlist_item
@@ -71,8 +71,9 @@ typedef struct SDL_evdevlist_item
        keyboard, touchpad, etc.). Also there's probably some things in here we
        can pull out to the SDL_evdevlist_item i.e. name */
     SDL_bool is_touchscreen;
-    struct {
-        char* name;
+    struct
+    {
+        char *name;
 
         int min_x, max_x, range_x;
         int min_y, max_y, range_y;
@@ -80,8 +81,10 @@ typedef struct SDL_evdevlist_item
 
         int max_slots;
         int current_slot;
-        struct {
-            enum {
+        struct
+        {
+            enum
+            {
                 EVDEV_TOUCH_SLOTDELTA_NONE = 0,
                 EVDEV_TOUCH_SLOTDELTA_DOWN,
                 EVDEV_TOUCH_SLOTDELTA_UP,
@@ -123,33 +126,30 @@ static int SDL_EVDEV_device_removed(const char *dev_path);
 static int SDL_EVDEV_device_added(const char *dev_path, int udev_class);
 #if SDL_USE_LIBUDEV
 static void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_type, int udev_class,
-    const char *dev_path);
+                                    const char *dev_path);
 #endif /* SDL_USE_LIBUDEV */
 
 static Uint8 EVDEV_MouseButtons[] = {
-    SDL_BUTTON_LEFT,            /*  BTN_LEFT        0x110 */
-    SDL_BUTTON_RIGHT,           /*  BTN_RIGHT       0x111 */
-    SDL_BUTTON_MIDDLE,          /*  BTN_MIDDLE      0x112 */
-    SDL_BUTTON_X1,              /*  BTN_SIDE        0x113 */
-    SDL_BUTTON_X2,              /*  BTN_EXTRA       0x114 */
-    SDL_BUTTON_X2 + 1,          /*  BTN_FORWARD     0x115 */
-    SDL_BUTTON_X2 + 2,          /*  BTN_BACK        0x116 */
-    SDL_BUTTON_X2 + 3           /*  BTN_TASK        0x117 */
+    SDL_BUTTON_LEFT,   /*  BTN_LEFT        0x110 */
+    SDL_BUTTON_RIGHT,  /*  BTN_RIGHT       0x111 */
+    SDL_BUTTON_MIDDLE, /*  BTN_MIDDLE      0x112 */
+    SDL_BUTTON_X1,     /*  BTN_SIDE        0x113 */
+    SDL_BUTTON_X2,     /*  BTN_EXTRA       0x114 */
+    SDL_BUTTON_X2 + 1, /*  BTN_FORWARD     0x115 */
+    SDL_BUTTON_X2 + 2, /*  BTN_BACK        0x116 */
+    SDL_BUTTON_X2 + 3  /*  BTN_TASK        0x117 */
 };
 
-static int
-SDL_EVDEV_SetRelativeMouseMode(SDL_bool enabled)
+static int SDL_EVDEV_SetRelativeMouseMode(SDL_bool enabled)
 {
     /* Mice already send relative events through this interface */
     return 0;
 }
 
-
-int
-SDL_EVDEV_Init(void)
+int SDL_EVDEV_Init(void)
 {
     if (_this == NULL) {
-        _this = (SDL_EVDEV_PrivateData*)SDL_calloc(1, sizeof(*_this));
+        _this = (SDL_EVDEV_PrivateData *)SDL_calloc(1, sizeof(*_this));
         if (_this == NULL) {
             return SDL_OutOfMemory();
         }
@@ -179,14 +179,14 @@ SDL_EVDEV_Init(void)
                where device class is an integer representing the
                SDL_UDEV_deviceclass and path is the full path to
                the event device. */
-            const char* devices = SDL_getenv("SDL_EVDEV_DEVICES");
+            const char *devices = SDL_getenv("SDL_EVDEV_DEVICES");
             if (devices) {
                 /* Assume this is the old use of the env var and it is not in
                    ROM. */
-                char* rest = (char*) devices;
-                char* spec;
+                char *rest = (char *)devices;
+                char *spec;
                 while ((spec = SDL_strtokr(rest, ",", &rest))) {
-                    char* endofcls = 0;
+                    char *endofcls = 0;
                     long cls = SDL_strtol(spec, &endofcls, 0);
                     if (endofcls) {
                         SDL_EVDEV_device_added(endofcls + 1, cls);
@@ -208,8 +208,7 @@ SDL_EVDEV_Init(void)
     return 0;
 }
 
-void
-SDL_EVDEV_Quit(void)
+void SDL_EVDEV_Quit(void)
 {
     if (_this == NULL) {
         return;
@@ -241,13 +240,13 @@ SDL_EVDEV_Quit(void)
 
 #if SDL_USE_LIBUDEV
 static void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_event, int udev_class,
-    const char* dev_path)
+                                    const char *dev_path)
 {
     if (dev_path == NULL) {
         return;
     }
 
-    switch(udev_event) {
+    switch (udev_event) {
     case SDL_UDEV_DEVICEADDED:
         if (!(udev_class & (SDL_UDEV_DEVICE_MOUSE | SDL_UDEV_DEVICE_KEYBOARD | SDL_UDEV_DEVICE_TOUCHSCREEN | SDL_UDEV_DEVICE_TOUCHPAD))) {
             return;
@@ -258,7 +257,7 @@ static void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_event, int udev_cl
         }
 
         SDL_EVDEV_device_added(dev_path, udev_class);
-        break;  
+        break;
     case SDL_UDEV_DEVICEREMOVED:
         SDL_EVDEV_device_removed(dev_path);
         break;
@@ -268,8 +267,7 @@ static void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_event, int udev_cl
 }
 #endif /* SDL_USE_LIBUDEV */
 
-void 
-SDL_EVDEV_Poll(void)
+void SDL_EVDEV_Poll(void)
 {
     struct input_event events[32];
     int i, j, len;
@@ -338,11 +336,11 @@ SDL_EVDEV_Poll(void)
                     SDL_EVDEV_kbd_keycode(_this->kbd, events[i].code, events[i].value);
                     break;
                 case EV_ABS:
-                    switch(events[i].code) {
+                    switch (events[i].code) {
                     case ABS_MT_SLOT:
                         if (!item->is_touchscreen) { /* FIXME: temp hack */
                             break;
-                        } 
+                        }
                         item->touchscreen_data->current_slot = events[i].value;
                         break;
                     case ABS_MT_TRACKING_ID:
@@ -410,7 +408,7 @@ SDL_EVDEV_Poll(void)
                     }
                     break;
                 case EV_REL:
-                    switch(events[i].code) {
+                    switch (events[i].code) {
                     case REL_X:
                         if (item->relative_mouse) {
                             item->mouse_x += events[i].value;
@@ -465,13 +463,13 @@ SDL_EVDEV_Poll(void)
 
                         for (j = 0; j < item->touchscreen_data->max_slots; j++) {
                             norm_x = (float)(item->touchscreen_data->slots[j].x - item->touchscreen_data->min_x) /
-                                (float)item->touchscreen_data->range_x;
+                                     (float)item->touchscreen_data->range_x;
                             norm_y = (float)(item->touchscreen_data->slots[j].y - item->touchscreen_data->min_y) /
-                                (float)item->touchscreen_data->range_y;
+                                     (float)item->touchscreen_data->range_y;
 
                             if (item->touchscreen_data->range_pressure > 0) {
                                 norm_pressure = (float)(item->touchscreen_data->slots[j].pressure - item->touchscreen_data->min_pressure) /
-                                    (float)item->touchscreen_data->range_pressure;
+                                                (float)item->touchscreen_data->range_pressure;
                             } else {
                                 /* This touchscreen does not support pressure */
                                 norm_pressure = 1.0f;
@@ -480,7 +478,7 @@ SDL_EVDEV_Poll(void)
                             /* FIXME: the touch's window shouldn't be null, but
                              * the coordinate space of touch positions needs to
                              * be window-relative in that case. */
-                            switch(item->touchscreen_data->slots[j].delta) {
+                            switch (item->touchscreen_data->slots[j].delta) {
                             case EVDEV_TOUCH_SLOTDELTA_DOWN:
                                 SDL_SendTouch(item->fd, item->touchscreen_data->slots[j].tracking_id, NULL, SDL_TRUE, norm_x, norm_y, norm_pressure);
                                 item->touchscreen_data->slots[j].delta = EVDEV_TOUCH_SLOTDELTA_NONE;
@@ -515,12 +513,11 @@ SDL_EVDEV_Poll(void)
                     break;
                 }
             }
-        }    
+        }
     }
 }
 
-static SDL_Scancode
-SDL_EVDEV_translate_keycode(int keycode)
+static SDL_Scancode SDL_EVDEV_translate_keycode(int keycode)
 {
     SDL_Scancode scancode = SDL_GetScancodeFromTable(SDL_SCANCODE_TABLE_LINUX, keycode);
 
@@ -532,8 +529,9 @@ SDL_EVDEV_translate_keycode(int keycode)
            SDL_Log message about an unknown key. */
         if (keycode != BTN_TOUCH) {
             SDL_Log("The key you just pressed is not recognized by SDL. To help "
-                "get this fixed, please report this to the SDL forums/mailing list "
-                "<https://discourse.libsdl.org/> EVDEV KeyCode %d", keycode);
+                    "get this fixed, please report this to the SDL forums/mailing list "
+                    "<https://discourse.libsdl.org/> EVDEV KeyCode %d",
+                    keycode);
         }
     }
 #endif /* DEBUG_SCANCODES */
@@ -541,8 +539,7 @@ SDL_EVDEV_translate_keycode(int keycode)
     return scancode;
 }
 
-static int
-SDL_EVDEV_init_touchscreen(SDL_evdevlist_item* item, int udev_class)
+static int SDL_EVDEV_init_touchscreen(SDL_evdevlist_item *item, int udev_class)
 {
     int ret, i;
     unsigned long xreq, yreq;
@@ -631,8 +628,8 @@ SDL_EVDEV_init_touchscreen(SDL_evdevlist_item* item, int udev_class)
     }
 
     ret = SDL_AddTouch(item->fd, /* I guess our fd is unique enough */
-        (udev_class & SDL_UDEV_DEVICE_TOUCHPAD) ? SDL_TOUCH_DEVICE_INDIRECT_ABSOLUTE : SDL_TOUCH_DEVICE_DIRECT,
-        item->touchscreen_data->name);
+                       (udev_class & SDL_UDEV_DEVICE_TOUCHPAD) ? SDL_TOUCH_DEVICE_INDIRECT_ABSOLUTE : SDL_TOUCH_DEVICE_DIRECT,
+                       item->touchscreen_data->name);
     if (ret < 0) {
         SDL_free(item->touchscreen_data->slots);
         SDL_free(item->touchscreen_data->name);
@@ -643,8 +640,8 @@ SDL_EVDEV_init_touchscreen(SDL_evdevlist_item* item, int udev_class)
     return 0;
 }
 
-static void
-SDL_EVDEV_destroy_touchscreen(SDL_evdevlist_item* item) {
+static void SDL_EVDEV_destroy_touchscreen(SDL_evdevlist_item *item)
+{
     if (!item->is_touchscreen) {
         return;
     }
@@ -655,8 +652,7 @@ SDL_EVDEV_destroy_touchscreen(SDL_evdevlist_item* item) {
     SDL_free(item->touchscreen_data);
 }
 
-static void
-SDL_EVDEV_sync_device(SDL_evdevlist_item *item) 
+static void SDL_EVDEV_sync_device(SDL_evdevlist_item *item)
 {
 #ifdef EVIOCGMTSLOTS
     int i, ret;
@@ -669,8 +665,8 @@ SDL_EVDEV_sync_device(SDL_evdevlist_item *item)
      *
      * this is the structure we're trying to emulate
      */
-    Uint32* mt_req_code;
-    Sint32* mt_req_values;
+    Uint32 *mt_req_code;
+    Sint32 *mt_req_values;
     size_t mt_req_size;
 
     /* TODO: sync devices other than touchscreen */
@@ -679,14 +675,14 @@ SDL_EVDEV_sync_device(SDL_evdevlist_item *item)
     }
 
     mt_req_size = sizeof(*mt_req_code) +
-        sizeof(*mt_req_values) * item->touchscreen_data->max_slots;
+                  sizeof(*mt_req_values) * item->touchscreen_data->max_slots;
 
     mt_req_code = SDL_calloc(1, mt_req_size);
     if (mt_req_code == NULL) {
         return;
     }
 
-    mt_req_values = (Sint32*)mt_req_code + 1;
+    mt_req_values = (Sint32 *)mt_req_code + 1;
 
     *mt_req_code = ABS_MT_TRACKING_ID;
     ret = ioctl(item->fd, EVIOCGMTSLOTS(mt_req_size), mt_req_code);
@@ -709,7 +705,7 @@ SDL_EVDEV_sync_device(SDL_evdevlist_item *item)
             item->touchscreen_data->slots[i].tracking_id = mt_req_values[i];
             item->touchscreen_data->slots[i].delta = EVDEV_TOUCH_SLOTDELTA_DOWN;
         } else if (item->touchscreen_data->slots[i].tracking_id >= 0 &&
-            mt_req_values[i] < 0) {
+                   mt_req_values[i] < 0) {
             item->touchscreen_data->slots[i].tracking_id = -1;
             item->touchscreen_data->slots[i].delta = EVDEV_TOUCH_SLOTDELTA_UP;
         }
@@ -781,8 +777,7 @@ SDL_EVDEV_sync_device(SDL_evdevlist_item *item)
 #endif /* EVIOCGMTSLOTS */
 }
 
-static int
-SDL_EVDEV_device_added(const char *dev_path, int udev_class)
+static int SDL_EVDEV_device_added(const char *dev_path, int udev_class)
 {
     int ret;
     SDL_evdevlist_item *item;
@@ -791,11 +786,11 @@ SDL_EVDEV_device_added(const char *dev_path, int udev_class)
     /* Check to make sure it's not already in list. */
     for (item = _this->first; item != NULL; item = item->next) {
         if (SDL_strcmp(dev_path, item->path) == 0) {
-            return -1;  /* already have this one */
+            return -1; /* already have this one */
         }
     }
 
-    item = (SDL_evdevlist_item *) SDL_calloc(1, sizeof (SDL_evdevlist_item));
+    item = (SDL_evdevlist_item *)SDL_calloc(1, sizeof(SDL_evdevlist_item));
     if (item == NULL) {
         return SDL_OutOfMemory();
     }
@@ -843,8 +838,7 @@ SDL_EVDEV_device_added(const char *dev_path, int udev_class)
     return _this->num_devices++;
 }
 
-static int
-SDL_EVDEV_device_removed(const char *dev_path)
+static int SDL_EVDEV_device_removed(const char *dev_path)
 {
     SDL_evdevlist_item *item;
     SDL_evdevlist_item *prev = NULL;
@@ -876,7 +870,6 @@ SDL_EVDEV_device_removed(const char *dev_path)
     return -1;
 }
 
-
 #endif /* SDL_INPUT_LINUXEV */
 
 /* vi: set ts=4 sw=4 expandtab: */

src/core/linux/SDL_evdev.h

@@ -26,7 +26,6 @@
 
 #ifdef SDL_INPUT_LINUXEV
 
-
 extern int SDL_EVDEV_Init(void);
 extern void SDL_EVDEV_Quit(void);
 extern void SDL_EVDEV_Poll(void);

src/core/linux/SDL_evdev_capabilities.c

@@ -23,7 +23,6 @@
 
 #include "SDL_evdev_capabilities.h"
 
-
 #if HAVE_LINUX_INPUT_H
 
 /* missing defines in older Linux kernel headers */
@@ -31,10 +30,10 @@
 #define BTN_TRIGGER_HAPPY 0x2c0
 #endif
 #ifndef BTN_DPAD_UP
-#define BTN_DPAD_UP       0x220
+#define BTN_DPAD_UP 0x220
 #endif
 #ifndef KEY_ALS_TOGGLE
-#define KEY_ALS_TOGGLE    0x230
+#define KEY_ALS_TOGGLE 0x230
 #endif
 
 extern int
@@ -43,7 +42,8 @@ SDL_EVDEV_GuessDeviceClass(unsigned long bitmask_ev[NBITS(EV_MAX)],
                            unsigned long bitmask_key[NBITS(KEY_MAX)],
                            unsigned long bitmask_rel[NBITS(REL_MAX)])
 {
-    struct range {
+    struct range
+    {
         unsigned start;
         unsigned end;
     };
@@ -114,7 +114,7 @@ SDL_EVDEV_GuessDeviceClass(unsigned long bitmask_ev[NBITS(EV_MAX)],
         unsigned i;
         unsigned long found = 0;
 
-        for (i = 0; i < BTN_MISC/BITS_PER_LONG; ++i) {
+        for (i = 0; i < BTN_MISC / BITS_PER_LONG; ++i) {
             found |= bitmask_key[i];
         }
         /* If there are no keys in the lower block, check the higher blocks */

src/core/linux/SDL_evdev_capabilities.h

@@ -31,21 +31,21 @@
 /* A device can be any combination of these classes */
 typedef enum
 {
-    SDL_UDEV_DEVICE_UNKNOWN     = 0x0000,
-    SDL_UDEV_DEVICE_MOUSE       = 0x0001,
-    SDL_UDEV_DEVICE_KEYBOARD    = 0x0002,
-    SDL_UDEV_DEVICE_JOYSTICK    = 0x0004,
-    SDL_UDEV_DEVICE_SOUND       = 0x0008,
+    SDL_UDEV_DEVICE_UNKNOWN = 0x0000,
+    SDL_UDEV_DEVICE_MOUSE = 0x0001,
+    SDL_UDEV_DEVICE_KEYBOARD = 0x0002,
+    SDL_UDEV_DEVICE_JOYSTICK = 0x0004,
+    SDL_UDEV_DEVICE_SOUND = 0x0008,
     SDL_UDEV_DEVICE_TOUCHSCREEN = 0x0010,
     SDL_UDEV_DEVICE_ACCELEROMETER = 0x0020,
-    SDL_UDEV_DEVICE_TOUCHPAD    = 0x0040
+    SDL_UDEV_DEVICE_TOUCHPAD = 0x0040
 } SDL_UDEV_deviceclass;
 
-#define BITS_PER_LONG           (sizeof(unsigned long) * 8)
-#define NBITS(x)                ((((x)-1)/BITS_PER_LONG)+1)
-#define EVDEV_OFF(x)            ((x)%BITS_PER_LONG)
-#define EVDEV_LONG(x)           ((x)/BITS_PER_LONG)
-#define test_bit(bit, array)    ((array[EVDEV_LONG(bit)] >> EVDEV_OFF(bit)) & 1)
+#define BITS_PER_LONG        (sizeof(unsigned long) * 8)
+#define NBITS(x)             ((((x)-1) / BITS_PER_LONG) + 1)
+#define EVDEV_OFF(x)         ((x) % BITS_PER_LONG)
+#define EVDEV_LONG(x)        ((x) / BITS_PER_LONG)
+#define test_bit(bit, array) ((array[EVDEV_LONG(bit)] >> EVDEV_OFF(bit)) & 1)
 
 extern int SDL_EVDEV_GuessDeviceClass(unsigned long bitmask_ev[NBITS(EV_MAX)],
                                       unsigned long bitmask_abs[NBITS(ABS_MAX)],

src/core/linux/SDL_evdev_kbd.c

@@ -52,33 +52,31 @@
  * Handler Tables.
  */
 
-#define K_HANDLERS\
-    k_self,     k_fn,       k_spec,       k_pad,\
-    k_dead,     k_cons,     k_cur,        k_shift,\
-    k_meta,     k_ascii,    k_lock,       k_lowercase,\
-    k_slock,    k_dead2,    k_brl,        k_ignore
+#define K_HANDLERS                            \
+    k_self, k_fn, k_spec, k_pad,              \
+        k_dead, k_cons, k_cur, k_shift,       \
+        k_meta, k_ascii, k_lock, k_lowercase, \
+        k_slock, k_dead2, k_brl, k_ignore
 
-typedef void (k_handler_fn)(SDL_EVDEV_keyboard_state *kbd, unsigned char value, char up_flag);
+typedef void(k_handler_fn)(SDL_EVDEV_keyboard_state *kbd, unsigned char value, char up_flag);
 static k_handler_fn K_HANDLERS;
 static k_handler_fn *k_handler[16] = { K_HANDLERS };
 
-typedef void (fn_handler_fn)(SDL_EVDEV_keyboard_state *kbd);
+typedef void(fn_handler_fn)(SDL_EVDEV_keyboard_state *kbd);
 static void fn_enter(SDL_EVDEV_keyboard_state *kbd);
 static void fn_caps_toggle(SDL_EVDEV_keyboard_state *kbd);
 static void fn_caps_on(SDL_EVDEV_keyboard_state *kbd);
 static void fn_num(SDL_EVDEV_keyboard_state *kbd);
 static void fn_compose(SDL_EVDEV_keyboard_state *kbd);
 
-static fn_handler_fn *fn_handler[] =
-{
-    NULL,       fn_enter,   NULL,       NULL,
-    NULL,       NULL,       NULL,       fn_caps_toggle,
-    fn_num,     NULL,       NULL,       NULL,
-    NULL,       fn_caps_on, fn_compose, NULL,
-    NULL,       NULL,       NULL,       fn_num
+static fn_handler_fn *fn_handler[] = {
+    NULL, fn_enter, NULL, NULL,
+    NULL, NULL, NULL, fn_caps_toggle,
+    fn_num, NULL, NULL, NULL,
+    NULL, fn_caps_on, fn_compose, NULL,
+    NULL, NULL, NULL, fn_num
 };
 
-
 /*
  * Keyboard State
  */
@@ -88,12 +86,12 @@ struct SDL_EVDEV_keyboard_state
     int console_fd;
     int old_kbd_mode;
     unsigned short **key_maps;
-    unsigned char shift_down[NR_SHIFT];        /* shift state counters.. */
+    unsigned char shift_down[NR_SHIFT]; /* shift state counters.. */
     SDL_bool dead_key_next;
-    int npadch;                    /* -1 or number assembled on pad */
+    int npadch; /* -1 or number assembled on pad */
     struct kbdiacrs *accents;
     unsigned int diacr;
-    SDL_bool rep;                    /* flag telling character repeat */
+    SDL_bool rep; /* flag telling character repeat */
     unsigned char lockstate;
     unsigned char slockstate;
     unsigned char ledflagstate;
@@ -113,7 +111,7 @@ static void SDL_EVDEV_dump_accents(SDL_EVDEV_keyboard_state *kbd)
     for (i = 0; i < kbd->accents->kb_cnt; ++i) {
         struct kbdiacr *diacr = &kbd->accents->kbdiacr[i];
         printf("        { 0x%.2x, 0x%.2x, 0x%.2x },\n",
-            diacr->diacr, diacr->base, diacr->result);
+               diacr->diacr, diacr->base, diacr->result);
     }
     while (i < 256) {
         printf("        { 0x00, 0x00, 0x00 },\n");
@@ -133,7 +131,7 @@ static void SDL_EVDEV_dump_keymap(SDL_EVDEV_keyboard_state *kbd)
         if (kbd->key_maps[i]) {
             printf("static unsigned short default_key_map_%d[NR_KEYS] = {", i);
             for (j = 0; j < NR_KEYS; ++j) {
-                if ((j%8) == 0) {
+                if ((j % 8) == 0) {
                     printf("\n    ");
                 }
                 printf("0x%.4x, ", kbd->key_maps[i][j]);
@@ -193,23 +191,22 @@ static int SDL_EVDEV_kbd_load_keymaps(SDL_EVDEV_keyboard_state *kbd)
     return 0;
 }
 
-static SDL_EVDEV_keyboard_state * kbd_cleanup_state = NULL;
+static SDL_EVDEV_keyboard_state *kbd_cleanup_state = NULL;
 static int kbd_cleanup_sigactions_installed = 0;
 static int kbd_cleanup_atexit_installed = 0;
 
 static struct sigaction old_sigaction[NSIG];
 
-static int fatal_signals[] =
-{
+static int fatal_signals[] = {
     /* Handlers for SIGTERM and SIGINT are installed in SDL_QuitInit. */
-    SIGHUP,  SIGQUIT, SIGILL,  SIGABRT,
-    SIGFPE,  SIGSEGV, SIGPIPE, SIGBUS,
+    SIGHUP, SIGQUIT, SIGILL, SIGABRT,
+    SIGFPE, SIGSEGV, SIGPIPE, SIGBUS,
     SIGSYS
 };
 
 static void kbd_cleanup(void)
 {
-    SDL_EVDEV_keyboard_state* kbd = kbd_cleanup_state;
+    SDL_EVDEV_keyboard_state *kbd = kbd_cleanup_state;
     if (kbd == NULL) {
         return;
     }
@@ -218,18 +215,17 @@ static void kbd_cleanup(void)
     ioctl(kbd->console_fd, KDSKBMODE, kbd->old_kbd_mode);
 }
 
-static void
-SDL_EVDEV_kbd_reraise_signal(int sig)
+static void SDL_EVDEV_kbd_reraise_signal(int sig)
 {
     raise(sig);
 }
 
-siginfo_t* SDL_EVDEV_kdb_cleanup_siginfo = NULL;
-void*      SDL_EVDEV_kdb_cleanup_ucontext = NULL;
+siginfo_t *SDL_EVDEV_kdb_cleanup_siginfo = NULL;
+void *SDL_EVDEV_kdb_cleanup_ucontext = NULL;
 
-static void kbd_cleanup_signal_action(int signum, siginfo_t* info, void* ucontext)
+static void kbd_cleanup_signal_action(int signum, siginfo_t *info, void *ucontext)
 {
-    struct sigaction* old_action_p = &(old_sigaction[signum]);
+    struct sigaction *old_action_p = &(old_sigaction[signum]);
     sigset_t sigset;
 
     /* Restore original signal handler before going any further. */
@@ -263,7 +259,7 @@ static void kbd_unregister_emerg_cleanup()
     kbd_cleanup_sigactions_installed = 0;
 
     for (tabidx = 0; tabidx < sizeof(fatal_signals) / sizeof(fatal_signals[0]); ++tabidx) {
-        struct sigaction* old_action_p;
+        struct sigaction *old_action_p;
         struct sigaction cur_action;
         signum = fatal_signals[tabidx];
         old_action_p = &(old_sigaction[signum]);
@@ -292,7 +288,7 @@ static void kbd_cleanup_atexit(void)
     kbd_unregister_emerg_cleanup();
 }
 
-static void kbd_register_emerg_cleanup(SDL_EVDEV_keyboard_state * kbd)
+static void kbd_register_emerg_cleanup(SDL_EVDEV_keyboard_state *kbd)
 {
     int tabidx, signum;
 
@@ -316,9 +312,9 @@ static void kbd_register_emerg_cleanup(SDL_EVDEV_keyboard_state * kbd)
     kbd_cleanup_sigactions_installed = 1;
 
     for (tabidx = 0; tabidx < sizeof(fatal_signals) / sizeof(fatal_signals[0]); ++tabidx) {
-        struct sigaction* old_action_p;
+        struct sigaction *old_action_p;
         struct sigaction new_action;
-        signum = fatal_signals[tabidx];   
+        signum = fatal_signals[tabidx];
         old_action_p = &(old_sigaction[signum]);
         if (sigaction(signum, NULL, old_action_p)) {
             continue;
@@ -327,7 +323,7 @@ static void kbd_register_emerg_cleanup(SDL_EVDEV_keyboard_state * kbd)
         /* Skip SIGHUP and SIGPIPE if handler is already installed
          * - assume the handler will do the cleanup
          */
-        if ((signum == SIGHUP || signum == SIGPIPE) && (old_action_p->sa_handler != SIG_DFL || (void(*)(int))old_action_p->sa_sigaction != SIG_DFL)) {
+        if ((signum == SIGHUP || signum == SIGPIPE) && (old_action_p->sa_handler != SIG_DFL || (void (*)(int))old_action_p->sa_sigaction != SIG_DFL)) {
             continue;
         }
 
@@ -344,7 +340,7 @@ SDL_EVDEV_kbd_init(void)
     SDL_EVDEV_keyboard_state *kbd;
     int i;
     char flag_state;
-    char shift_state[ sizeof (long) ] = {TIOCL_GETSHIFTSTATE, 0};
+    char shift_state[sizeof(long)] = { TIOCL_GETSHIFTSTATE, 0 };
 
     kbd = (SDL_EVDEV_keyboard_state *)SDL_calloc(1, sizeof(*kbd));
     if (kbd == NULL) {
@@ -410,8 +406,7 @@ SDL_EVDEV_kbd_init(void)
     return kbd;
 }
 
-void
-SDL_EVDEV_kbd_quit(SDL_EVDEV_keyboard_state *kbd)
+void SDL_EVDEV_kbd_quit(SDL_EVDEV_keyboard_state *kbd)
 {
     if (kbd == NULL) {
         return;
@@ -446,7 +441,7 @@ SDL_EVDEV_kbd_quit(SDL_EVDEV_keyboard_state *kbd)
 static void put_queue(SDL_EVDEV_keyboard_state *kbd, uint c)
 {
     /* c is already part of a UTF-8 sequence and safe to add as a character */
-    if (kbd->text_len < (sizeof(kbd->text)-1)) {
+    if (kbd->text_len < (sizeof(kbd->text) - 1)) {
         kbd->text[kbd->text_len++] = (char)c;
     }
 }
@@ -614,7 +609,7 @@ static void k_self(SDL_EVDEV_keyboard_state *kbd, unsigned char value, char up_f
 {
     if (up_flag) {
         return; /* no action, if this is a key release */
-    } 
+    }
 
     if (kbd->diacr) {
         value = handle_diacr(kbd, value);
@@ -638,7 +633,7 @@ static void k_deadunicode(SDL_EVDEV_keyboard_state *kbd, unsigned int value, cha
 
 static void k_dead(SDL_EVDEV_keyboard_state *kbd, unsigned char value, char up_flag)
 {
-    const unsigned char ret_diacr[NR_DEAD] = {'`', '\'', '^', '~', '"', ',' };
+    const unsigned char ret_diacr[NR_DEAD] = { '`', '\'', '^', '~', '"', ',' };
 
     k_deadunicode(kbd, ret_diacr[value], up_flag);
 }
@@ -665,7 +660,7 @@ static void k_pad(SDL_EVDEV_keyboard_state *kbd, unsigned char value, char up_fl
     static const char pad_chars[] = "0123456789+-*/\015,.?()#";
 
     if (up_flag)
-        return;        /* no action, if this is a key release */
+        return; /* no action, if this is a key release */
 
     if (!vc_kbd_led(kbd, K_NUMLOCK)) {
         /* unprintable action */
@@ -767,8 +762,7 @@ static void k_brl(SDL_EVDEV_keyboard_state *kbd, unsigned char value, char up_fl
 {
 }
 
-void
-SDL_EVDEV_kbd_keycode(SDL_EVDEV_keyboard_state *kbd, unsigned int keycode, int down)
+void SDL_EVDEV_kbd_keycode(SDL_EVDEV_keyboard_state *kbd, unsigned int keycode, int down)
 {
     unsigned char shift_final;
     unsigned char type;
@@ -840,13 +834,11 @@ SDL_EVDEV_kbd_init(void)
     return NULL;
 }
 
-void
-SDL_EVDEV_kbd_keycode(SDL_EVDEV_keyboard_state *state, unsigned int keycode, int down)
+void SDL_EVDEV_kbd_keycode(SDL_EVDEV_keyboard_state *state, unsigned int keycode, int down)
 {
 }
 
-void
-SDL_EVDEV_kbd_quit(SDL_EVDEV_keyboard_state *state)
+void SDL_EVDEV_kbd_quit(SDL_EVDEV_keyboard_state *state)
 {
 }
 

src/core/linux/SDL_evdev_kbd_default_keymap.h

@@ -19,6 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
+/* *INDENT-OFF* */ /* clang-format off */
+
 static unsigned short default_key_map_0[NR_KEYS] = {
     0xf200, 0xf01b, 0xf031, 0xf032, 0xf033, 0xf034, 0xf035, 0xf036, 
     0xf037, 0xf038, 0xf039, 0xf030, 0xf02d, 0xf03d, 0xf07f, 0xf009, 
@@ -4374,6 +4376,8 @@ static unsigned short default_key_map_127[NR_KEYS] = {
 };
 #endif /* INCLUDE_EXTENDED_KEYMAP */
 
+/* *INDENT-ON* */ /* clang-format on */
+
 static unsigned short *default_key_maps[MAX_NR_KEYMAPS] = {
     default_key_map_0,
     default_key_map_1,
@@ -4504,7 +4508,7 @@ static unsigned short *default_key_maps[MAX_NR_KEYMAPS] = {
     default_key_map_125,
     default_key_map_126,
     default_key_map_127,
-#else /* !INCLUDE_EXTENDED_KEYMAP */
+#else  /* !INCLUDE_EXTENDED_KEYMAP */
     NULL,
     NULL,
     NULL,

src/core/linux/SDL_fcitx.c

@@ -32,7 +32,6 @@
 #endif
 #include <SDL3/SDL_syswm.h>
 
-
 #define FCITX_DBUS_SERVICE "org.freedesktop.portal.Fcitx"
 
 #define FCITX_IM_DBUS_PATH "/org/freedesktop/portal/inputmethod"
@@ -55,8 +54,7 @@ typedef struct _FcitxClient
 
 static FcitxClient fcitx_client;
 
-static char*
-GetAppName()
+static char *GetAppName()
 {
 #if defined(__LINUX__) || defined(__FREEBSD__)
     char *spot;
@@ -86,10 +84,10 @@ GetAppName()
 
 static size_t
 Fcitx_GetPreeditString(SDL_DBusContext *dbus,
-        DBusMessage *msg,
-        char **ret,
-        Sint32 *start_pos,
-        Sint32 *end_pos)
+                       DBusMessage *msg,
+                       char **ret,
+                       Sint32 *start_pos,
+                       Sint32 *end_pos)
 {
     char *text = NULL, *subtext;
     size_t text_bytes = 0;
@@ -141,7 +139,7 @@ Fcitx_GetPreeditString(SDL_DBusContext *dbus,
         }
 
         if (text) {
-            char* pivot = text;
+            char *pivot = text;
             /* Second pass: join all the sub string */
             dbus->message_iter_recurse(&iter, &array);
             while (dbus->message_iter_get_arg_type(&array) == DBUS_TYPE_STRUCT) {
@@ -167,8 +165,7 @@ Fcitx_GetPreeditString(SDL_DBusContext *dbus,
     return text_bytes;
 }
 
-static Sint32
-Fcitx_GetPreeditCursorByte(SDL_DBusContext *dbus, DBusMessage *msg)
+static Sint32 Fcitx_GetPreeditCursorByte(SDL_DBusContext *dbus, DBusMessage *msg)
 {
     Sint32 byte = -1;
     DBusMessageIter iter;
@@ -186,8 +183,7 @@ Fcitx_GetPreeditCursorByte(SDL_DBusContext *dbus, DBusMessage *msg)
     return byte;
 }
 
-static DBusHandlerResult
-DBus_MessageFilter(DBusConnection *conn, DBusMessage *msg, void *data)
+static DBusHandlerResult DBus_MessageFilter(DBusConnection *conn, DBusMessage *msg, void *data)
 {
     SDL_DBusContext *dbus = (SDL_DBusContext *)data;
 
@@ -203,7 +199,7 @@ DBus_MessageFilter(DBusConnection *conn, DBusMessage *msg, void *data)
             size_t text_bytes = SDL_strlen(text), i = 0;
 
             while (i < text_bytes) {
-                size_t sz = SDL_utf8strlcpy(buf, text+i, sizeof(buf));
+                size_t sz = SDL_utf8strlcpy(buf, text + i, sizeof(buf));
                 SDL_SendKeyboardText(buf);
 
                 i += sz;
@@ -250,8 +246,7 @@ DBus_MessageFilter(DBusConnection *conn, DBusMessage *msg, void *data)
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
-static void
-FcitxClientICCallMethod(FcitxClient *client, const char *method)
+static void FcitxClientICCallMethod(FcitxClient *client, const char *method)
 {
     if (!client->ic_path) {
         return;
@@ -259,11 +254,10 @@ FcitxClientICCallMethod(FcitxClient *client, const char *method)
     SDL_DBus_CallVoidMethod(FCITX_DBUS_SERVICE, client->ic_path, FCITX_IC_DBUS_INTERFACE, method, DBUS_TYPE_INVALID);
 }
 
-static void SDLCALL
-Fcitx_SetCapabilities(void *data,
-        const char *name,
-        const char *old_val,
-        const char *internal_editing)
+static void SDLCALL Fcitx_SetCapabilities(void *data,
+                                          const char *name,
+                                          const char *old_val,
+                                          const char *internal_editing)
 {
     FcitxClient *client = (FcitxClient *)data;
     Uint64 caps = 0;
@@ -279,8 +273,8 @@ Fcitx_SetCapabilities(void *data,
     SDL_DBus_CallVoidMethod(FCITX_DBUS_SERVICE, client->ic_path, FCITX_IC_DBUS_INTERFACE, "SetCapability", DBUS_TYPE_UINT64, &caps, DBUS_TYPE_INVALID);
 }
 
-static SDL_bool
-FcitxCreateInputContext(SDL_DBusContext* dbus, const char *appname, char **ic_path) {
+static SDL_bool FcitxCreateInputContext(SDL_DBusContext *dbus, const char *appname, char **ic_path)
+{
     const char *program = "program";
     SDL_bool retval = SDL_FALSE;
     if (dbus->session_conn) {
@@ -308,8 +302,7 @@ FcitxCreateInputContext(SDL_DBusContext* dbus, const char *appname, char **ic_pa
     return retval;
 }
 
-static SDL_bool
-FcitxClientCreateIC(FcitxClient *client)
+static SDL_bool FcitxClientCreateIC(FcitxClient *client)
 {
     char *appname = GetAppName();
     char *ic_path = NULL;
@@ -317,7 +310,7 @@ FcitxClientCreateIC(FcitxClient *client)
 
     /* SDL_DBus_CallMethod cannot handle a(ss) type, call dbus function directly */
     if (!FcitxCreateInputContext(dbus, appname, &ic_path)) {
-        ic_path = NULL;  /* just in case. */
+        ic_path = NULL; /* just in case. */
     }
 
     SDL_free(appname);
@@ -327,11 +320,11 @@ FcitxClientCreateIC(FcitxClient *client)
         client->ic_path = SDL_strdup(ic_path);
 
         dbus->bus_add_match(dbus->session_conn,
-                "type='signal', interface='org.fcitx.Fcitx.InputContext1'",
-                NULL);
+                            "type='signal', interface='org.fcitx.Fcitx.InputContext1'",
+                            NULL);
         dbus->connection_add_filter(dbus->session_conn,
-                &DBus_MessageFilter, dbus,
-                NULL);
+                                    &DBus_MessageFilter, dbus,
+                                    NULL);
         dbus->connection_flush(dbus->session_conn);
 
         SDL_AddHintCallback(SDL_HINT_IME_INTERNAL_EDITING, Fcitx_SetCapabilities, client);
@@ -341,8 +334,7 @@ FcitxClientCreateIC(FcitxClient *client)
     return SDL_FALSE;
 }
 
-static Uint32
-Fcitx_ModState(void)
+static Uint32 Fcitx_ModState(void)
 {
     Uint32 fcitx_mods = 0;
     SDL_Keymod sdl_mods = SDL_GetModState();
@@ -388,8 +380,7 @@ SDL_Fcitx_Init()
     return FcitxClientCreateIC(&fcitx_client);
 }
 
-void
-SDL_Fcitx_Quit()
+void SDL_Fcitx_Quit()
 {
     FcitxClientICCallMethod(&fcitx_client, "DestroyIC");
     if (fcitx_client.ic_path) {
@@ -398,8 +389,7 @@ SDL_Fcitx_Quit()
     }
 }
 
-void
-SDL_Fcitx_SetFocus(SDL_bool focused)
+void SDL_Fcitx_SetFocus(SDL_bool focused)
 {
     if (focused) {
         FcitxClientICCallMethod(&fcitx_client, "FocusIn");
@@ -408,8 +398,7 @@ SDL_Fcitx_SetFocus(SDL_bool focused)
     }
 }
 
-void
-SDL_Fcitx_Reset(void)
+void SDL_Fcitx_Reset(void)
 {
     FcitxClientICCallMethod(&fcitx_client, "Reset");
     FcitxClientICCallMethod(&fcitx_client, "CloseIC");
@@ -428,8 +417,8 @@ SDL_Fcitx_ProcessKeyEvent(Uint32 keysym, Uint32 keycode, Uint8 state)
     }
 
     if (SDL_DBus_CallMethod(FCITX_DBUS_SERVICE, fcitx_client.ic_path, FCITX_IC_DBUS_INTERFACE, "ProcessKeyEvent",
-            DBUS_TYPE_UINT32, &keysym, DBUS_TYPE_UINT32, &keycode, DBUS_TYPE_UINT32, &mod_state, DBUS_TYPE_BOOLEAN, &is_release, DBUS_TYPE_UINT32, &event_time, DBUS_TYPE_INVALID,
-            DBUS_TYPE_BOOLEAN, &handled, DBUS_TYPE_INVALID)) {
+                            DBUS_TYPE_UINT32, &keysym, DBUS_TYPE_UINT32, &keycode, DBUS_TYPE_UINT32, &mod_state, DBUS_TYPE_BOOLEAN, &is_release, DBUS_TYPE_UINT32, &event_time, DBUS_TYPE_INVALID,
+                            DBUS_TYPE_BOOLEAN, &handled, DBUS_TYPE_INVALID)) {
         if (handled) {
             SDL_Fcitx_UpdateTextRect(NULL);
             return SDL_TRUE;
@@ -439,8 +428,7 @@ SDL_Fcitx_ProcessKeyEvent(Uint32 keysym, Uint32 keycode, Uint8 state)
     return SDL_FALSE;
 }
 
-void
-SDL_Fcitx_UpdateTextRect(const SDL_Rect *rect)
+void SDL_Fcitx_UpdateTextRect(const SDL_Rect *rect)
 {
     SDL_Window *focused_win = NULL;
     SDL_SysWMinfo info;
@@ -453,7 +441,7 @@ SDL_Fcitx_UpdateTextRect(const SDL_Rect *rect)
 
     focused_win = SDL_GetKeyboardFocus();
     if (focused_win == NULL) {
-        return ;
+        return;
     }
 
     SDL_GetWindowPosition(focused_win, &x, &y);
@@ -482,11 +470,10 @@ SDL_Fcitx_UpdateTextRect(const SDL_Rect *rect)
     y += cursor->y;
 
     SDL_DBus_CallVoidMethod(FCITX_DBUS_SERVICE, fcitx_client.ic_path, FCITX_IC_DBUS_INTERFACE, "SetCursorRect",
-        DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_INT32, &cursor->w, DBUS_TYPE_INT32, &cursor->h, DBUS_TYPE_INVALID);
+                            DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_INT32, &cursor->w, DBUS_TYPE_INT32, &cursor->h, DBUS_TYPE_INVALID);
 }
 
-void
-SDL_Fcitx_PumpEvents(void)
+void SDL_Fcitx_PumpEvents(void)
 {
     SDL_DBusContext *dbus = fcitx_client.dbus;
     DBusConnection *conn = dbus->session_conn;

src/core/linux/SDL_fcitx.h

@@ -24,7 +24,6 @@
 
 #include "SDL_internal.h"
 
-
 extern SDL_bool SDL_Fcitx_Init(void);
 extern void SDL_Fcitx_Quit(void);
 extern void SDL_Fcitx_SetFocus(SDL_bool focused);

src/core/linux/SDL_ibus.c

@@ -36,14 +36,14 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-static const char IBUS_PATH[]            = "/org/freedesktop/IBus";
+static const char IBUS_PATH[] = "/org/freedesktop/IBus";
 
-static const char IBUS_SERVICE[]         = "org.freedesktop.IBus";
-static const char IBUS_INTERFACE[]       = "org.freedesktop.IBus";
+static const char IBUS_SERVICE[] = "org.freedesktop.IBus";
+static const char IBUS_INTERFACE[] = "org.freedesktop.IBus";
 static const char IBUS_INPUT_INTERFACE[] = "org.freedesktop.IBus.InputContext";
 
-static const char IBUS_PORTAL_SERVICE[]         = "org.freedesktop.portal.IBus";
-static const char IBUS_PORTAL_INTERFACE[]       = "org.freedesktop.IBus.Portal";
+static const char IBUS_PORTAL_SERVICE[] = "org.freedesktop.portal.IBus";
+static const char IBUS_PORTAL_INTERFACE[] = "org.freedesktop.IBus.Portal";
 static const char IBUS_PORTAL_INPUT_INTERFACE[] = "org.freedesktop.IBus.InputContext";
 
 static const char *ibus_service = NULL;
@@ -56,13 +56,11 @@ static SDL_bool ibus_is_portal_interface = SDL_FALSE;
 static char *ibus_addr_file = NULL;
 static int inotify_fd = -1, inotify_wd = -1;
 
-
-static Uint32
-IBus_ModState(void)
+static Uint32 IBus_ModState(void)
 {
     Uint32 ibus_mods = 0;
     SDL_Keymod sdl_mods = SDL_GetModState();
-    
+
     /* Not sure about MOD3, MOD4 and HYPER mappings */
     if (sdl_mods & KMOD_LSHIFT) {
         ibus_mods |= IBUS_SHIFT_MASK;
@@ -92,9 +90,8 @@ IBus_ModState(void)
     return ibus_mods;
 }
 
-static SDL_bool
-IBus_EnterVariant(DBusConnection *conn, DBusMessageIter *iter, SDL_DBusContext *dbus,
-                  DBusMessageIter *inside, const char * struct_id, size_t id_size)
+static SDL_bool IBus_EnterVariant(DBusConnection *conn, DBusMessageIter *iter, SDL_DBusContext *dbus,
+                                  DBusMessageIter *inside, const char *struct_id, size_t id_size)
 {
     DBusMessageIter sub;
     if (dbus->message_iter_get_arg_type(iter) != DBUS_TYPE_VARIANT) {
@@ -120,9 +117,8 @@ IBus_EnterVariant(DBusConnection *conn, DBusMessageIter *iter, SDL_DBusContext *
     return SDL_TRUE;
 }
 
-static SDL_bool
-IBus_GetDecorationPosition(DBusConnection *conn, DBusMessageIter *iter, SDL_DBusContext *dbus,
-                           Uint32 *start_pos, Uint32 *end_pos)
+static SDL_bool IBus_GetDecorationPosition(DBusConnection *conn, DBusMessageIter *iter, SDL_DBusContext *dbus,
+                                           Uint32 *start_pos, Uint32 *end_pos)
 {
     DBusMessageIter sub1, sub2, array;
 
@@ -185,8 +181,7 @@ IBus_GetDecorationPosition(DBusConnection *conn, DBusMessageIter *iter, SDL_DBus
     return SDL_FALSE;
 }
 
-static const char *
-IBus_GetVariantText(DBusConnection *conn, DBusMessageIter *iter, SDL_DBusContext *dbus)
+static const char *IBus_GetVariantText(DBusConnection *conn, DBusMessageIter *iter, SDL_DBusContext *dbus)
 {
     /* The text we need is nested weirdly, use dbus-monitor to see the structure better */
     const char *text = NULL;
@@ -207,9 +202,8 @@ IBus_GetVariantText(DBusConnection *conn, DBusMessageIter *iter, SDL_DBusContext
     return text;
 }
 
-static SDL_bool
-IBus_GetVariantCursorPos(DBusConnection *conn, DBusMessageIter *iter, SDL_DBusContext *dbus,
-                         Uint32 *pos)
+static SDL_bool IBus_GetVariantCursorPos(DBusConnection *conn, DBusMessageIter *iter, SDL_DBusContext *dbus,
+                                         Uint32 *pos)
 {
     dbus->message_iter_next(iter);
 
@@ -222,8 +216,7 @@ IBus_GetVariantCursorPos(DBusConnection *conn, DBusMessageIter *iter, SDL_DBusCo
     return SDL_TRUE;
 }
 
-static DBusHandlerResult
-IBus_MessageHandler(DBusConnection *conn, DBusMessage *msg, void *user_data)
+static DBusHandlerResult IBus_MessageHandler(DBusConnection *conn, DBusMessage *msg, void *user_data)
 {
     SDL_DBusContext *dbus = (SDL_DBusContext *)user_data;
 
@@ -239,7 +232,7 @@ IBus_MessageHandler(DBusConnection *conn, DBusMessage *msg, void *user_data)
             size_t text_bytes = SDL_strlen(text), i = 0;
 
             while (i < text_bytes) {
-                size_t sz = SDL_utf8strlcpy(buf, text+i, sizeof(buf));
+                size_t sz = SDL_utf8strlcpy(buf, text + i, sizeof(buf));
                 SDL_SendKeyboardText(buf);
 
                 i += sz;
@@ -282,7 +275,7 @@ IBus_MessageHandler(DBusConnection *conn, DBusMessage *msg, void *user_data)
                 size_t cursor = 0;
 
                 do {
-                    const size_t sz = SDL_utf8strlcpy(buf, text+i, sizeof(buf));
+                    const size_t sz = SDL_utf8strlcpy(buf, text + i, sizeof(buf));
                     const size_t chars = SDL_utf8strlen(buf);
 
                     SDL_SendEditingText(buf, cursor, chars);
@@ -305,8 +298,7 @@ IBus_MessageHandler(DBusConnection *conn, DBusMessage *msg, void *user_data)
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
-static char *
-IBus_ReadAddressFromFile(const char *file_path)
+static char *IBus_ReadAddressFromFile(const char *file_path)
 {
     char addr_buf[1024];
     SDL_bool success = SDL_FALSE;
@@ -318,7 +310,7 @@ IBus_ReadAddressFromFile(const char *file_path)
     }
 
     while (fgets(addr_buf, sizeof(addr_buf), addr_file)) {
-        if (SDL_strncmp(addr_buf, "IBUS_ADDRESS=", sizeof("IBUS_ADDRESS=")-1) == 0) {
+        if (SDL_strncmp(addr_buf, "IBUS_ADDRESS=", sizeof("IBUS_ADDRESS=") - 1) == 0) {
             size_t sz = SDL_strlen(addr_buf);
             if (addr_buf[sz - 1] == '\n') {
                 addr_buf[sz - 1] = 0;
@@ -340,8 +332,7 @@ IBus_ReadAddressFromFile(const char *file_path)
     }
 }
 
-static char *
-IBus_GetDBusAddressFilename(void)
+static char *IBus_GetDBusAddressFilename(void)
 {
     SDL_DBusContext *dbus;
     const char *disp_env;
@@ -357,18 +348,18 @@ IBus_GetDBusAddressFilename(void)
     if (ibus_addr_file) {
         return SDL_strdup(ibus_addr_file);
     }
-    
+
     dbus = SDL_DBus_GetContext();
     if (dbus == NULL) {
         return NULL;
     }
-    
+
     /* Use this environment variable if it exists. */
     addr = SDL_getenv("IBUS_ADDRESS");
     if (addr && *addr) {
         return SDL_strdup(addr);
     }
-    
+
     /* Otherwise, we have to get the hostname, display, machine id, config dir
        and look up the address from a filepath using all those bits, eek. */
     disp_env = SDL_getenv("DISPLAY");
@@ -378,23 +369,23 @@ IBus_GetDBusAddressFilename(void)
     } else {
         display = SDL_strdup(disp_env);
     }
-    
+
     host = display;
-    disp_num   = SDL_strrchr(display, ':');
+    disp_num = SDL_strrchr(display, ':');
     screen_num = SDL_strrchr(display, '.');
-    
+
     if (disp_num == NULL) {
         SDL_free(display);
         return NULL;
     }
-    
+
     *disp_num = 0;
     disp_num++;
-    
+
     if (screen_num) {
         *screen_num = 0;
     }
-    
+
     if (!*host) {
         const char *session = SDL_getenv("XDG_SESSION_TYPE");
         if (session != NULL && SDL_strcmp(session, "wayland") == 0) {
@@ -403,9 +394,9 @@ IBus_GetDBusAddressFilename(void)
             host = "unix";
         }
     }
-        
+
     SDL_memset(config_dir, 0, sizeof(config_dir));
-    
+
     conf_env = SDL_getenv("XDG_CONFIG_HOME");
     if (conf_env && *conf_env) {
         SDL_strlcpy(config_dir, conf_env, sizeof(config_dir));
@@ -417,26 +408,25 @@ IBus_GetDBusAddressFilename(void)
         }
         SDL_snprintf(config_dir, sizeof(config_dir), "%s/.config", home_env);
     }
-    
+
     key = dbus->get_local_machine_id();
 
     SDL_memset(file_path, 0, sizeof(file_path));
-    SDL_snprintf(file_path, sizeof(file_path), "%s/ibus/bus/%s-%s-%s", 
-                                               config_dir, key, host, disp_num);
+    SDL_snprintf(file_path, sizeof(file_path), "%s/ibus/bus/%s-%s-%s",
+                 config_dir, key, host, disp_num);
     dbus->free(key);
     SDL_free(display);
-    
+
     return SDL_strdup(file_path);
 }
 
 static SDL_bool IBus_CheckConnection(SDL_DBusContext *dbus);
 
-static void SDLCALL
-IBus_SetCapabilities(void *data, const char *name, const char *old_val,
-                                                   const char *internal_editing)
+static void SDLCALL IBus_SetCapabilities(void *data, const char *name, const char *old_val,
+                                         const char *internal_editing)
 {
     SDL_DBusContext *dbus = SDL_DBus_GetContext();
-    
+
     if (IBus_CheckConnection(dbus)) {
         Uint32 caps = IBUS_CAP_FOCUS;
         if (!(internal_editing && *internal_editing == '1')) {
@@ -444,19 +434,17 @@ IBus_SetCapabilities(void *data, const char *name, const char *old_val,
         }
 
         SDL_DBus_CallVoidMethodOnConnection(ibus_conn, ibus_service, input_ctx_path, ibus_input_interface, "SetCapabilities",
-                                DBUS_TYPE_UINT32, &caps, DBUS_TYPE_INVALID);
+                                            DBUS_TYPE_UINT32, &caps, DBUS_TYPE_INVALID);
     }
 }
 
-
-static SDL_bool
-IBus_SetupConnection(SDL_DBusContext *dbus, const char* addr)
+static SDL_bool IBus_SetupConnection(SDL_DBusContext *dbus, const char *addr)
 {
     const char *client_name = "SDL3_Application";
     const char *path = NULL;
     SDL_bool result = SDL_FALSE;
     DBusObjectPathVTable ibus_vtable;
-    
+
     SDL_zero(ibus_vtable);
     ibus_vtable.message_function = &IBus_MessageHandler;
 
@@ -480,16 +468,16 @@ IBus_SetupConnection(SDL_DBusContext *dbus, const char* addr)
         ibus_conn = dbus->connection_open_private(addr, NULL);
 
         if (ibus_conn == NULL) {
-            return SDL_FALSE;  /* oh well. */
+            return SDL_FALSE; /* oh well. */
         }
 
         dbus->connection_flush(ibus_conn);
-    
+
         if (!dbus->bus_register(ibus_conn, NULL)) {
             ibus_conn = NULL;
             return SDL_FALSE;
         }
-    
+
         dbus->connection_flush(ibus_conn);
 
         result = SDL_DBus_CallMethodOnConnection(ibus_conn, ibus_service, IBUS_PATH, ibus_interface, "CreateInputContext",
@@ -499,7 +487,7 @@ IBus_SetupConnection(SDL_DBusContext *dbus, const char* addr)
 
     if (result) {
         char matchstr[128];
-        SDL_snprintf(matchstr, sizeof (matchstr), "type='signal',interface='%s'", ibus_input_interface);
+        SDL_snprintf(matchstr, sizeof(matchstr), "type='signal',interface='%s'", ibus_input_interface);
         SDL_free(input_ctx_path);
         input_ctx_path = SDL_strdup(path);
         SDL_AddHintCallback(SDL_HINT_IME_INTERNAL_EDITING, IBus_SetCapabilities, NULL);
@@ -510,46 +498,45 @@ IBus_SetupConnection(SDL_DBusContext *dbus, const char* addr)
 
     SDL_IBus_SetFocus(SDL_GetKeyboardFocus() != NULL);
     SDL_IBus_UpdateTextRect(NULL);
-    
+
     return result;
 }
 
-static SDL_bool
-IBus_CheckConnection(SDL_DBusContext *dbus)
+static SDL_bool IBus_CheckConnection(SDL_DBusContext *dbus)
 {
     if (dbus == NULL) {
         return SDL_FALSE;
     }
-    
+
     if (ibus_conn && dbus->connection_get_is_connected(ibus_conn)) {
         return SDL_TRUE;
     }
-    
+
     if (inotify_fd > 0 && inotify_wd > 0) {
         char buf[1024];
         ssize_t readsize = read(inotify_fd, buf, sizeof(buf));
         if (readsize > 0) {
-        
+
             char *p;
             SDL_bool file_updated = SDL_FALSE;
-            
+
             for (p = buf; p < buf + readsize; /**/) {
-                struct inotify_event *event = (struct inotify_event*) p;
+                struct inotify_event *event = (struct inotify_event *)p;
                 if (event->len > 0) {
                     char *addr_file_no_path = SDL_strrchr(ibus_addr_file, '/');
                     if (addr_file_no_path == NULL) {
                         return SDL_FALSE;
                     }
-                 
+
                     if (SDL_strcmp(addr_file_no_path + 1, event->name) == 0) {
                         file_updated = SDL_TRUE;
                         break;
                     }
                 }
-                
+
                 p += sizeof(struct inotify_event) + event->len;
             }
-            
+
             if (file_updated) {
                 char *addr = IBus_ReadAddressFromFile(ibus_addr_file);
                 if (addr) {
@@ -560,7 +547,7 @@ IBus_CheckConnection(SDL_DBusContext *dbus)
             }
         }
     }
-    
+
     return SDL_FALSE;
 }
 
@@ -569,7 +556,7 @@ SDL_IBus_Init(void)
 {
     SDL_bool result = SDL_FALSE;
     SDL_DBusContext *dbus = SDL_DBus_GetContext();
-    
+
     if (dbus) {
         char *addr_file = IBus_GetDBusAddressFilename();
         char *addr;
@@ -578,29 +565,29 @@ SDL_IBus_Init(void)
         if (addr_file == NULL) {
             return SDL_FALSE;
         }
-        
+
         /* !!! FIXME: if ibus_addr_file != NULL, this will overwrite it and leak (twice!) */
         ibus_addr_file = SDL_strdup(addr_file);
-        
+
         addr = IBus_ReadAddressFromFile(addr_file);
         if (addr == NULL) {
             SDL_free(addr_file);
             return SDL_FALSE;
         }
-        
+
         if (inotify_fd < 0) {
             inotify_fd = inotify_init();
             fcntl(inotify_fd, F_SETFL, O_NONBLOCK);
         }
-        
+
         addr_file_dir = SDL_strrchr(addr_file, '/');
         if (addr_file_dir) {
             *addr_file_dir = 0;
         }
-        
+
         inotify_wd = inotify_add_watch(inotify_fd, addr_file, IN_CREATE | IN_MODIFY);
         SDL_free(addr_file);
-        
+
         result = IBus_SetupConnection(dbus, addr);
         SDL_free(addr);
 
@@ -616,27 +603,26 @@ SDL_IBus_Init(void)
             }
         }
     }
-    
+
     return result;
 }
 
-void
-SDL_IBus_Quit(void)
-{   
+void SDL_IBus_Quit(void)
+{
     SDL_DBusContext *dbus;
 
     if (input_ctx_path) {
         SDL_free(input_ctx_path);
         input_ctx_path = NULL;
     }
-    
+
     if (ibus_addr_file) {
         SDL_free(ibus_addr_file);
         ibus_addr_file = NULL;
     }
-    
+
     dbus = SDL_DBus_GetContext();
-    
+
     /* if using portal, ibus_conn == session_conn; don't release it here. */
     if (dbus && ibus_conn && !ibus_is_portal_interface) {
         dbus->connection_close(ibus_conn);
@@ -657,40 +643,36 @@ SDL_IBus_Quit(void)
     /* !!! FIXME: should we close(inotify_fd) here? */
 
     SDL_DelHintCallback(SDL_HINT_IME_INTERNAL_EDITING, IBus_SetCapabilities, NULL);
-    
+
     SDL_memset(&ibus_cursor_rect, 0, sizeof(ibus_cursor_rect));
 }
 
-static void
-IBus_SimpleMessage(const char *method)
-{   
+static void IBus_SimpleMessage(const char *method)
+{
     SDL_DBusContext *dbus = SDL_DBus_GetContext();
-    
+
     if ((input_ctx_path != NULL) && (IBus_CheckConnection(dbus))) {
         SDL_DBus_CallVoidMethodOnConnection(ibus_conn, ibus_service, input_ctx_path, ibus_input_interface, method, DBUS_TYPE_INVALID);
     }
 }
 
-void
-SDL_IBus_SetFocus(SDL_bool focused)
-{ 
+void SDL_IBus_SetFocus(SDL_bool focused)
+{
     const char *method = focused ? "FocusIn" : "FocusOut";
     IBus_SimpleMessage(method);
 }
 
-void
-SDL_IBus_Reset(void)
+void SDL_IBus_Reset(void)
 {
     IBus_SimpleMessage("Reset");
 }
 
 SDL_bool
 SDL_IBus_ProcessKeyEvent(Uint32 keysym, Uint32 keycode, Uint8 state)
-{ 
+{
     Uint32 result = 0;
     SDL_DBusContext *dbus = SDL_DBus_GetContext();
 
-
     if (IBus_CheckConnection(dbus)) {
         Uint32 mods = IBus_ModState();
         Uint32 ibus_keycode = keycode - 8;
@@ -698,19 +680,18 @@ SDL_IBus_ProcessKeyEvent(Uint32 keysym, Uint32 keycode, Uint8 state)
             mods |= (1 << 30); // IBUS_RELEASE_MASK
         }
         if (!SDL_DBus_CallMethodOnConnection(ibus_conn, ibus_service, input_ctx_path, ibus_input_interface, "ProcessKeyEvent",
-                DBUS_TYPE_UINT32, &keysym, DBUS_TYPE_UINT32, &ibus_keycode, DBUS_TYPE_UINT32, &mods, DBUS_TYPE_INVALID,
-                DBUS_TYPE_BOOLEAN, &result, DBUS_TYPE_INVALID)) {
+                                             DBUS_TYPE_UINT32, &keysym, DBUS_TYPE_UINT32, &ibus_keycode, DBUS_TYPE_UINT32, &mods, DBUS_TYPE_INVALID,
+                                             DBUS_TYPE_BOOLEAN, &result, DBUS_TYPE_INVALID)) {
             result = 0;
         }
     }
-    
+
     SDL_IBus_UpdateTextRect(NULL);
 
     return result ? SDL_TRUE : SDL_FALSE;
 }
 
-void
-SDL_IBus_UpdateTextRect(const SDL_Rect *rect)
+void SDL_IBus_UpdateTextRect(const SDL_Rect *rect)
 {
     SDL_Window *focused_win;
     SDL_SysWMinfo info;
@@ -743,23 +724,22 @@ SDL_IBus_UpdateTextRect(const SDL_Rect *rect)
 
     x += ibus_cursor_rect.x;
     y += ibus_cursor_rect.y;
-        
+
     dbus = SDL_DBus_GetContext();
-    
+
     if (IBus_CheckConnection(dbus)) {
         SDL_DBus_CallVoidMethodOnConnection(ibus_conn, ibus_service, input_ctx_path, ibus_input_interface, "SetCursorLocation",
-                DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_INT32, &ibus_cursor_rect.w, DBUS_TYPE_INT32, &ibus_cursor_rect.h, DBUS_TYPE_INVALID);
+                                            DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, DBUS_TYPE_INT32, &ibus_cursor_rect.w, DBUS_TYPE_INT32, &ibus_cursor_rect.h, DBUS_TYPE_INVALID);
     }
 }
 
-void
-SDL_IBus_PumpEvents(void)
+void SDL_IBus_PumpEvents(void)
 {
     SDL_DBusContext *dbus = SDL_DBus_GetContext();
-    
+
     if (IBus_CheckConnection(dbus)) {
         dbus->connection_read_write(ibus_conn, 0);
-    
+
         while (dbus->connection_dispatch(ibus_conn) == DBUS_DISPATCH_DATA_REMAINS) {
             /* Do nothing, actual work happens in IBus_MessageHandler */
         }

src/core/linux/SDL_ibus.h

@@ -42,11 +42,11 @@ extern void SDL_IBus_Reset(void);
    called some time after this, to receive the TextInput / TextEditing event back. */
 extern SDL_bool SDL_IBus_ProcessKeyEvent(Uint32 keysym, Uint32 keycode, Uint8 state);
 
-/* Update the position of IBus' candidate list. If rect is NULL then this will 
+/* Update the position of IBus' candidate list. If rect is NULL then this will
    just reposition it relative to the focused window's new position. */
 extern void SDL_IBus_UpdateTextRect(const SDL_Rect *window_relative_rect);
 
-/* Checks DBus for new IBus events, and calls SDL_SendKeyboardText / 
+/* Checks DBus for new IBus events, and calls SDL_SendKeyboardText /
    SDL_SendEditingText for each event it finds */
 extern void SDL_IBus_PumpEvents(void);
 

src/core/linux/SDL_ime.c

@@ -40,8 +40,7 @@ static _SDL_IME_ProcessKeyEvent SDL_IME_ProcessKeyEvent_Real = NULL;
 static _SDL_IME_UpdateTextRect SDL_IME_UpdateTextRect_Real = NULL;
 static _SDL_IME_PumpEvents SDL_IME_PumpEvents_Real = NULL;
 
-static void
-InitIME()
+static void InitIME()
 {
     static SDL_bool inited = SDL_FALSE;
 #ifdef HAVE_FCITX
@@ -107,24 +106,21 @@ SDL_IME_Init(void)
     return SDL_FALSE;
 }
 
-void
-SDL_IME_Quit(void)
+void SDL_IME_Quit(void)
 {
     if (SDL_IME_Quit_Real) {
         SDL_IME_Quit_Real();
     }
 }
 
-void
-SDL_IME_SetFocus(SDL_bool focused)
+void SDL_IME_SetFocus(SDL_bool focused)
 {
     if (SDL_IME_SetFocus_Real) {
         SDL_IME_SetFocus_Real(focused);
     }
 }
 
-void
-SDL_IME_Reset(void)
+void SDL_IME_Reset(void)
 {
     if (SDL_IME_Reset_Real) {
         SDL_IME_Reset_Real();
@@ -141,16 +137,14 @@ SDL_IME_ProcessKeyEvent(Uint32 keysym, Uint32 keycode, Uint8 state)
     return SDL_FALSE;
 }
 
-void
-SDL_IME_UpdateTextRect(const SDL_Rect *rect)
+void SDL_IME_UpdateTextRect(const SDL_Rect *rect)
 {
     if (SDL_IME_UpdateTextRect_Real) {
         SDL_IME_UpdateTextRect_Real(rect);
     }
 }
 
-void
-SDL_IME_PumpEvents()
+void SDL_IME_PumpEvents()
 {
     if (SDL_IME_PumpEvents_Real) {
         SDL_IME_PumpEvents_Real();

src/core/linux/SDL_ime.h

@@ -24,7 +24,6 @@
 
 #include "SDL_internal.h"
 
-
 extern SDL_bool SDL_IME_Init(void);
 extern void SDL_IME_Quit(void);
 extern void SDL_IME_SetFocus(SDL_bool focused);

src/core/linux/SDL_sandbox.c

@@ -33,9 +33,7 @@ SDL_Sandbox SDL_DetectSandbox(void)
 
     /* For Snap, we check multiple variables because they might be set for
      * unrelated reasons. This is the same thing WebKitGTK does. */
-    if (SDL_getenv("SNAP") != NULL
-        && SDL_getenv("SNAP_NAME") != NULL
-        && SDL_getenv("SNAP_REVISION") != NULL) {
+    if (SDL_getenv("SNAP") != NULL && SDL_getenv("SNAP_NAME") != NULL && SDL_getenv("SNAP_REVISION") != NULL) {
         return SDL_SANDBOX_SNAP;
     }
 

src/core/linux/SDL_threadprio.c

@@ -22,7 +22,6 @@
 
 #ifdef __LINUX__
 
-
 #if !SDL_THREADS_DISABLED
 #include <sys/time.h>
 #include <sys/resource.h>
@@ -44,16 +43,16 @@
 #include <sched.h>
 
 /* d-bus queries to org.freedesktop.RealtimeKit1. */
-#define RTKIT_DBUS_NODE "org.freedesktop.RealtimeKit1"
-#define RTKIT_DBUS_PATH "/org/freedesktop/RealtimeKit1"
+#define RTKIT_DBUS_NODE      "org.freedesktop.RealtimeKit1"
+#define RTKIT_DBUS_PATH      "/org/freedesktop/RealtimeKit1"
 #define RTKIT_DBUS_INTERFACE "org.freedesktop.RealtimeKit1"
 
 /* d-bus queries to the XDG portal interface to RealtimeKit1 */
-#define XDG_PORTAL_DBUS_NODE "org.freedesktop.portal.Desktop"
-#define XDG_PORTAL_DBUS_PATH "/org/freedesktop/portal/desktop"
+#define XDG_PORTAL_DBUS_NODE      "org.freedesktop.portal.Desktop"
+#define XDG_PORTAL_DBUS_PATH      "/org/freedesktop/portal/desktop"
 #define XDG_PORTAL_DBUS_INTERFACE "org.freedesktop.portal.Realtime"
 
-static SDL_bool    rtkit_use_session_conn;
+static SDL_bool rtkit_use_session_conn;
 static const char *rtkit_dbus_node;
 static const char *rtkit_dbus_path;
 static const char *rtkit_dbus_interface;
@@ -68,16 +67,14 @@ static Sint64 rtkit_max_rttime_usec = 200000;
  *  - The desktop portal exists and supports the realtime interface.
  *  - The realtime interface is new enough to have the required bug fixes applied.
  */
-static SDL_bool
-realtime_portal_supported(DBusConnection *conn)
+static SDL_bool realtime_portal_supported(DBusConnection *conn)
 {
     Sint64 res;
     return SDL_DBus_QueryPropertyOnConnection(conn, XDG_PORTAL_DBUS_NODE, XDG_PORTAL_DBUS_PATH, XDG_PORTAL_DBUS_INTERFACE,
                                               "RTTimeUSecMax", DBUS_TYPE_INT64, &res);
 }
 
-static void
-set_rtkit_interface()
+static void set_rtkit_interface()
 {
     SDL_DBusContext *dbus = SDL_DBus_GetContext();
 
@@ -95,8 +92,7 @@ set_rtkit_interface()
     }
 }
 
-static DBusConnection*
-get_rtkit_dbus_connection()
+static DBusConnection *get_rtkit_dbus_connection()
 {
     SDL_DBusContext *dbus = SDL_DBus_GetContext();
 
@@ -107,8 +103,7 @@ get_rtkit_dbus_connection()
     return NULL;
 }
 
-static void
-rtkit_initialize()
+static void rtkit_initialize()
 {
     DBusConnection *dbus_conn;
 
@@ -134,8 +129,7 @@ rtkit_initialize()
     }
 }
 
-static SDL_bool
-rtkit_initialize_realtime_thread()
+static SDL_bool rtkit_initialize_realtime_thread()
 {
     // Following is an excerpt from rtkit README that outlines the requirements
     // a thread must meet before making rtkit requests:
@@ -160,7 +154,7 @@ rtkit_initialize_realtime_thread()
     int err;
     struct rlimit rlimit;
     int nLimit = RLIMIT_RTTIME;
-    pid_t nPid = 0; //self
+    pid_t nPid = 0; // self
     int nSchedPolicy = sched_getscheduler(nPid) | SCHED_RESET_ON_FORK;
     struct sched_param schedParam;
 
@@ -194,8 +188,7 @@ rtkit_initialize_realtime_thread()
     return SDL_TRUE;
 }
 
-static SDL_bool
-rtkit_setpriority_nice(pid_t thread, int nice_level)
+static SDL_bool rtkit_setpriority_nice(pid_t thread, int nice_level)
 {
     DBusConnection *dbus_conn;
     Uint64 pid = (Uint64)getpid();
@@ -218,8 +211,7 @@ rtkit_setpriority_nice(pid_t thread, int nice_level)
     return SDL_TRUE;
 }
 
-static SDL_bool
-rtkit_setpriority_realtime(pid_t thread, int rt_priority)
+static SDL_bool rtkit_setpriority_realtime(pid_t thread, int rt_priority)
 {
     DBusConnection *dbus_conn;
     Uint64 pid = (Uint64)getpid();
@@ -257,8 +249,7 @@ rtkit_setpriority_realtime(pid_t thread, int rt_priority)
 #endif /* threads */
 
 /* this is a public symbol, so it has to exist even if threads are disabled. */
-int
-SDL_LinuxSetThreadPriority(Sint64 threadID, int priority)
+int SDL_LinuxSetThreadPriority(Sint64 threadID, int priority)
 {
 #if SDL_THREADS_DISABLED
     return SDL_Unsupported();
@@ -290,8 +281,7 @@ SDL_LinuxSetThreadPriority(Sint64 threadID, int priority)
 }
 
 /* this is a public symbol, so it has to exist even if threads are disabled. */
-int
-SDL_LinuxSetThreadPriorityAndPolicy(Sint64 threadID, int sdlPriority, int schedPolicy)
+int SDL_LinuxSetThreadPriorityAndPolicy(Sint64 threadID, int sdlPriority, int schedPolicy)
 {
 #if SDL_THREADS_DISABLED
     return SDL_Unsupported();
@@ -352,6 +342,6 @@ SDL_LinuxSetThreadPriorityAndPolicy(Sint64 threadID, int sdlPriority, int schedP
 #endif
 }
 
-#endif  /* __LINUX__ */
+#endif /* __LINUX__ */
 
 /* vi: set ts=4 sw=4 expandtab: */

src/core/linux/SDL_udev.c

@@ -45,8 +45,7 @@ static int SDL_UDEV_load_syms(void);
 static SDL_bool SDL_UDEV_hotplug_update_available(void);
 static void device_event(SDL_UDEV_deviceevent type, struct udev_device *dev);
 
-static SDL_bool
-SDL_UDEV_load_sym(const char *fn, void **addr)
+static SDL_bool SDL_UDEV_load_sym(const char *fn, void **addr)
 {
     *addr = SDL_LoadFunction(_this->udev_handle, fn);
     if (*addr == NULL) {
@@ -57,12 +56,12 @@ SDL_UDEV_load_sym(const char *fn, void **addr)
     return SDL_TRUE;
 }
 
-static int
-SDL_UDEV_load_syms(void)
+static int SDL_UDEV_load_syms(void)
 {
-    /* cast funcs to char* first, to please GCC's strict aliasing rules. */
-    #define SDL_UDEV_SYM(x) \
-        if (!SDL_UDEV_load_sym(#x, (void **) (char *) & _this->syms.x)) return -1
+/* cast funcs to char* first, to please GCC's strict aliasing rules. */
+#define SDL_UDEV_SYM(x)                                          \
+    if (!SDL_UDEV_load_sym(#x, (void **)(char *)&_this->syms.x)) \
+    return -1
 
     SDL_UDEV_SYM(udev_device_get_action);
     SDL_UDEV_SYM(udev_device_get_devnode);
@@ -90,13 +89,12 @@ SDL_UDEV_load_syms(void)
     SDL_UDEV_SYM(udev_unref);
     SDL_UDEV_SYM(udev_device_new_from_devnum);
     SDL_UDEV_SYM(udev_device_get_devnum);
-    #undef SDL_UDEV_SYM
+#undef SDL_UDEV_SYM
 
     return 0;
 }
 
-static SDL_bool
-SDL_UDEV_hotplug_update_available(void)
+static SDL_bool SDL_UDEV_hotplug_update_available(void)
 {
     if (_this->udev_mon != NULL) {
         const int fd = _this->syms.udev_monitor_get_fd(_this->udev_mon);
@@ -107,14 +105,12 @@ SDL_UDEV_hotplug_update_available(void)
     return SDL_FALSE;
 }
 
-
-int
-SDL_UDEV_Init(void)
+int SDL_UDEV_Init(void)
 {
     int retval = 0;
 
     if (_this == NULL) {
-        _this = (SDL_UDEV_PrivateData *) SDL_calloc(1, sizeof(*_this));
+        _this = (SDL_UDEV_PrivateData *)SDL_calloc(1, sizeof(*_this));
         if (_this == NULL) {
             return SDL_OutOfMemory();
         }
@@ -147,7 +143,6 @@ SDL_UDEV_Init(void)
 
         /* Do an initial scan of existing devices */
         SDL_UDEV_Scan();
-
     }
 
     _this->ref_count += 1;
@@ -155,8 +150,7 @@ SDL_UDEV_Init(void)
     return retval;
 }
 
-void
-SDL_UDEV_Quit(void)
+void SDL_UDEV_Quit(void)
 {
     SDL_UDEV_CallbackList *item;
 
@@ -190,8 +184,7 @@ SDL_UDEV_Quit(void)
     }
 }
 
-void
-SDL_UDEV_Scan(void)
+void SDL_UDEV_Scan(void)
 {
     struct udev_enumerate *enumerate = NULL;
     struct udev_list_entry *devs = NULL;
@@ -279,11 +272,7 @@ SDL_UDEV_GetProductInfo(const char *device_path, Uint16 *vendor, Uint16 *product
     return found;
 }
 
-
-
-
-void
-SDL_UDEV_UnloadLibrary(void)
+void SDL_UDEV_UnloadLibrary(void)
 {
     if (_this == NULL) {
         return;
@@ -295,8 +284,7 @@ SDL_UDEV_UnloadLibrary(void)
     }
 }
 
-int
-SDL_UDEV_LoadLibrary(void)
+int SDL_UDEV_LoadLibrary(void)
 {
     int retval = 0, i;
 
@@ -323,7 +311,7 @@ SDL_UDEV_LoadLibrary(void)
 #endif
 
     if (_this->udev_handle == NULL) {
-        for ( i = 0 ; i < SDL_arraysize(SDL_UDEV_LIBS); i++) {
+        for (i = 0; i < SDL_arraysize(SDL_UDEV_LIBS); i++) {
             _this->udev_handle = SDL_LoadObject(SDL_UDEV_LIBS[i]);
             if (_this->udev_handle != NULL) {
                 retval = SDL_UDEV_load_syms();
@@ -352,7 +340,7 @@ static void get_caps(struct udev_device *dev, struct udev_device *pdev, const ch
     int i;
     unsigned long v;
 
-    SDL_memset(bitmask, 0, bitmask_len*sizeof(*bitmask));
+    SDL_memset(bitmask, 0, bitmask_len * sizeof(*bitmask));
     value = _this->syms.udev_device_get_sysattr_value(pdev, attr);
     if (value == NULL) {
         return;
@@ -361,7 +349,7 @@ static void get_caps(struct udev_device *dev, struct udev_device *pdev, const ch
     SDL_strlcpy(text, value, sizeof(text));
     i = 0;
     while ((word = SDL_strrchr(text, ' ')) != NULL) {
-        v = SDL_strtoul(word+1, NULL, 16);
+        v = SDL_strtoul(word + 1, NULL, 16);
         if (i < bitmask_len) {
             bitmask[i] = v;
         }
@@ -374,8 +362,7 @@ static void get_caps(struct udev_device *dev, struct udev_device *pdev, const ch
     }
 }
 
-static int
-guess_device_class(struct udev_device *dev)
+static int guess_device_class(struct udev_device *dev)
 {
     struct udev_device *pdev;
     unsigned long bitmask_ev[NBITS(EV_MAX)];
@@ -404,8 +391,7 @@ guess_device_class(struct udev_device *dev)
                                       &bitmask_rel[0]);
 }
 
-static void
-device_event(SDL_UDEV_deviceevent type, struct udev_device *dev)
+static void device_event(SDL_UDEV_deviceevent type, struct udev_device *dev)
 {
     const char *subsystem;
     const char *val = NULL;
@@ -425,23 +411,23 @@ device_event(SDL_UDEV_deviceevent type, struct udev_device *dev)
         /* udev rules reference: http://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-input_id.c */
 
         val = _this->syms.udev_device_get_property_value(dev, "ID_INPUT_JOYSTICK");
-        if (val != NULL && SDL_strcmp(val, "1") == 0 ) {
+        if (val != NULL && SDL_strcmp(val, "1") == 0) {
             devclass |= SDL_UDEV_DEVICE_JOYSTICK;
         }
 
         val = _this->syms.udev_device_get_property_value(dev, "ID_INPUT_ACCELEROMETER");
         if (SDL_GetHintBoolean(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, SDL_TRUE) &&
-            val != NULL && SDL_strcmp(val, "1") == 0 ) {
+            val != NULL && SDL_strcmp(val, "1") == 0) {
             devclass |= SDL_UDEV_DEVICE_JOYSTICK;
         }
 
         val = _this->syms.udev_device_get_property_value(dev, "ID_INPUT_MOUSE");
-        if (val != NULL && SDL_strcmp(val, "1") == 0 ) {
+        if (val != NULL && SDL_strcmp(val, "1") == 0) {
             devclass |= SDL_UDEV_DEVICE_MOUSE;
         }
 
         val = _this->syms.udev_device_get_property_value(dev, "ID_INPUT_TOUCHSCREEN");
-        if (val != NULL && SDL_strcmp(val, "1") == 0 ) {
+        if (val != NULL && SDL_strcmp(val, "1") == 0) {
             devclass |= SDL_UDEV_DEVICE_TOUCHSCREEN;
         }
 
@@ -452,7 +438,7 @@ device_event(SDL_UDEV_deviceevent type, struct udev_device *dev)
            Ref: http://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-input_id.c#n183
         */
         val = _this->syms.udev_device_get_property_value(dev, "ID_INPUT_KEY");
-        if (val != NULL && SDL_strcmp(val, "1") == 0 ) {
+        if (val != NULL && SDL_strcmp(val, "1") == 0) {
             devclass |= SDL_UDEV_DEVICE_KEYBOARD;
         }
 
@@ -484,8 +470,7 @@ device_event(SDL_UDEV_deviceevent type, struct udev_device *dev)
     }
 }
 
-void
-SDL_UDEV_Poll(void)
+void SDL_UDEV_Poll(void)
 {
     struct udev_device *dev = NULL;
     const char *action = NULL;
@@ -513,11 +498,10 @@ SDL_UDEV_Poll(void)
     }
 }
 
-int
-SDL_UDEV_AddCallback(SDL_UDEV_Callback cb)
+int SDL_UDEV_AddCallback(SDL_UDEV_Callback cb)
 {
     SDL_UDEV_CallbackList *item;
-    item = (SDL_UDEV_CallbackList *) SDL_calloc(1, sizeof (SDL_UDEV_CallbackList));
+    item = (SDL_UDEV_CallbackList *)SDL_calloc(1, sizeof(SDL_UDEV_CallbackList));
     if (item == NULL) {
         return SDL_OutOfMemory();
     }
@@ -534,8 +518,7 @@ SDL_UDEV_AddCallback(SDL_UDEV_Callback cb)
     return 1;
 }
 
-void
-SDL_UDEV_DelCallback(SDL_UDEV_Callback cb)
+void SDL_UDEV_DelCallback(SDL_UDEV_Callback cb)
 {
     SDL_UDEV_CallbackList *item;
     SDL_UDEV_CallbackList *prev = NULL;
@@ -574,8 +557,7 @@ SDL_UDEV_GetUdevSyms(void)
     return &_this->syms;
 }
 
-void
-SDL_UDEV_ReleaseUdevSyms(void)
+void SDL_UDEV_ReleaseUdevSyms(void)
 {
     SDL_UDEV_Quit();
 }

src/core/linux/SDL_udev.h

@@ -46,12 +46,14 @@ typedef enum
 
 typedef void (*SDL_UDEV_Callback)(SDL_UDEV_deviceevent udev_type, int udev_class, const char *devpath);
 
-typedef struct SDL_UDEV_CallbackList {
+typedef struct SDL_UDEV_CallbackList
+{
     SDL_UDEV_Callback callback;
     struct SDL_UDEV_CallbackList *next;
 } SDL_UDEV_CallbackList;
 
-typedef struct SDL_UDEV_Symbols {
+typedef struct SDL_UDEV_Symbols
+{
     const char *(*udev_device_get_action)(struct udev_device *);
     const char *(*udev_device_get_devnode)(struct udev_device *);
     const char *(*udev_device_get_subsystem)(struct udev_device *);
@@ -76,8 +78,8 @@ typedef struct SDL_UDEV_Symbols {
     void (*udev_monitor_unref)(struct udev_monitor *);
     struct udev *(*udev_new)(void);
     void (*udev_unref)(struct udev *);
-    struct udev_device * (*udev_device_new_from_devnum)(struct udev *udev, char type, dev_t devnum);
-    dev_t (*udev_device_get_devnum) (struct udev_device *udev_device);
+    struct udev_device *(*udev_device_new_from_devnum)(struct udev *udev, char type, dev_t devnum);
+    dev_t (*udev_device_get_devnum)(struct udev_device *udev_device);
 } SDL_UDEV_Symbols;
 
 typedef struct SDL_UDEV_PrivateData
@@ -88,7 +90,7 @@ typedef struct SDL_UDEV_PrivateData
     struct udev_monitor *udev_mon;
     int ref_count;
     SDL_UDEV_CallbackList *first, *last;
-    
+
     /* Function pointers */
     SDL_UDEV_Symbols syms;
 } SDL_UDEV_PrivateData;
@@ -105,7 +107,6 @@ extern void SDL_UDEV_DelCallback(SDL_UDEV_Callback cb);
 extern const SDL_UDEV_Symbols *SDL_UDEV_GetUdevSyms(void);
 extern void SDL_UDEV_ReleaseUdevSyms(void);
 
-
 #endif /* HAVE_LIBUDEV_H && HAVE_LINUX_INPUT_H */
 
 #endif /* SDL_udev_h_ */

src/core/openbsd/SDL_wscons.h

@@ -19,9 +19,7 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-
 void SDL_WSCONS_Init();
 void SDL_WSCONS_Quit();
 
 void SDL_WSCONS_PumpEvents();
-

src/core/openbsd/SDL_wscons_kbd.c

@@ -35,195 +35,201 @@
 #include "../../events/SDL_events_c.h"
 
 #ifdef __NetBSD__
-#define KS_GROUP_Ascii KS_GROUP_Plain
+#define KS_GROUP_Ascii    KS_GROUP_Plain
 #define KS_Cmd_ScrollBack KS_Cmd_ScrollFastUp
-#define KS_Cmd_ScrollFwd KS_Cmd_ScrollFastDown
+#define KS_Cmd_ScrollFwd  KS_Cmd_ScrollFastDown
 #endif
 
-#define RETIFIOCTLERR(x) if (x == -1) { free(input); input = NULL; return NULL;}
+#define RETIFIOCTLERR(x) \
+    if (x == -1) {       \
+        free(input);     \
+        input = NULL;    \
+        return NULL;     \
+    }
 
 typedef struct SDL_WSCONS_mouse_input_data SDL_WSCONS_mouse_input_data;
-extern SDL_WSCONS_mouse_input_data* SDL_WSCONS_Init_Mouse();
-extern void updateMouse(SDL_WSCONS_mouse_input_data* input);
-extern void SDL_WSCONS_Quit_Mouse(SDL_WSCONS_mouse_input_data* input);
+extern SDL_WSCONS_mouse_input_data *SDL_WSCONS_Init_Mouse();
+extern void updateMouse(SDL_WSCONS_mouse_input_data *input);
+extern void SDL_WSCONS_Quit_Mouse(SDL_WSCONS_mouse_input_data *input);
 
 /* Conversion table courtesy of /usr/src/sys/dev/wscons/wskbdutil.c */
 static const unsigned char latin1_to_upper[256] = {
     /*      0  8  1  9  2  a  3  b  4  c  5  d  6  e  7  f               */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 0 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 0 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 1 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 1 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 2 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 2 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 3 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 3 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 4 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 4 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 5 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 5 */
-    0x00,  'A',  'B',  'C',  'D',  'E',  'F',  'G',     /* 6 */
-    'H',  'I',  'J',  'K',  'L',  'M',  'N',  'O',     /* 6 */
-    'P',  'Q',  'R',  'S',  'T',  'U',  'V',  'W',     /* 7 */
-    'X',  'Y',  'Z', 0x00, 0x00, 0x00, 0x00, 0x00,     /* 7 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 8 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 8 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 9 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* 9 */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* a */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* a */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* b */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* b */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* c */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* c */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* d */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,     /* d */
-    0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,     /* e */
-    0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,     /* e */
-    0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0x00,     /* f */
-    0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0x00,     /* f */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 1 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 1 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 2 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 2 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 3 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 3 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 4 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 4 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 5 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 5 */
+    0x00, 'A', 'B', 'C', 'D', 'E', 'F', 'G',        /* 6 */
+    'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',         /* 6 */
+    'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',         /* 7 */
+    'X', 'Y', 'Z', 0x00, 0x00, 0x00, 0x00, 0x00,    /* 7 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 8 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 8 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 9 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 9 */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* a */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* a */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* b */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* b */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* c */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* c */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* d */
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* d */
+    0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, /* e */
+    0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, /* e */
+    0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0x00, /* f */
+    0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0x00, /* f */
 };
 
 /* Compose table courtesy of /usr/src/sys/dev/wscons/wskbdutil.c */
-static struct SDL_wscons_compose_tab_s {
+static struct SDL_wscons_compose_tab_s
+{
     keysym_t elem[2];
     keysym_t result;
 } compose_tab[] = {
-    { { KS_plus,			KS_plus },		KS_numbersign },
-    { { KS_a,			KS_a },			KS_at },
-    { { KS_parenleft,		KS_parenleft },		KS_bracketleft },
-    { { KS_slash,			KS_slash },		KS_backslash },
-    { { KS_parenright,		KS_parenright },	KS_bracketright },
-    { { KS_parenleft,		KS_minus },		KS_braceleft },
-    { { KS_slash,			KS_minus },		KS_bar },
-    { { KS_parenright,		KS_minus },		KS_braceright },
-    { { KS_exclam,			KS_exclam },		KS_exclamdown },
-    { { KS_c,			KS_slash },		KS_cent },
-    { { KS_l,			KS_minus },		KS_sterling },
-    { { KS_y,			KS_minus },		KS_yen },
-    { { KS_s,			KS_o },			KS_section },
-    { { KS_x,			KS_o },			KS_currency },
-    { { KS_c,			KS_o },			KS_copyright },
-    { { KS_less,			KS_less },		KS_guillemotleft },
-    { { KS_greater,			KS_greater },		KS_guillemotright },
-    { { KS_question,		KS_question },		KS_questiondown },
-    { { KS_dead_acute,		KS_space },		KS_apostrophe },
-    { { KS_dead_grave,		KS_space },		KS_grave },
-    { { KS_dead_tilde,		KS_space },		KS_asciitilde },
-    { { KS_dead_circumflex,		KS_space },		KS_asciicircum },
-    { { KS_dead_diaeresis,		KS_space },		KS_quotedbl },
-    { { KS_dead_cedilla,		KS_space },		KS_comma },
-    { { KS_dead_circumflex,		KS_A },			KS_Acircumflex },
-    { { KS_dead_diaeresis,		KS_A },			KS_Adiaeresis },
-    { { KS_dead_grave,		KS_A },			KS_Agrave },
-    { { KS_dead_abovering,		KS_A },			KS_Aring },
-    { { KS_dead_tilde,		KS_A },			KS_Atilde },
-    { { KS_dead_cedilla,		KS_C },			KS_Ccedilla },
-    { { KS_dead_acute,		KS_E },			KS_Eacute },
-    { { KS_dead_circumflex,		KS_E },			KS_Ecircumflex },
-    { { KS_dead_diaeresis,		KS_E },			KS_Ediaeresis },
-    { { KS_dead_grave,		KS_E },			KS_Egrave },
-    { { KS_dead_acute,		KS_I },			KS_Iacute },
-    { { KS_dead_circumflex,		KS_I },			KS_Icircumflex },
-    { { KS_dead_diaeresis,		KS_I },			KS_Idiaeresis },
-    { { KS_dead_grave,		KS_I },			KS_Igrave },
-    { { KS_dead_tilde,		KS_N },			KS_Ntilde },
-    { { KS_dead_acute,		KS_O },			KS_Oacute },
-    { { KS_dead_circumflex,		KS_O },			KS_Ocircumflex },
-    { { KS_dead_diaeresis,		KS_O },			KS_Odiaeresis },
-    { { KS_dead_grave,		KS_O },			KS_Ograve },
-    { { KS_dead_tilde,		KS_O },			KS_Otilde },
-    { { KS_dead_acute,		KS_U },			KS_Uacute },
-    { { KS_dead_circumflex,		KS_U },			KS_Ucircumflex },
-    { { KS_dead_diaeresis,		KS_U },			KS_Udiaeresis },
-    { { KS_dead_grave,		KS_U },			KS_Ugrave },
-    { { KS_dead_acute,		KS_Y },			KS_Yacute },
-    { { KS_dead_acute,		KS_a },			KS_aacute },
-    { { KS_dead_circumflex,		KS_a },			KS_acircumflex },
-    { { KS_dead_diaeresis,		KS_a },			KS_adiaeresis },
-    { { KS_dead_grave,		KS_a },			KS_agrave },
-    { { KS_dead_abovering,		KS_a },			KS_aring },
-    { { KS_dead_tilde,		KS_a },			KS_atilde },
-    { { KS_dead_cedilla,		KS_c },			KS_ccedilla },
-    { { KS_dead_acute,		KS_e },			KS_eacute },
-    { { KS_dead_circumflex,		KS_e },			KS_ecircumflex },
-    { { KS_dead_diaeresis,		KS_e },			KS_ediaeresis },
-    { { KS_dead_grave,		KS_e },			KS_egrave },
-    { { KS_dead_acute,		KS_i },			KS_iacute },
-    { { KS_dead_circumflex,		KS_i },			KS_icircumflex },
-    { { KS_dead_diaeresis,		KS_i },			KS_idiaeresis },
-    { { KS_dead_grave,		KS_i },			KS_igrave },
-    { { KS_dead_tilde,		KS_n },			KS_ntilde },
-    { { KS_dead_acute,		KS_o },			KS_oacute },
-    { { KS_dead_circumflex,		KS_o },			KS_ocircumflex },
-    { { KS_dead_diaeresis,		KS_o },			KS_odiaeresis },
-    { { KS_dead_grave,		KS_o },			KS_ograve },
-    { { KS_dead_tilde,		KS_o },			KS_otilde },
-    { { KS_dead_acute,		KS_u },			KS_uacute },
-    { { KS_dead_circumflex,		KS_u },			KS_ucircumflex },
-    { { KS_dead_diaeresis,		KS_u },			KS_udiaeresis },
-    { { KS_dead_grave,		KS_u },			KS_ugrave },
-    { { KS_dead_acute,		KS_y },			KS_yacute },
-    { { KS_dead_diaeresis,		KS_y },			KS_ydiaeresis },
-    { { KS_quotedbl,		KS_A },			KS_Adiaeresis },
-    { { KS_quotedbl,		KS_E },			KS_Ediaeresis },
-    { { KS_quotedbl,		KS_I },			KS_Idiaeresis },
-    { { KS_quotedbl,		KS_O },			KS_Odiaeresis },
-    { { KS_quotedbl,		KS_U },			KS_Udiaeresis },
-    { { KS_quotedbl,		KS_a },			KS_adiaeresis },
-    { { KS_quotedbl,		KS_e },			KS_ediaeresis },
-    { { KS_quotedbl,		KS_i },			KS_idiaeresis },
-    { { KS_quotedbl,		KS_o },			KS_odiaeresis },
-    { { KS_quotedbl,		KS_u },			KS_udiaeresis },
-    { { KS_quotedbl,		KS_y },			KS_ydiaeresis },
-    { { KS_acute,			KS_A },			KS_Aacute },
-    { { KS_asciicircum,		KS_A },			KS_Acircumflex },
-    { { KS_grave,			KS_A },			KS_Agrave },
-    { { KS_asterisk,		KS_A },			KS_Aring },
-    { { KS_asciitilde,		KS_A },			KS_Atilde },
-    { { KS_cedilla,			KS_C },			KS_Ccedilla },
-    { { KS_acute,			KS_E },			KS_Eacute },
-    { { KS_asciicircum,		KS_E },			KS_Ecircumflex },
-    { { KS_grave,			KS_E },			KS_Egrave },
-    { { KS_acute,			KS_I },			KS_Iacute },
-    { { KS_asciicircum,		KS_I },			KS_Icircumflex },
-    { { KS_grave,			KS_I },			KS_Igrave },
-    { { KS_asciitilde,		KS_N },			KS_Ntilde },
-    { { KS_acute,			KS_O },			KS_Oacute },
-    { { KS_asciicircum,		KS_O },			KS_Ocircumflex },
-    { { KS_grave,			KS_O },			KS_Ograve },
-    { { KS_asciitilde,		KS_O },			KS_Otilde },
-    { { KS_acute,			KS_U },			KS_Uacute },
-    { { KS_asciicircum,		KS_U },			KS_Ucircumflex },
-    { { KS_grave,			KS_U },			KS_Ugrave },
-    { { KS_acute,			KS_Y },			KS_Yacute },
-    { { KS_acute,			KS_a },			KS_aacute },
-    { { KS_asciicircum,		KS_a },			KS_acircumflex },
-    { { KS_grave,			KS_a },			KS_agrave },
-    { { KS_asterisk,		KS_a },			KS_aring },
-    { { KS_asciitilde,		KS_a },			KS_atilde },
-    { { KS_cedilla,			KS_c },			KS_ccedilla },
-    { { KS_acute,			KS_e },			KS_eacute },
-    { { KS_asciicircum,		KS_e },			KS_ecircumflex },
-    { { KS_grave,			KS_e },			KS_egrave },
-    { { KS_acute,			KS_i },			KS_iacute },
-    { { KS_asciicircum,		KS_i },			KS_icircumflex },
-    { { KS_grave,			KS_i },			KS_igrave },
-    { { KS_asciitilde,		KS_n },			KS_ntilde },
-    { { KS_acute,			KS_o },			KS_oacute },
-    { { KS_asciicircum,		KS_o },			KS_ocircumflex },
-    { { KS_grave,			KS_o },			KS_ograve },
-    { { KS_asciitilde,		KS_o },			KS_otilde },
-    { { KS_acute,			KS_u },			KS_uacute },
-    { { KS_asciicircum,		KS_u },			KS_ucircumflex },
-    { { KS_grave,			KS_u },			KS_ugrave },
-    { { KS_acute,			KS_y },			KS_yacute },
+    { { KS_plus, KS_plus }, KS_numbersign },
+    { { KS_a, KS_a }, KS_at },
+    { { KS_parenleft, KS_parenleft }, KS_bracketleft },
+    { { KS_slash, KS_slash }, KS_backslash },
+    { { KS_parenright, KS_parenright }, KS_bracketright },
+    { { KS_parenleft, KS_minus }, KS_braceleft },
+    { { KS_slash, KS_minus }, KS_bar },
+    { { KS_parenright, KS_minus }, KS_braceright },
+    { { KS_exclam, KS_exclam }, KS_exclamdown },
+    { { KS_c, KS_slash }, KS_cent },
+    { { KS_l, KS_minus }, KS_sterling },
+    { { KS_y, KS_minus }, KS_yen },
+    { { KS_s, KS_o }, KS_section },
+    { { KS_x, KS_o }, KS_currency },
+    { { KS_c, KS_o }, KS_copyright },
+    { { KS_less, KS_less }, KS_guillemotleft },
+    { { KS_greater, KS_greater }, KS_guillemotright },
+    { { KS_question, KS_question }, KS_questiondown },
+    { { KS_dead_acute, KS_space }, KS_apostrophe },
+    { { KS_dead_grave, KS_space }, KS_grave },
+    { { KS_dead_tilde, KS_space }, KS_asciitilde },
+    { { KS_dead_circumflex, KS_space }, KS_asciicircum },
+    { { KS_dead_diaeresis, KS_space }, KS_quotedbl },
+    { { KS_dead_cedilla, KS_space }, KS_comma },
+    { { KS_dead_circumflex, KS_A }, KS_Acircumflex },
+    { { KS_dead_diaeresis, KS_A }, KS_Adiaeresis },
+    { { KS_dead_grave, KS_A }, KS_Agrave },
+    { { KS_dead_abovering, KS_A }, KS_Aring },
+    { { KS_dead_tilde, KS_A }, KS_Atilde },
+    { { KS_dead_cedilla, KS_C }, KS_Ccedilla },
+    { { KS_dead_acute, KS_E }, KS_Eacute },
+    { { KS_dead_circumflex, KS_E }, KS_Ecircumflex },
+    { { KS_dead_diaeresis, KS_E }, KS_Ediaeresis },
+    { { KS_dead_grave, KS_E }, KS_Egrave },
+    { { KS_dead_acute, KS_I }, KS_Iacute },
+    { { KS_dead_circumflex, KS_I }, KS_Icircumflex },
+    { { KS_dead_diaeresis, KS_I }, KS_Idiaeresis },
+    { { KS_dead_grave, KS_I }, KS_Igrave },
+    { { KS_dead_tilde, KS_N }, KS_Ntilde },
+    { { KS_dead_acute, KS_O }, KS_Oacute },
+    { { KS_dead_circumflex, KS_O }, KS_Ocircumflex },
+    { { KS_dead_diaeresis, KS_O }, KS_Odiaeresis },
+    { { KS_dead_grave, KS_O }, KS_Ograve },
+    { { KS_dead_tilde, KS_O }, KS_Otilde },
+    { { KS_dead_acute, KS_U }, KS_Uacute },
+    { { KS_dead_circumflex, KS_U }, KS_Ucircumflex },
+    { { KS_dead_diaeresis, KS_U }, KS_Udiaeresis },
+    { { KS_dead_grave, KS_U }, KS_Ugrave },
+    { { KS_dead_acute, KS_Y }, KS_Yacute },
+    { { KS_dead_acute, KS_a }, KS_aacute },
+    { { KS_dead_circumflex, KS_a }, KS_acircumflex },
+    { { KS_dead_diaeresis, KS_a }, KS_adiaeresis },
+    { { KS_dead_grave, KS_a }, KS_agrave },
+    { { KS_dead_abovering, KS_a }, KS_aring },
+    { { KS_dead_tilde, KS_a }, KS_atilde },
+    { { KS_dead_cedilla, KS_c }, KS_ccedilla },
+    { { KS_dead_acute, KS_e }, KS_eacute },
+    { { KS_dead_circumflex, KS_e }, KS_ecircumflex },
+    { { KS_dead_diaeresis, KS_e }, KS_ediaeresis },
+    { { KS_dead_grave, KS_e }, KS_egrave },
+    { { KS_dead_acute, KS_i }, KS_iacute },
+    { { KS_dead_circumflex, KS_i }, KS_icircumflex },
+    { { KS_dead_diaeresis, KS_i }, KS_idiaeresis },
+    { { KS_dead_grave, KS_i }, KS_igrave },
+    { { KS_dead_tilde, KS_n }, KS_ntilde },
+    { { KS_dead_acute, KS_o }, KS_oacute },
+    { { KS_dead_circumflex, KS_o }, KS_ocircumflex },
+    { { KS_dead_diaeresis, KS_o }, KS_odiaeresis },
+    { { KS_dead_grave, KS_o }, KS_ograve },
+    { { KS_dead_tilde, KS_o }, KS_otilde },
+    { { KS_dead_acute, KS_u }, KS_uacute },
+    { { KS_dead_circumflex, KS_u }, KS_ucircumflex },
+    { { KS_dead_diaeresis, KS_u }, KS_udiaeresis },
+    { { KS_dead_grave, KS_u }, KS_ugrave },
+    { { KS_dead_acute, KS_y }, KS_yacute },
+    { { KS_dead_diaeresis, KS_y }, KS_ydiaeresis },
+    { { KS_quotedbl, KS_A }, KS_Adiaeresis },
+    { { KS_quotedbl, KS_E }, KS_Ediaeresis },
+    { { KS_quotedbl, KS_I }, KS_Idiaeresis },
+    { { KS_quotedbl, KS_O }, KS_Odiaeresis },
+    { { KS_quotedbl, KS_U }, KS_Udiaeresis },
+    { { KS_quotedbl, KS_a }, KS_adiaeresis },
+    { { KS_quotedbl, KS_e }, KS_ediaeresis },
+    { { KS_quotedbl, KS_i }, KS_idiaeresis },
+    { { KS_quotedbl, KS_o }, KS_odiaeresis },
+    { { KS_quotedbl, KS_u }, KS_udiaeresis },
+    { { KS_quotedbl, KS_y }, KS_ydiaeresis },
+    { { KS_acute, KS_A }, KS_Aacute },
+    { { KS_asciicircum, KS_A }, KS_Acircumflex },
+    { { KS_grave, KS_A }, KS_Agrave },
+    { { KS_asterisk, KS_A }, KS_Aring },
+    { { KS_asciitilde, KS_A }, KS_Atilde },
+    { { KS_cedilla, KS_C }, KS_Ccedilla },
+    { { KS_acute, KS_E }, KS_Eacute },
+    { { KS_asciicircum, KS_E }, KS_Ecircumflex },
+    { { KS_grave, KS_E }, KS_Egrave },
+    { { KS_acute, KS_I }, KS_Iacute },
+    { { KS_asciicircum, KS_I }, KS_Icircumflex },
+    { { KS_grave, KS_I }, KS_Igrave },
+    { { KS_asciitilde, KS_N }, KS_Ntilde },
+    { { KS_acute, KS_O }, KS_Oacute },
+    { { KS_asciicircum, KS_O }, KS_Ocircumflex },
+    { { KS_grave, KS_O }, KS_Ograve },
+    { { KS_asciitilde, KS_O }, KS_Otilde },
+    { { KS_acute, KS_U }, KS_Uacute },
+    { { KS_asciicircum, KS_U }, KS_Ucircumflex },
+    { { KS_grave, KS_U }, KS_Ugrave },
+    { { KS_acute, KS_Y }, KS_Yacute },
+    { { KS_acute, KS_a }, KS_aacute },
+    { { KS_asciicircum, KS_a }, KS_acircumflex },
+    { { KS_grave, KS_a }, KS_agrave },
+    { { KS_asterisk, KS_a }, KS_aring },
+    { { KS_asciitilde, KS_a }, KS_atilde },
+    { { KS_cedilla, KS_c }, KS_ccedilla },
+    { { KS_acute, KS_e }, KS_eacute },
+    { { KS_asciicircum, KS_e }, KS_ecircumflex },
+    { { KS_grave, KS_e }, KS_egrave },
+    { { KS_acute, KS_i }, KS_iacute },
+    { { KS_asciicircum, KS_i }, KS_icircumflex },
+    { { KS_grave, KS_i }, KS_igrave },
+    { { KS_asciitilde, KS_n }, KS_ntilde },
+    { { KS_acute, KS_o }, KS_oacute },
+    { { KS_asciicircum, KS_o }, KS_ocircumflex },
+    { { KS_grave, KS_o }, KS_ograve },
+    { { KS_asciitilde, KS_o }, KS_otilde },
+    { { KS_acute, KS_u }, KS_uacute },
+    { { KS_asciicircum, KS_u }, KS_ucircumflex },
+    { { KS_grave, KS_u }, KS_ugrave },
+    { { KS_acute, KS_y }, KS_yacute },
 #ifndef __NetBSD__
-    { { KS_dead_caron,		KS_space },		KS_L2_caron },
-    { { KS_dead_caron,		KS_S },			KS_L2_Scaron },
-    { { KS_dead_caron,		KS_Z },			KS_L2_Zcaron },
-    { { KS_dead_caron,		KS_s },			KS_L2_scaron },
-    { { KS_dead_caron,		KS_z },			KS_L2_zcaron }
+    { { KS_dead_caron, KS_space }, KS_L2_caron },
+    { { KS_dead_caron, KS_S }, KS_L2_Scaron },
+    { { KS_dead_caron, KS_Z }, KS_L2_Zcaron },
+    { { KS_dead_caron, KS_s }, KS_L2_scaron },
+    { { KS_dead_caron, KS_z }, KS_L2_zcaron }
 #endif
 };
 
@@ -239,146 +245,148 @@ static keysym_t ksym_upcase(keysym_t ksym)
 
     return ksym;
 }
-static struct wscons_keycode_to_SDL {
+static struct wscons_keycode_to_SDL
+{
     keysym_t sourcekey;
     SDL_Scancode targetKey;
 } conversion_table[] = {
-    {KS_Menu, SDL_SCANCODE_APPLICATION},
-    {KS_Up, SDL_SCANCODE_UP},
-    {KS_Down, SDL_SCANCODE_DOWN},
-    {KS_Left, SDL_SCANCODE_LEFT},
-    {KS_Right, SDL_SCANCODE_RIGHT},
-    {KS_Hold_Screen, SDL_SCANCODE_SCROLLLOCK},
-    {KS_Num_Lock, SDL_SCANCODE_NUMLOCKCLEAR},
-    {KS_Caps_Lock, SDL_SCANCODE_CAPSLOCK},
-    {KS_BackSpace, SDL_SCANCODE_BACKSPACE},
-    {KS_space, SDL_SCANCODE_SPACE},
-    {KS_Delete, SDL_SCANCODE_BACKSPACE},
-    {KS_Home, SDL_SCANCODE_HOME},
-    {KS_End, SDL_SCANCODE_END},
-    {KS_Pause, SDL_SCANCODE_PAUSE},
-    {KS_Print_Screen, SDL_SCANCODE_PRINTSCREEN},
-    {KS_Insert, SDL_SCANCODE_INSERT},
-    {KS_Escape, SDL_SCANCODE_ESCAPE},
-    {KS_Return, SDL_SCANCODE_RETURN},
-    {KS_Linefeed, SDL_SCANCODE_RETURN},
-    {KS_KP_Delete, SDL_SCANCODE_DELETE},
-    {KS_KP_Insert, SDL_SCANCODE_INSERT},
-    {KS_Control_L, SDL_SCANCODE_LCTRL},
-    {KS_Control_R, SDL_SCANCODE_RCTRL},
-    {KS_Shift_L, SDL_SCANCODE_LSHIFT},
-    {KS_Shift_R, SDL_SCANCODE_RSHIFT},
-    {KS_Alt_L, SDL_SCANCODE_LALT},
-    {KS_Alt_R, SDL_SCANCODE_RALT},
-    {KS_grave, SDL_SCANCODE_GRAVE},
-
-    {KS_KP_0, SDL_SCANCODE_KP_0},
-    {KS_KP_1, SDL_SCANCODE_KP_1},
-    {KS_KP_2, SDL_SCANCODE_KP_2},
-    {KS_KP_3, SDL_SCANCODE_KP_3},
-    {KS_KP_4, SDL_SCANCODE_KP_4},
-    {KS_KP_5, SDL_SCANCODE_KP_5},
-    {KS_KP_6, SDL_SCANCODE_KP_6},
-    {KS_KP_7, SDL_SCANCODE_KP_7},
-    {KS_KP_8, SDL_SCANCODE_KP_8},
-    {KS_KP_9, SDL_SCANCODE_KP_9},
-    {KS_KP_Enter, SDL_SCANCODE_KP_ENTER},
-    {KS_KP_Multiply, SDL_SCANCODE_KP_MULTIPLY},
-    {KS_KP_Add, SDL_SCANCODE_KP_PLUS},
-    {KS_KP_Subtract, SDL_SCANCODE_KP_MINUS},
-    {KS_KP_Divide, SDL_SCANCODE_KP_DIVIDE},
-    {KS_KP_Up, SDL_SCANCODE_UP},
-    {KS_KP_Down, SDL_SCANCODE_DOWN},
-    {KS_KP_Left, SDL_SCANCODE_LEFT},
-    {KS_KP_Right, SDL_SCANCODE_RIGHT},
-    {KS_KP_Equal, SDL_SCANCODE_KP_EQUALS},
-    {KS_f1, SDL_SCANCODE_F1},
-    {KS_f2, SDL_SCANCODE_F2},
-    {KS_f3, SDL_SCANCODE_F3},
-    {KS_f4, SDL_SCANCODE_F4},
-    {KS_f5, SDL_SCANCODE_F5},
-    {KS_f6, SDL_SCANCODE_F6},
-    {KS_f7, SDL_SCANCODE_F7},
-    {KS_f8, SDL_SCANCODE_F8},
-    {KS_f9, SDL_SCANCODE_F9},
-    {KS_f10, SDL_SCANCODE_F10},
-    {KS_f11, SDL_SCANCODE_F11},
-    {KS_f12, SDL_SCANCODE_F12},
-    {KS_f13, SDL_SCANCODE_F13},
-    {KS_f14, SDL_SCANCODE_F14},
-    {KS_f15, SDL_SCANCODE_F15},
-    {KS_f16, SDL_SCANCODE_F16},
-    {KS_f17, SDL_SCANCODE_F17},
-    {KS_f18, SDL_SCANCODE_F18},
-    {KS_f19, SDL_SCANCODE_F19},
-    {KS_f20, SDL_SCANCODE_F20},
+    { KS_Menu, SDL_SCANCODE_APPLICATION },
+    { KS_Up, SDL_SCANCODE_UP },
+    { KS_Down, SDL_SCANCODE_DOWN },
+    { KS_Left, SDL_SCANCODE_LEFT },
+    { KS_Right, SDL_SCANCODE_RIGHT },
+    { KS_Hold_Screen, SDL_SCANCODE_SCROLLLOCK },
+    { KS_Num_Lock, SDL_SCANCODE_NUMLOCKCLEAR },
+    { KS_Caps_Lock, SDL_SCANCODE_CAPSLOCK },
+    { KS_BackSpace, SDL_SCANCODE_BACKSPACE },
+    { KS_space, SDL_SCANCODE_SPACE },
+    { KS_Delete, SDL_SCANCODE_BACKSPACE },
+    { KS_Home, SDL_SCANCODE_HOME },
+    { KS_End, SDL_SCANCODE_END },
+    { KS_Pause, SDL_SCANCODE_PAUSE },
+    { KS_Print_Screen, SDL_SCANCODE_PRINTSCREEN },
+    { KS_Insert, SDL_SCANCODE_INSERT },
+    { KS_Escape, SDL_SCANCODE_ESCAPE },
+    { KS_Return, SDL_SCANCODE_RETURN },
+    { KS_Linefeed, SDL_SCANCODE_RETURN },
+    { KS_KP_Delete, SDL_SCANCODE_DELETE },
+    { KS_KP_Insert, SDL_SCANCODE_INSERT },
+    { KS_Control_L, SDL_SCANCODE_LCTRL },
+    { KS_Control_R, SDL_SCANCODE_RCTRL },
+    { KS_Shift_L, SDL_SCANCODE_LSHIFT },
+    { KS_Shift_R, SDL_SCANCODE_RSHIFT },
+    { KS_Alt_L, SDL_SCANCODE_LALT },
+    { KS_Alt_R, SDL_SCANCODE_RALT },
+    { KS_grave, SDL_SCANCODE_GRAVE },
+
+    { KS_KP_0, SDL_SCANCODE_KP_0 },
+    { KS_KP_1, SDL_SCANCODE_KP_1 },
+    { KS_KP_2, SDL_SCANCODE_KP_2 },
+    { KS_KP_3, SDL_SCANCODE_KP_3 },
+    { KS_KP_4, SDL_SCANCODE_KP_4 },
+    { KS_KP_5, SDL_SCANCODE_KP_5 },
+    { KS_KP_6, SDL_SCANCODE_KP_6 },
+    { KS_KP_7, SDL_SCANCODE_KP_7 },
+    { KS_KP_8, SDL_SCANCODE_KP_8 },
+    { KS_KP_9, SDL_SCANCODE_KP_9 },
+    { KS_KP_Enter, SDL_SCANCODE_KP_ENTER },
+    { KS_KP_Multiply, SDL_SCANCODE_KP_MULTIPLY },
+    { KS_KP_Add, SDL_SCANCODE_KP_PLUS },
+    { KS_KP_Subtract, SDL_SCANCODE_KP_MINUS },
+    { KS_KP_Divide, SDL_SCANCODE_KP_DIVIDE },
+    { KS_KP_Up, SDL_SCANCODE_UP },
+    { KS_KP_Down, SDL_SCANCODE_DOWN },
+    { KS_KP_Left, SDL_SCANCODE_LEFT },
+    { KS_KP_Right, SDL_SCANCODE_RIGHT },
+    { KS_KP_Equal, SDL_SCANCODE_KP_EQUALS },
+    { KS_f1, SDL_SCANCODE_F1 },
+    { KS_f2, SDL_SCANCODE_F2 },
+    { KS_f3, SDL_SCANCODE_F3 },
+    { KS_f4, SDL_SCANCODE_F4 },
+    { KS_f5, SDL_SCANCODE_F5 },
+    { KS_f6, SDL_SCANCODE_F6 },
+    { KS_f7, SDL_SCANCODE_F7 },
+    { KS_f8, SDL_SCANCODE_F8 },
+    { KS_f9, SDL_SCANCODE_F9 },
+    { KS_f10, SDL_SCANCODE_F10 },
+    { KS_f11, SDL_SCANCODE_F11 },
+    { KS_f12, SDL_SCANCODE_F12 },
+    { KS_f13, SDL_SCANCODE_F13 },
+    { KS_f14, SDL_SCANCODE_F14 },
+    { KS_f15, SDL_SCANCODE_F15 },
+    { KS_f16, SDL_SCANCODE_F16 },
+    { KS_f17, SDL_SCANCODE_F17 },
+    { KS_f18, SDL_SCANCODE_F18 },
+    { KS_f19, SDL_SCANCODE_F19 },
+    { KS_f20, SDL_SCANCODE_F20 },
 #if !defined(__NetBSD__)
-    {KS_f21, SDL_SCANCODE_F21},
-    {KS_f22, SDL_SCANCODE_F22},
-    {KS_f23, SDL_SCANCODE_F23},
-    {KS_f24, SDL_SCANCODE_F24},
+    { KS_f21, SDL_SCANCODE_F21 },
+    { KS_f22, SDL_SCANCODE_F22 },
+    { KS_f23, SDL_SCANCODE_F23 },
+    { KS_f24, SDL_SCANCODE_F24 },
 #endif
-    {KS_Meta_L, SDL_SCANCODE_LGUI},
-    {KS_Meta_R, SDL_SCANCODE_RGUI},
-    {KS_Zenkaku_Hankaku, SDL_SCANCODE_LANG5},
-    {KS_Hiragana_Katakana, SDL_SCANCODE_INTERNATIONAL2},
-    {KS_yen, SDL_SCANCODE_INTERNATIONAL3},
-    {KS_Henkan, SDL_SCANCODE_INTERNATIONAL4},
-    {KS_Muhenkan, SDL_SCANCODE_INTERNATIONAL5},
-    {KS_KP_Prior, SDL_SCANCODE_PRIOR},
-
-    {KS_a, SDL_SCANCODE_A},
-    {KS_b, SDL_SCANCODE_B},
-    {KS_c, SDL_SCANCODE_C},
-    {KS_d, SDL_SCANCODE_D},
-    {KS_e, SDL_SCANCODE_E},
-    {KS_f, SDL_SCANCODE_F},
-    {KS_g, SDL_SCANCODE_G},
-    {KS_h, SDL_SCANCODE_H},
-    {KS_i, SDL_SCANCODE_I},
-    {KS_j, SDL_SCANCODE_J},
-    {KS_k, SDL_SCANCODE_K},
-    {KS_l, SDL_SCANCODE_L},
-    {KS_m, SDL_SCANCODE_M},
-    {KS_n, SDL_SCANCODE_N},
-    {KS_o, SDL_SCANCODE_O},
-    {KS_p, SDL_SCANCODE_P},
-    {KS_q, SDL_SCANCODE_Q},
-    {KS_r, SDL_SCANCODE_R},
-    {KS_s, SDL_SCANCODE_S},
-    {KS_t, SDL_SCANCODE_T},
-    {KS_u, SDL_SCANCODE_U},
-    {KS_v, SDL_SCANCODE_V},
-    {KS_w, SDL_SCANCODE_W},
-    {KS_x, SDL_SCANCODE_X},
-    {KS_y, SDL_SCANCODE_Y},
-    {KS_z, SDL_SCANCODE_Z},
-
-    {KS_0, SDL_SCANCODE_0},
-    {KS_1, SDL_SCANCODE_1},
-    {KS_2, SDL_SCANCODE_2},
-    {KS_3, SDL_SCANCODE_3},
-    {KS_4, SDL_SCANCODE_4},
-    {KS_5, SDL_SCANCODE_5},
-    {KS_6, SDL_SCANCODE_6},
-    {KS_7, SDL_SCANCODE_7},
-    {KS_8, SDL_SCANCODE_8},
-    {KS_9, SDL_SCANCODE_9},
-    {KS_minus, SDL_SCANCODE_MINUS},
-    {KS_equal, SDL_SCANCODE_EQUALS},
-    {KS_Tab, SDL_SCANCODE_TAB},
-    {KS_KP_Tab, SDL_SCANCODE_KP_TAB},
-    {KS_apostrophe, SDL_SCANCODE_APOSTROPHE},
-    {KS_bracketleft, SDL_SCANCODE_LEFTBRACKET},
-    {KS_bracketright, SDL_SCANCODE_RIGHTBRACKET},
-    {KS_semicolon, SDL_SCANCODE_SEMICOLON},
-    {KS_comma, SDL_SCANCODE_COMMA},
-    {KS_period, SDL_SCANCODE_PERIOD},
-    {KS_slash, SDL_SCANCODE_SLASH},
-    {KS_backslash, SDL_SCANCODE_BACKSLASH}
+    { KS_Meta_L, SDL_SCANCODE_LGUI },
+    { KS_Meta_R, SDL_SCANCODE_RGUI },
+    { KS_Zenkaku_Hankaku, SDL_SCANCODE_LANG5 },
+    { KS_Hiragana_Katakana, SDL_SCANCODE_INTERNATIONAL2 },
+    { KS_yen, SDL_SCANCODE_INTERNATIONAL3 },
+    { KS_Henkan, SDL_SCANCODE_INTERNATIONAL4 },
+    { KS_Muhenkan, SDL_SCANCODE_INTERNATIONAL5 },
+    { KS_KP_Prior, SDL_SCANCODE_PRIOR },
+
+    { KS_a, SDL_SCANCODE_A },
+    { KS_b, SDL_SCANCODE_B },
+    { KS_c, SDL_SCANCODE_C },
+    { KS_d, SDL_SCANCODE_D },
+    { KS_e, SDL_SCANCODE_E },
+    { KS_f, SDL_SCANCODE_F },
+    { KS_g, SDL_SCANCODE_G },
+    { KS_h, SDL_SCANCODE_H },
+    { KS_i, SDL_SCANCODE_I },
+    { KS_j, SDL_SCANCODE_J },
+    { KS_k, SDL_SCANCODE_K },
+    { KS_l, SDL_SCANCODE_L },
+    { KS_m, SDL_SCANCODE_M },
+    { KS_n, SDL_SCANCODE_N },
+    { KS_o, SDL_SCANCODE_O },
+    { KS_p, SDL_SCANCODE_P },
+    { KS_q, SDL_SCANCODE_Q },
+    { KS_r, SDL_SCANCODE_R },
+    { KS_s, SDL_SCANCODE_S },
+    { KS_t, SDL_SCANCODE_T },
+    { KS_u, SDL_SCANCODE_U },
+    { KS_v, SDL_SCANCODE_V },
+    { KS_w, SDL_SCANCODE_W },
+    { KS_x, SDL_SCANCODE_X },
+    { KS_y, SDL_SCANCODE_Y },
+    { KS_z, SDL_SCANCODE_Z },
+
+    { KS_0, SDL_SCANCODE_0 },
+    { KS_1, SDL_SCANCODE_1 },
+    { KS_2, SDL_SCANCODE_2 },
+    { KS_3, SDL_SCANCODE_3 },
+    { KS_4, SDL_SCANCODE_4 },
+    { KS_5, SDL_SCANCODE_5 },
+    { KS_6, SDL_SCANCODE_6 },
+    { KS_7, SDL_SCANCODE_7 },
+    { KS_8, SDL_SCANCODE_8 },
+    { KS_9, SDL_SCANCODE_9 },
+    { KS_minus, SDL_SCANCODE_MINUS },
+    { KS_equal, SDL_SCANCODE_EQUALS },
+    { KS_Tab, SDL_SCANCODE_TAB },
+    { KS_KP_Tab, SDL_SCANCODE_KP_TAB },
+    { KS_apostrophe, SDL_SCANCODE_APOSTROPHE },
+    { KS_bracketleft, SDL_SCANCODE_LEFTBRACKET },
+    { KS_bracketright, SDL_SCANCODE_RIGHTBRACKET },
+    { KS_semicolon, SDL_SCANCODE_SEMICOLON },
+    { KS_comma, SDL_SCANCODE_COMMA },
+    { KS_period, SDL_SCANCODE_PERIOD },
+    { KS_slash, SDL_SCANCODE_SLASH },
+    { KS_backslash, SDL_SCANCODE_BACKSLASH }
 };
 
-typedef struct {
+typedef struct
+{
     int fd;
     struct wskbd_map_data keymap;
     int ledstate;
@@ -394,27 +402,27 @@ typedef struct {
     int type;
 } SDL_WSCONS_input_data;
 
-static SDL_WSCONS_input_data* inputs[4] = {NULL, NULL, NULL, NULL};
-static SDL_WSCONS_mouse_input_data* mouseInputData = NULL;
-#define IS_CONTROL_HELD  (input->shiftstate[2] > 0)
-#define IS_ALT_HELD      (input->shiftstate[1] > 0)
-#define IS_SHIFT_HELD    ((input->shiftstate[0] > 0) || (input->ledstate & (1 << 5)))
+static SDL_WSCONS_input_data *inputs[4] = { NULL, NULL, NULL, NULL };
+static SDL_WSCONS_mouse_input_data *mouseInputData = NULL;
+#define IS_CONTROL_HELD (input->shiftstate[2] > 0)
+#define IS_ALT_HELD     (input->shiftstate[1] > 0)
+#define IS_SHIFT_HELD   ((input->shiftstate[0] > 0) || (input->ledstate & (1 << 5)))
 
 #define IS_ALTGR_MODE    ((input->ledstate & (1 << 4)) || (input->shiftstate[3] > 0))
 #define IS_NUMLOCK_ON    (input->ledstate & LED_NUM)
 #define IS_SCROLLLOCK_ON (input->ledstate & LED_SCR)
 #define IS_CAPSLOCK_ON   (input->ledstate & LED_CAP)
-static SDL_WSCONS_input_data* SDL_WSCONS_Init_Keyboard(const char* dev)
+static SDL_WSCONS_input_data *SDL_WSCONS_Init_Keyboard(const char *dev)
 {
 #ifdef WSKBDIO_SETVERSION
     int version = WSKBDIO_EVENT_VERSION;
 #endif
-    SDL_WSCONS_input_data* input = (SDL_WSCONS_input_data*)SDL_calloc(1, sizeof(SDL_WSCONS_input_data));
+    SDL_WSCONS_input_data *input = (SDL_WSCONS_input_data *)SDL_calloc(1, sizeof(SDL_WSCONS_input_data));
 
     if (input == NULL) {
         return input;
     }
-    input->fd = open(dev,O_RDWR | O_NONBLOCK | O_CLOEXEC);
+    input->fd = open(dev, O_RDWR | O_NONBLOCK | O_CLOEXEC);
     if (input->fd == -1) {
         free(input);
         input = NULL;
@@ -451,7 +459,7 @@ void SDL_WSCONS_Init()
 void SDL_WSCONS_Quit()
 {
     int i = 0;
-    SDL_WSCONS_input_data* input = NULL;
+    SDL_WSCONS_input_data *input = NULL;
 
     SDL_WSCONS_Quit_Mouse(mouseInputData);
     mouseInputData = NULL;
@@ -459,7 +467,7 @@ void SDL_WSCONS_Quit()
         input = inputs[i];
         if (input) {
             if (input->fd != -1 && input->fd != 0) {
-                ioctl(input->fd,WSKBDIO_SETLEDS, &input->origledstate);
+                ioctl(input->fd, WSKBDIO_SETLEDS, &input->origledstate);
                 close(input->fd);
                 input->fd = -1;
             }
@@ -473,12 +481,12 @@ void SDL_WSCONS_Quit()
 static void put_queue(SDL_WSCONS_input_data *kbd, uint c)
 {
     /* c is already part of a UTF-8 sequence and safe to add as a character */
-    if (kbd->text_len < (sizeof(kbd->text)-1)) {
+    if (kbd->text_len < (sizeof(kbd->text) - 1)) {
         kbd->text[kbd->text_len++] = (char)(c);
     }
 }
 
-static void put_utf8(SDL_WSCONS_input_data* input, uint c)
+static void put_utf8(SDL_WSCONS_input_data *input, uint c)
 {
     if (c < 0x80)
         /*  0******* */
@@ -507,14 +515,14 @@ static void put_utf8(SDL_WSCONS_input_data* input, uint c)
     }
 }
 
-static void Translate_to_text(SDL_WSCONS_input_data* input, keysym_t ksym)
+static void Translate_to_text(SDL_WSCONS_input_data *input, keysym_t ksym)
 {
     if (KS_GROUP(ksym) == KS_GROUP_Keypad) {
         if (SDL_isprint(ksym & 0xFF)) {
             ksym &= 0xFF;
         }
     }
-    switch(ksym) {
+    switch (ksym) {
     case KS_Escape:
     case KS_Delete:
     case KS_BackSpace:
@@ -535,19 +543,21 @@ static void Translate_to_text(SDL_WSCONS_input_data* input, keysym_t ksym)
     }
 }
 
-static void Translate_to_keycode(SDL_WSCONS_input_data* input, int type, keysym_t ksym)
+static void Translate_to_keycode(SDL_WSCONS_input_data *input, int type, keysym_t ksym)
 {
     struct wscons_keymap keyDesc = input->keymap.map[ksym];
-    keysym_t* group = &keyDesc.group1[KS_GROUP(keyDesc.group1[0]) == KS_GROUP_Keypad && IS_NUMLOCK_ON ? !IS_SHIFT_HELD : 0];
+    keysym_t *group = &keyDesc.group1[KS_GROUP(keyDesc.group1[0]) == KS_GROUP_Keypad && IS_NUMLOCK_ON ? !IS_SHIFT_HELD : 0];
     int i = 0;
 
     /* Check command first, then group[0]*/
     switch (keyDesc.command) {
-    case KS_Cmd_ScrollBack: {
+    case KS_Cmd_ScrollBack:
+    {
         SDL_SendKeyboardKey(type == WSCONS_EVENT_KEY_DOWN ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_PAGEUP);
         return;
     }
-    case KS_Cmd_ScrollFwd: {
+    case KS_Cmd_ScrollFwd:
+    {
         SDL_SendKeyboardKey(type == WSCONS_EVENT_KEY_DOWN ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_PAGEDOWN);
         return;
     }
@@ -559,14 +569,13 @@ static void Translate_to_keycode(SDL_WSCONS_input_data* input, int type, keysym_
         }
     }
     SDL_SendKeyboardKey(type == WSCONS_EVENT_KEY_DOWN ? SDL_PRESSED : SDL_RELEASED, SDL_SCANCODE_UNKNOWN);
-
 }
 
-static void updateKeyboard(SDL_WSCONS_input_data* input)
+static void updateKeyboard(SDL_WSCONS_input_data *input)
 {
     struct wscons_event events[64];
     int type;
-    int n,i,gindex,acc_i;
+    int n, i, gindex, acc_i;
     keysym_t *group;
     keysym_t ksym, result;
 
@@ -577,30 +586,34 @@ static void updateKeyboard(SDL_WSCONS_input_data* input)
         n /= sizeof(struct wscons_event);
         for (i = 0; i < n; i++) {
             type = events[i].type;
-            switch(type) {
-            case WSCONS_EVENT_KEY_DOWN: {
+            switch (type) {
+            case WSCONS_EVENT_KEY_DOWN:
+            {
                 switch (input->keymap.map[events[i].value].group1[0]) {
-                case KS_Hold_Screen: {
+                case KS_Hold_Screen:
+                {
                     if (input->lockheldstate[0] >= 1) {
-                                break;
+                        break;
                     }
                     input->ledstate ^= LED_SCR;
                     ioctl(input->fd, WSKBDIO_SETLEDS, &input->ledstate);
                     input->lockheldstate[0] = 1;
                     break;
                 }
-                case KS_Num_Lock: {
+                case KS_Num_Lock:
+                {
                     if (input->lockheldstate[1] >= 1) {
-                                break;
+                        break;
                     }
                     input->ledstate ^= LED_NUM;
                     ioctl(input->fd, WSKBDIO_SETLEDS, &input->ledstate);
                     input->lockheldstate[1] = 1;
                     break;
                 }
-                case KS_Caps_Lock: {
+                case KS_Caps_Lock:
+                {
                     if (input->lockheldstate[2] >= 1) {
-                                break;
+                        break;
                     }
                     input->ledstate ^= LED_CAP;
                     ioctl(input->fd, WSKBDIO_SETLEDS, &input->ledstate);
@@ -608,9 +621,10 @@ static void updateKeyboard(SDL_WSCONS_input_data* input)
                     break;
                 }
 #ifndef __NetBSD__
-                case KS_Mode_Lock: {
+                case KS_Mode_Lock:
+                {
                     if (input->lockheldstate[3] >= 1) {
-                                break;
+                        break;
                     }
                     input->ledstate ^= 1 << 4;
                     ioctl(input->fd, WSKBDIO_SETLEDS, &input->ledstate);
@@ -618,160 +632,174 @@ static void updateKeyboard(SDL_WSCONS_input_data* input)
                     break;
                 }
 #endif
-                case KS_Shift_Lock: {
+                case KS_Shift_Lock:
+                {
                     if (input->lockheldstate[4] >= 1) {
-                                break;
+                        break;
                     }
                     input->ledstate ^= 1 << 5;
                     ioctl(input->fd, WSKBDIO_SETLEDS, &input->ledstate);
                     input->lockheldstate[4] = 1;
                     break;
                 }
-                case KS_Shift_L: {
+                case KS_Shift_L:
+                {
                     if (input->shiftheldstate[0]) {
-                                break;
+                        break;
                     }
                     input->shiftstate[0]++;
                     input->shiftheldstate[0] = 1;
                     break;
                 }
-                case KS_Shift_R: {
+                case KS_Shift_R:
+                {
                     if (input->shiftheldstate[1]) {
-                                break;
+                        break;
                     }
                     input->shiftstate[0]++;
                     input->shiftheldstate[1] = 1;
                     break;
                 }
-                case KS_Alt_L: {
+                case KS_Alt_L:
+                {
                     if (input->shiftheldstate[2]) {
-                                break;
+                        break;
                     }
                     input->shiftstate[1]++;
                     input->shiftheldstate[2] = 1;
                     break;
                 }
-                case KS_Alt_R: {
+                case KS_Alt_R:
+                {
                     if (input->shiftheldstate[3]) {
-                                break;
+                        break;
                     }
                     input->shiftstate[1]++;
                     input->shiftheldstate[3] = 1;
                     break;
                 }
-                case KS_Control_L: {
+                case KS_Control_L:
+                {
                     if (input->shiftheldstate[4]) {
-                                break;
+                        break;
                     }
                     input->shiftstate[2]++;
                     input->shiftheldstate[4] = 1;
                     break;
                 }
-                case KS_Control_R: {
+                case KS_Control_R:
+                {
                     if (input->shiftheldstate[5]) {
-                                break;
+                        break;
                     }
                     input->shiftstate[2]++;
                     input->shiftheldstate[5] = 1;
                     break;
                 }
-                case KS_Mode_switch: {
+                case KS_Mode_switch:
+                {
                     if (input->shiftheldstate[6]) {
-                                break;
+                        break;
                     }
                     input->shiftstate[3]++;
                     input->shiftheldstate[6] = 1;
                     break;
                 }
                 }
-            }
-            break;
-            case WSCONS_EVENT_KEY_UP: {
-                switch(input->keymap.map[events[i].value].group1[0]) {
-                case KS_Hold_Screen: {
+            } break;
+            case WSCONS_EVENT_KEY_UP:
+            {
+                switch (input->keymap.map[events[i].value].group1[0]) {
+                case KS_Hold_Screen:
+                {
                     if (input->lockheldstate[0]) {
-                                input->lockheldstate[0] = 0;
+                        input->lockheldstate[0] = 0;
                     }
-                }
-                break;
-                case KS_Num_Lock: {
+                } break;
+                case KS_Num_Lock:
+                {
                     if (input->lockheldstate[1]) {
-                                input->lockheldstate[1] = 0;
+                        input->lockheldstate[1] = 0;
                     }
-                }
-                break;
-                case KS_Caps_Lock: {
+                } break;
+                case KS_Caps_Lock:
+                {
                     if (input->lockheldstate[2]) {
-                                input->lockheldstate[2] = 0;
+                        input->lockheldstate[2] = 0;
                     }
-                }
-                break;
+                } break;
 #ifndef __NetBSD__
-                case KS_Mode_Lock: {
+                case KS_Mode_Lock:
+                {
                     if (input->lockheldstate[3]) {
-                                input->lockheldstate[3] = 0;
+                        input->lockheldstate[3] = 0;
                     }
-                }
-                break;
+                } break;
 #endif
-                case KS_Shift_Lock: {
+                case KS_Shift_Lock:
+                {
                     if (input->lockheldstate[4]) {
-                                input->lockheldstate[4] = 0;
+                        input->lockheldstate[4] = 0;
                     }
-                }
-                break;
-                case KS_Shift_L: {
+                } break;
+                case KS_Shift_L:
+                {
                     input->shiftheldstate[0] = 0;
                     if (input->shiftstate[0]) {
-                                input->shiftstate[0]--;
+                        input->shiftstate[0]--;
                     }
                     break;
                 }
-                case KS_Shift_R: {
+                case KS_Shift_R:
+                {
                     input->shiftheldstate[1] = 0;
                     if (input->shiftstate[0]) {
-                                input->shiftstate[0]--;
+                        input->shiftstate[0]--;
                     }
                     break;
                 }
-                case KS_Alt_L: {
+                case KS_Alt_L:
+                {
                     input->shiftheldstate[2] = 0;
                     if (input->shiftstate[1]) {
-                                input->shiftstate[1]--;
+                        input->shiftstate[1]--;
                     }
                     break;
                 }
-                case KS_Alt_R: {
+                case KS_Alt_R:
+                {
                     input->shiftheldstate[3] = 0;
                     if (input->shiftstate[1]) {
-                                input->shiftstate[1]--;
+                        input->shiftstate[1]--;
                     }
                     break;
                 }
-                case KS_Control_L: {
+                case KS_Control_L:
+                {
                     input->shiftheldstate[4] = 0;
                     if (input->shiftstate[2]) {
-                                input->shiftstate[2]--;
+                        input->shiftstate[2]--;
                     }
                     break;
                 }
-                case KS_Control_R: {
+                case KS_Control_R:
+                {
                     input->shiftheldstate[5] = 0;
                     if (input->shiftstate[2]) {
-                                input->shiftstate[2]--;
+                        input->shiftstate[2]--;
                     }
                     break;
                 }
-                case KS_Mode_switch: {
+                case KS_Mode_switch:
+                {
                     input->shiftheldstate[6] = 0;
                     if (input->shiftstate[3]) {
-                                input->shiftstate[3]--;
+                        input->shiftstate[3]--;
                     }
                     break;
                 }
                 }
-            }
-            break;
+            } break;
             case WSCONS_EVENT_ALL_KEYS_UP:
                 for (i = 0; i < SDL_NUM_SCANCODES; i++) {
                     SDL_SendKeyboardKey(SDL_RELEASED, i);
@@ -781,7 +809,7 @@ static void updateKeyboard(SDL_WSCONS_input_data* input)
 
             if (input->type == WSKBD_TYPE_USB && events[i].value <= 0xE7)
                 SDL_SendKeyboardKey(type == WSCONS_EVENT_KEY_DOWN ? SDL_PRESSED : SDL_RELEASED, (SDL_Scancode)events[i].value);
-            else 
+            else
                 Translate_to_keycode(input, type, events[i].value);
 
             if (type == WSCONS_EVENT_KEY_UP) {
@@ -816,7 +844,7 @@ static void updateKeyboard(SDL_WSCONS_input_data* input)
             case KS_GROUP_Mod:
                 if (ksym == KS_Multi_key) {
                     input->ledstate |= WSKBD_LED_COMPOSE;
-                    ioctl(input->fd,WSKBDIO_SETLEDS, &input->ledstate);
+                    ioctl(input->fd, WSKBDIO_SETLEDS, &input->ledstate);
                     input->composelen = 2;
                     input->composebuffer[0] = input->composebuffer[1] = 0;
                 }
@@ -824,11 +852,12 @@ static void updateKeyboard(SDL_WSCONS_input_data* input)
             case KS_GROUP_Dead:
                 if (input->composelen == 0) {
                     input->ledstate |= WSKBD_LED_COMPOSE;
-                    ioctl(input->fd,WSKBDIO_SETLEDS, &input->ledstate);
+                    ioctl(input->fd, WSKBDIO_SETLEDS, &input->ledstate);
                     input->composelen = 1;
                     input->composebuffer[0] = ksym;
                     input->composebuffer[1] = 0;
-                } else result = ksym;
+                } else
+                    result = ksym;
                 break;
             }
             if (result == KS_voidSymbol) {
@@ -848,17 +877,15 @@ static void updateKeyboard(SDL_WSCONS_input_data* input)
                     if (--input->composelen == 0) {
                         result = KS_voidSymbol;
                         input->ledstate &= ~WSKBD_LED_COMPOSE;
-                        ioctl(input->fd,WSKBDIO_SETLEDS, &input->ledstate);
+                        ioctl(input->fd, WSKBDIO_SETLEDS, &input->ledstate);
                         for (acc_i = 0; acc_i < SDL_arraysize(compose_tab); acc_i++) {
-                            if ((compose_tab[acc_i].elem[0] == input->composebuffer[0]
-                                    && compose_tab[acc_i].elem[1] == input->composebuffer[1])
-                                    || (compose_tab[acc_i].elem[0] == input->composebuffer[1]
-                                        && compose_tab[acc_i].elem[1] == input->composebuffer[0])) {
+                            if ((compose_tab[acc_i].elem[0] == input->composebuffer[0] && compose_tab[acc_i].elem[1] == input->composebuffer[1]) || (compose_tab[acc_i].elem[0] == input->composebuffer[1] && compose_tab[acc_i].elem[1] == input->composebuffer[0])) {
                                 result = compose_tab[acc_i].result;
                                 break;
                             }
                         }
-                    } else continue;
+                    } else
+                        continue;
                 }
             }
 
@@ -871,7 +898,7 @@ static void updateKeyboard(SDL_WSCONS_input_data* input)
                     } else if (result >= KS_3 && result <= KS_7) {
                         result = KS_Escape + (result - KS_3);
                     } else if (result == KS_8) {
-                       result = KS_Delete;
+                        result = KS_Delete;
                     }
                 }
                 if (IS_ALT_HELD) {
@@ -880,11 +907,11 @@ static void updateKeyboard(SDL_WSCONS_input_data* input)
                         Translate_to_text(input, result);
                         continue;
                     } else {
-                       result |= 0x80;
+                        result |= 0x80;
                     }
                 }
             }
-            Translate_to_text(input,result);
+            Translate_to_text(input, result);
             continue;
         }
     }

src/core/openbsd/SDL_wscons_mouse.c

@@ -34,18 +34,21 @@ typedef struct SDL_WSCONS_mouse_input_data
     int fd;
 } SDL_WSCONS_mouse_input_data;
 
-SDL_WSCONS_mouse_input_data* SDL_WSCONS_Init_Mouse()
+SDL_WSCONS_mouse_input_data *SDL_WSCONS_Init_Mouse()
 {
 #ifdef WSMOUSEIO_SETVERSION
     int version = WSMOUSE_EVENT_VERSION;
 #endif
-    SDL_WSCONS_mouse_input_data* mouseInputData = SDL_calloc(1, sizeof(SDL_WSCONS_mouse_input_data));
+    SDL_WSCONS_mouse_input_data *mouseInputData = SDL_calloc(1, sizeof(SDL_WSCONS_mouse_input_data));
 
     if (mouseInputData == NULL) {
         return NULL;
     }
-    mouseInputData->fd = open("/dev/wsmouse",O_RDWR | O_NONBLOCK | O_CLOEXEC);
-    if (mouseInputData->fd == -1) {free(mouseInputData); return NULL; }
+    mouseInputData->fd = open("/dev/wsmouse", O_RDWR | O_NONBLOCK | O_CLOEXEC);
+    if (mouseInputData->fd == -1) {
+        free(mouseInputData);
+        return NULL;
+    }
 #ifdef WSMOUSEIO_SETMODE
     ioctl(mouseInputData->fd, WSMOUSEIO_SETMODE, WSMOUSE_COMPAT);
 #endif
@@ -55,77 +58,72 @@ SDL_WSCONS_mouse_input_data* SDL_WSCONS_Init_Mouse()
     return mouseInputData;
 }
 
-void updateMouse(SDL_WSCONS_mouse_input_data* inputData)
+void updateMouse(SDL_WSCONS_mouse_input_data *inputData)
 {
     struct wscons_event events[64];
     int type;
-    int n,i;
-    SDL_Mouse* mouse = SDL_GetMouse();
+    int n, i;
+    SDL_Mouse *mouse = SDL_GetMouse();
 
     if ((n = read(inputData->fd, events, sizeof(events))) > 0) {
         n /= sizeof(struct wscons_event);
         for (i = 0; i < n; i++) {
             type = events[i].type;
-            switch(type)
-            {
+            switch (type) {
             case WSCONS_EVENT_MOUSE_DOWN:
-                {
-                    switch (events[i].value)
-                    {
-                    case 0: /* Left Mouse Button. */
-                        SDL_SendMouseButton(mouse->focus, mouse->mouseID, SDL_PRESSED, SDL_BUTTON_LEFT);
-                        break;
-                    case 1: /* Middle Mouse Button. */
-                        SDL_SendMouseButton(mouse->focus, mouse->mouseID, SDL_PRESSED, SDL_BUTTON_MIDDLE);
-                        break;
-                    case 2: /* Right Mouse Button. */
-                        SDL_SendMouseButton(mouse->focus, mouse->mouseID, SDL_PRESSED, SDL_BUTTON_RIGHT);
-                        break;
-                    }
+            {
+                switch (events[i].value) {
+                case 0: /* Left Mouse Button. */
+                    SDL_SendMouseButton(mouse->focus, mouse->mouseID, SDL_PRESSED, SDL_BUTTON_LEFT);
+                    break;
+                case 1: /* Middle Mouse Button. */
+                    SDL_SendMouseButton(mouse->focus, mouse->mouseID, SDL_PRESSED, SDL_BUTTON_MIDDLE);
+                    break;
+                case 2: /* Right Mouse Button. */
+                    SDL_SendMouseButton(mouse->focus, mouse->mouseID, SDL_PRESSED, SDL_BUTTON_RIGHT);
+                    break;
                 }
-                break;
+            } break;
             case WSCONS_EVENT_MOUSE_UP:
-                {
-                    switch (events[i].value)
-                    {
-                    case 0: /* Left Mouse Button. */
-                        SDL_SendMouseButton(mouse->focus, mouse->mouseID, SDL_RELEASED, SDL_BUTTON_LEFT);
-                        break;
-                    case 1: /* Middle Mouse Button. */
-                        SDL_SendMouseButton(mouse->focus, mouse->mouseID, SDL_RELEASED, SDL_BUTTON_MIDDLE);
-                        break;
-                    case 2: /* Right Mouse Button. */
-                        SDL_SendMouseButton(mouse->focus, mouse->mouseID, SDL_RELEASED, SDL_BUTTON_RIGHT);
-                        break;
-                    }
-                }
-                break;
-            case WSCONS_EVENT_MOUSE_DELTA_X:
-                {
-                    SDL_SendMouseMotion(mouse->focus, mouse->mouseID, 1, events[i].value, 0);
+            {
+                switch (events[i].value) {
+                case 0: /* Left Mouse Button. */
+                    SDL_SendMouseButton(mouse->focus, mouse->mouseID, SDL_RELEASED, SDL_BUTTON_LEFT);
                     break;
-                }
-            case WSCONS_EVENT_MOUSE_DELTA_Y:
-                {
-                    SDL_SendMouseMotion(mouse->focus, mouse->mouseID, 1, 0, -events[i].value);
+                case 1: /* Middle Mouse Button. */
+                    SDL_SendMouseButton(mouse->focus, mouse->mouseID, SDL_RELEASED, SDL_BUTTON_MIDDLE);
                     break;
-                }
-            case WSCONS_EVENT_MOUSE_DELTA_W:
-                {
-                    SDL_SendMouseWheel(mouse->focus, mouse->mouseID, events[i].value, 0, SDL_MOUSEWHEEL_NORMAL);
+                case 2: /* Right Mouse Button. */
+                    SDL_SendMouseButton(mouse->focus, mouse->mouseID, SDL_RELEASED, SDL_BUTTON_RIGHT);
                     break;
                 }
+            } break;
+            case WSCONS_EVENT_MOUSE_DELTA_X:
+            {
+                SDL_SendMouseMotion(mouse->focus, mouse->mouseID, 1, events[i].value, 0);
+                break;
+            }
+            case WSCONS_EVENT_MOUSE_DELTA_Y:
+            {
+                SDL_SendMouseMotion(mouse->focus, mouse->mouseID, 1, 0, -events[i].value);
+                break;
+            }
+            case WSCONS_EVENT_MOUSE_DELTA_W:
+            {
+                SDL_SendMouseWheel(mouse->focus, mouse->mouseID, events[i].value, 0, SDL_MOUSEWHEEL_NORMAL);
+                break;
+            }
             case WSCONS_EVENT_MOUSE_DELTA_Z:
-                {
-                    SDL_SendMouseWheel(mouse->focus, mouse->mouseID, 0, -events[i].value, SDL_MOUSEWHEEL_NORMAL);
-                    break;
-                }
+            {
+                SDL_SendMouseWheel(mouse->focus, mouse->mouseID, 0, -events[i].value, SDL_MOUSEWHEEL_NORMAL);
+                break;
+            }
             }
         }
     }
 }
 
-void SDL_WSCONS_Quit_Mouse(SDL_WSCONS_mouse_input_data* inputData)
+void SDL_WSCONS_Quit_Mouse(SDL_WSCONS_mouse_input_data *inputData)
 {
     if (inputData == NULL) {
         return;

src/core/unix/SDL_poll.c

@@ -32,17 +32,14 @@
 #endif
 #include <errno.h>
 
-
-int
-SDL_IOReady(int fd, int flags, int timeoutMS)
+int SDL_IOReady(int fd, int flags, int timeoutMS)
 {
     int result;
 
     SDL_assert(flags & (SDL_IOR_READ | SDL_IOR_WRITE));
 
     /* Note: We don't bother to account for elapsed time if we get EINTR */
-    do
-    {
+    do {
 #ifdef HAVE_POLL
         struct pollfd info;
 
@@ -83,7 +80,7 @@ SDL_IOReady(int fd, int flags, int timeoutMS)
         result = select(fd + 1, rfdp, wfdp, NULL, tvp);
 #endif /* HAVE_POLL */
 
-    } while ( result < 0 && errno == EINTR && !(flags & SDL_IOR_NO_RETRY));
+    } while (result < 0 && errno == EINTR && !(flags & SDL_IOR_NO_RETRY));
 
     return result;
 }

src/core/unix/SDL_poll.h

@@ -24,10 +24,9 @@
 #ifndef SDL_poll_h_
 #define SDL_poll_h_
 
-
-#define SDL_IOR_READ           0x1
-#define SDL_IOR_WRITE          0x2
-#define SDL_IOR_NO_RETRY       0x4
+#define SDL_IOR_READ     0x1
+#define SDL_IOR_WRITE    0x2
+#define SDL_IOR_NO_RETRY 0x4
 
 extern int SDL_IOReady(int fd, int flags, int timeoutMS);
 

src/core/windows/SDL_directx.h

@@ -30,7 +30,7 @@
 #ifndef WIN32
 #define WIN32
 #endif
-#undef  WINNT
+#undef WINNT
 
 /* Far pointers don't exist in 32-bit code */
 #ifndef FAR
@@ -39,35 +39,35 @@
 
 /* Error codes not yet included in Win32 API header files */
 #ifndef MAKE_HRESULT
-#define MAKE_HRESULT(sev,fac,code) \
-    ((HRESULT)(((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | ((unsigned long)(code))))
+#define MAKE_HRESULT(sev, fac, code) \
+    ((HRESULT)(((unsigned long)(sev) << 31) | ((unsigned long)(fac) << 16) | ((unsigned long)(code))))
 #endif
 
 #ifndef S_OK
-#define S_OK        (HRESULT)0x00000000L
+#define S_OK (HRESULT)0x00000000L
 #endif
 
 #ifndef SUCCEEDED
-#define SUCCEEDED(x)    ((HRESULT)(x) >= 0)
+#define SUCCEEDED(x) ((HRESULT)(x) >= 0)
 #endif
 #ifndef FAILED
-#define FAILED(x)   ((HRESULT)(x)<0)
+#define FAILED(x) ((HRESULT)(x) < 0)
 #endif
 
 #ifndef E_FAIL
-#define E_FAIL      (HRESULT)0x80000008L
+#define E_FAIL (HRESULT)0x80000008L
 #endif
 #ifndef E_NOINTERFACE
-#define E_NOINTERFACE   (HRESULT)0x80004002L
+#define E_NOINTERFACE (HRESULT)0x80004002L
 #endif
 #ifndef E_OUTOFMEMORY
-#define E_OUTOFMEMORY   (HRESULT)0x8007000EL
+#define E_OUTOFMEMORY (HRESULT)0x8007000EL
 #endif
 #ifndef E_INVALIDARG
-#define E_INVALIDARG    (HRESULT)0x80070057L
+#define E_INVALIDARG (HRESULT)0x80070057L
 #endif
 #ifndef E_NOTIMPL
-#define E_NOTIMPL   (HRESULT)0x80004001L
+#define E_NOTIMPL (HRESULT)0x80004001L
 #endif
 #ifndef REGDB_E_CLASSNOTREG
 #define REGDB_E_CLASSNOTREG (HRESULT)0x80040154L
@@ -75,16 +75,16 @@
 
 /* Severity codes */
 #ifndef SEVERITY_ERROR
-#define SEVERITY_ERROR  1
+#define SEVERITY_ERROR 1
 #endif
 
 /* Error facility codes */
 #ifndef FACILITY_WIN32
-#define FACILITY_WIN32  7
+#define FACILITY_WIN32 7
 #endif
 
 #ifndef FIELD_OFFSET
-#define FIELD_OFFSET(type, field)    ((LONG)&(((type *)0)->field))
+#define FIELD_OFFSET(type, field) ((LONG) & (((type *)0)->field))
 #endif
 
 /* DirectX headers (if it isn't included, I haven't tested it yet)
@@ -103,7 +103,10 @@
 #ifdef HAVE_DINPUT_H
 #include <dinput.h>
 #else
-typedef struct { int unused; } DIDEVICEINSTANCE;
+typedef struct
+{
+    int unused;
+} DIDEVICEINSTANCE;
 #endif
 
 #endif /* SDL_directx_h_ */

src/core/windows/SDL_hid.c

@@ -24,7 +24,6 @@
 
 #include "SDL_hid.h"
 
-
 HidD_GetString_t SDL_HidD_GetManufacturerString;
 HidD_GetString_t SDL_HidD_GetProductString;
 HidP_GetCaps_t SDL_HidP_GetCaps;
@@ -36,14 +35,12 @@ HidP_GetData_t SDL_HidP_GetData;
 static HMODULE s_pHIDDLL = 0;
 static int s_HIDDLLRefCount = 0;
 
-
-int
-WIN_LoadHIDDLL(void)
+int WIN_LoadHIDDLL(void)
 {
     if (s_pHIDDLL) {
         SDL_assert(s_HIDDLLRefCount > 0);
         s_HIDDLLRefCount++;
-        return 0;  /* already loaded */
+        return 0; /* already loaded */
     }
 
     s_pHIDDLL = LoadLibrary(TEXT("hid.dll"));
@@ -71,8 +68,7 @@ WIN_LoadHIDDLL(void)
     return 0;
 }
 
-void
-WIN_UnloadHIDDLL(void)
+void WIN_UnloadHIDDLL(void)
 {
     if (s_pHIDDLL) {
         SDL_assert(s_HIDDLLRefCount > 0);

src/core/windows/SDL_hid.h

@@ -39,155 +39,166 @@ typedef struct _HIDD_ATTRIBUTES
     USHORT VersionNumber;
 } HIDD_ATTRIBUTES, *PHIDD_ATTRIBUTES;
 
-typedef enum {
+typedef enum
+{
     HidP_Input = 0,
     HidP_Output = 1,
     HidP_Feature = 2
 } HIDP_REPORT_TYPE;
 
-typedef struct {
-    USAGE   UsagePage;
-    UCHAR   ReportID;
+typedef struct
+{
+    USAGE UsagePage;
+    UCHAR ReportID;
     BOOLEAN IsAlias;
-    USHORT  BitField;
-    USHORT  LinkCollection;
-    USAGE   LinkUsage;
-    USAGE   LinkUsagePage;
+    USHORT BitField;
+    USHORT LinkCollection;
+    USAGE LinkUsage;
+    USAGE LinkUsagePage;
     BOOLEAN IsRange;
     BOOLEAN IsStringRange;
     BOOLEAN IsDesignatorRange;
     BOOLEAN IsAbsolute;
-    ULONG   Reserved[ 10 ];
-    union {
-        struct {
-            USAGE   UsageMin;
-            USAGE   UsageMax;
-            USHORT  StringMin;
-            USHORT  StringMax;
-            USHORT  DesignatorMin;
-            USHORT  DesignatorMax;
-            USHORT  DataIndexMin;
-            USHORT  DataIndexMax;
+    ULONG Reserved[10];
+    union
+    {
+        struct
+        {
+            USAGE UsageMin;
+            USAGE UsageMax;
+            USHORT StringMin;
+            USHORT StringMax;
+            USHORT DesignatorMin;
+            USHORT DesignatorMax;
+            USHORT DataIndexMin;
+            USHORT DataIndexMax;
         } Range;
-        struct {
-            USAGE   Usage;
-            USAGE   Reserved1;
-            USHORT  StringIndex;
-            USHORT  Reserved2;
-            USHORT  DesignatorIndex;
-            USHORT  Reserved3;
-            USHORT  DataIndex;
-            USHORT  Reserved4;
+        struct
+        {
+            USAGE Usage;
+            USAGE Reserved1;
+            USHORT StringIndex;
+            USHORT Reserved2;
+            USHORT DesignatorIndex;
+            USHORT Reserved3;
+            USHORT DataIndex;
+            USHORT Reserved4;
         } NotRange;
     };
 } HIDP_BUTTON_CAPS, *PHIDP_BUTTON_CAPS;
 
-typedef struct {
-    USAGE   UsagePage;
-    UCHAR   ReportID;
+typedef struct
+{
+    USAGE UsagePage;
+    UCHAR ReportID;
     BOOLEAN IsAlias;
-    USHORT  BitField;
-    USHORT  LinkCollection;
-    USAGE   LinkUsage;
-    USAGE   LinkUsagePage;
+    USHORT BitField;
+    USHORT LinkCollection;
+    USAGE LinkUsage;
+    USAGE LinkUsagePage;
     BOOLEAN IsRange;
     BOOLEAN IsStringRange;
     BOOLEAN IsDesignatorRange;
     BOOLEAN IsAbsolute;
     BOOLEAN HasNull;
-    UCHAR   Reserved;
-    USHORT  BitSize;
-    USHORT  ReportCount;
-    USHORT  Reserved2[ 5 ];
-    ULONG   UnitsExp;
-    ULONG   Units;
-    LONG    LogicalMin;
-    LONG    LogicalMax;
-    LONG    PhysicalMin;
-    LONG    PhysicalMax;
-    union {
-        struct {
-            USAGE   UsageMin;
-            USAGE   UsageMax;
-            USHORT  StringMin;
-            USHORT  StringMax;
-            USHORT  DesignatorMin;
-            USHORT  DesignatorMax;
-            USHORT  DataIndexMin;
-            USHORT  DataIndexMax;
+    UCHAR Reserved;
+    USHORT BitSize;
+    USHORT ReportCount;
+    USHORT Reserved2[5];
+    ULONG UnitsExp;
+    ULONG Units;
+    LONG LogicalMin;
+    LONG LogicalMax;
+    LONG PhysicalMin;
+    LONG PhysicalMax;
+    union
+    {
+        struct
+        {
+            USAGE UsageMin;
+            USAGE UsageMax;
+            USHORT StringMin;
+            USHORT StringMax;
+            USHORT DesignatorMin;
+            USHORT DesignatorMax;
+            USHORT DataIndexMin;
+            USHORT DataIndexMax;
         } Range;
-        struct {
-            USAGE   Usage;
-            USAGE   Reserved1;
-            USHORT  StringIndex;
-            USHORT  Reserved2;
-            USHORT  DesignatorIndex;
-            USHORT  Reserved3;
-            USHORT  DataIndex;
-            USHORT  Reserved4;
+        struct
+        {
+            USAGE Usage;
+            USAGE Reserved1;
+            USHORT StringIndex;
+            USHORT Reserved2;
+            USHORT DesignatorIndex;
+            USHORT Reserved3;
+            USHORT DataIndex;
+            USHORT Reserved4;
         } NotRange;
     };
 } HIDP_VALUE_CAPS, *PHIDP_VALUE_CAPS;
 
-typedef struct {
-    USAGE   Usage;
-    USAGE   UsagePage;
-    USHORT  InputReportByteLength;
-    USHORT  OutputReportByteLength;
-    USHORT  FeatureReportByteLength;
-    USHORT  Reserved[ 17 ];
-    USHORT  NumberLinkCollectionNodes;
-    USHORT  NumberInputButtonCaps;
-    USHORT  NumberInputValueCaps;
-    USHORT  NumberInputDataIndices;
-    USHORT  NumberOutputButtonCaps;
-    USHORT  NumberOutputValueCaps;
-    USHORT  NumberOutputDataIndices;
-    USHORT  NumberFeatureButtonCaps;
-    USHORT  NumberFeatureValueCaps;
-    USHORT  NumberFeatureDataIndices;
+typedef struct
+{
+    USAGE Usage;
+    USAGE UsagePage;
+    USHORT InputReportByteLength;
+    USHORT OutputReportByteLength;
+    USHORT FeatureReportByteLength;
+    USHORT Reserved[17];
+    USHORT NumberLinkCollectionNodes;
+    USHORT NumberInputButtonCaps;
+    USHORT NumberInputValueCaps;
+    USHORT NumberInputDataIndices;
+    USHORT NumberOutputButtonCaps;
+    USHORT NumberOutputValueCaps;
+    USHORT NumberOutputDataIndices;
+    USHORT NumberFeatureButtonCaps;
+    USHORT NumberFeatureValueCaps;
+    USHORT NumberFeatureDataIndices;
 } HIDP_CAPS, *PHIDP_CAPS;
 
-typedef struct {
-    USHORT  DataIndex;
-    USHORT  Reserved;
-    union {
-        ULONG   RawValue;
+typedef struct
+{
+    USHORT DataIndex;
+    USHORT Reserved;
+    union
+    {
+        ULONG RawValue;
         BOOLEAN On;
     };
 } HIDP_DATA, *PHIDP_DATA;
 
-#define HIDP_ERROR_CODES( p1, p2 ) ((NTSTATUS)(((p1) << 28) | (0x11 << 16) | (p2)))
-#define HIDP_STATUS_SUCCESS                 HIDP_ERROR_CODES( 0x0, 0x0000 )
-#define HIDP_STATUS_NULL                    HIDP_ERROR_CODES( 0x8, 0x0001 )
-#define HIDP_STATUS_INVALID_PREPARSED_DATA  HIDP_ERROR_CODES( 0xC, 0x0001 )
-#define HIDP_STATUS_INVALID_REPORT_TYPE     HIDP_ERROR_CODES( 0xC, 0x0002 )
-#define HIDP_STATUS_INVALID_REPORT_LENGTH   HIDP_ERROR_CODES( 0xC, 0x0003 )
-#define HIDP_STATUS_USAGE_NOT_FOUND         HIDP_ERROR_CODES( 0xC, 0x0004 )
-#define HIDP_STATUS_VALUE_OUT_OF_RANGE      HIDP_ERROR_CODES( 0xC, 0x0005 )
-#define HIDP_STATUS_BAD_LOG_PHY_VALUES      HIDP_ERROR_CODES( 0xC, 0x0006 )
-#define HIDP_STATUS_BUFFER_TOO_SMALL        HIDP_ERROR_CODES( 0xC, 0x0007 )
-#define HIDP_STATUS_INTERNAL_ERROR          HIDP_ERROR_CODES( 0xC, 0x0008 )
-#define HIDP_STATUS_I8042_TRANS_UNKNOWN     HIDP_ERROR_CODES( 0xC, 0x0009 )
-#define HIDP_STATUS_INCOMPATIBLE_REPORT_ID  HIDP_ERROR_CODES( 0xC, 0x000A )
-#define HIDP_STATUS_NOT_VALUE_ARRAY         HIDP_ERROR_CODES( 0xC, 0x000B )
-#define HIDP_STATUS_IS_VALUE_ARRAY          HIDP_ERROR_CODES( 0xC, 0x000C )
-#define HIDP_STATUS_DATA_INDEX_NOT_FOUND    HIDP_ERROR_CODES( 0xC, 0x000D )
-#define HIDP_STATUS_DATA_INDEX_OUT_OF_RANGE HIDP_ERROR_CODES( 0xC, 0x000E )
-#define HIDP_STATUS_BUTTON_NOT_PRESSED      HIDP_ERROR_CODES( 0xC, 0x000F )
-#define HIDP_STATUS_REPORT_DOES_NOT_EXIST   HIDP_ERROR_CODES( 0xC, 0x0010 )
-#define HIDP_STATUS_NOT_IMPLEMENTED         HIDP_ERROR_CODES( 0xC, 0x0020 )
-
+#define HIDP_ERROR_CODES(p1, p2)            ((NTSTATUS)(((p1) << 28) | (0x11 << 16) | (p2)))
+#define HIDP_STATUS_SUCCESS                 HIDP_ERROR_CODES(0x0, 0x0000)
+#define HIDP_STATUS_NULL                    HIDP_ERROR_CODES(0x8, 0x0001)
+#define HIDP_STATUS_INVALID_PREPARSED_DATA  HIDP_ERROR_CODES(0xC, 0x0001)
+#define HIDP_STATUS_INVALID_REPORT_TYPE     HIDP_ERROR_CODES(0xC, 0x0002)
+#define HIDP_STATUS_INVALID_REPORT_LENGTH   HIDP_ERROR_CODES(0xC, 0x0003)
+#define HIDP_STATUS_USAGE_NOT_FOUND         HIDP_ERROR_CODES(0xC, 0x0004)
+#define HIDP_STATUS_VALUE_OUT_OF_RANGE      HIDP_ERROR_CODES(0xC, 0x0005)
+#define HIDP_STATUS_BAD_LOG_PHY_VALUES      HIDP_ERROR_CODES(0xC, 0x0006)
+#define HIDP_STATUS_BUFFER_TOO_SMALL        HIDP_ERROR_CODES(0xC, 0x0007)
+#define HIDP_STATUS_INTERNAL_ERROR          HIDP_ERROR_CODES(0xC, 0x0008)
+#define HIDP_STATUS_I8042_TRANS_UNKNOWN     HIDP_ERROR_CODES(0xC, 0x0009)
+#define HIDP_STATUS_INCOMPATIBLE_REPORT_ID  HIDP_ERROR_CODES(0xC, 0x000A)
+#define HIDP_STATUS_NOT_VALUE_ARRAY         HIDP_ERROR_CODES(0xC, 0x000B)
+#define HIDP_STATUS_IS_VALUE_ARRAY          HIDP_ERROR_CODES(0xC, 0x000C)
+#define HIDP_STATUS_DATA_INDEX_NOT_FOUND    HIDP_ERROR_CODES(0xC, 0x000D)
+#define HIDP_STATUS_DATA_INDEX_OUT_OF_RANGE HIDP_ERROR_CODES(0xC, 0x000E)
+#define HIDP_STATUS_BUTTON_NOT_PRESSED      HIDP_ERROR_CODES(0xC, 0x000F)
+#define HIDP_STATUS_REPORT_DOES_NOT_EXIST   HIDP_ERROR_CODES(0xC, 0x0010)
+#define HIDP_STATUS_NOT_IMPLEMENTED         HIDP_ERROR_CODES(0xC, 0x0020)
 
 extern int WIN_LoadHIDDLL(void);
 extern void WIN_UnloadHIDDLL(void);
 
-typedef BOOLEAN (WINAPI *HidD_GetString_t)(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength);
-typedef NTSTATUS (WINAPI *HidP_GetCaps_t)(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities);
-typedef NTSTATUS (WINAPI *HidP_GetButtonCaps_t)(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData);
-typedef NTSTATUS (WINAPI *HidP_GetValueCaps_t)(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData);
-typedef ULONG (WINAPI *HidP_MaxDataListLength_t)(HIDP_REPORT_TYPE ReportType, PHIDP_PREPARSED_DATA PreparsedData);
-typedef NTSTATUS (WINAPI *HidP_GetData_t)(HIDP_REPORT_TYPE ReportType, PHIDP_DATA DataList, PULONG DataLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength);
+typedef BOOLEAN(WINAPI *HidD_GetString_t)(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength);
+typedef NTSTATUS(WINAPI *HidP_GetCaps_t)(PHIDP_PREPARSED_DATA PreparsedData, PHIDP_CAPS Capabilities);
+typedef NTSTATUS(WINAPI *HidP_GetButtonCaps_t)(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData);
+typedef NTSTATUS(WINAPI *HidP_GetValueCaps_t)(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData);
+typedef ULONG(WINAPI *HidP_MaxDataListLength_t)(HIDP_REPORT_TYPE ReportType, PHIDP_PREPARSED_DATA PreparsedData);
+typedef NTSTATUS(WINAPI *HidP_GetData_t)(HIDP_REPORT_TYPE ReportType, PHIDP_DATA DataList, PULONG DataLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength);
 
 extern HidD_GetString_t SDL_HidD_GetManufacturerString;
 extern HidD_GetString_t SDL_HidD_GetProductString;