From 3b838bc781ca2a314fa51e08389037ebce34a9cc Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Wed, 23 Nov 2022 06:41:49 -0800
Subject: Avoid overriding main with SDL

---
 examples/alffplay.cpp | 3 +++
 examples/alloopback.c | 7 +++++++
 2 files changed, 10 insertions(+)

(limited to 'examples')

diff --git a/examples/alffplay.cpp b/examples/alffplay.cpp
index ef7aa89d..ae40a51a 100644
--- a/examples/alffplay.cpp
+++ b/examples/alffplay.cpp
@@ -57,6 +57,7 @@ constexpr auto AVErrorEOF = AVERROR_EOF;
 struct SwsContext;
 }
 
+#define SDL_MAIN_HANDLED
 #include "SDL.h"
 #ifdef __GNUC__
 _Pragma("GCC diagnostic pop")
@@ -1899,6 +1900,8 @@ std::ostream &operator<<(std::ostream &os, const PrettyTime &rhs)
 
 int main(int argc, char *argv[])
 {
+    SDL_SetMainReady();
+
     std::unique_ptr<MovieState> movState;
 
     if(argc < 2)
diff --git a/examples/alloopback.c b/examples/alloopback.c
index 7513458b..56cd420f 100644
--- a/examples/alloopback.c
+++ b/examples/alloopback.c
@@ -30,6 +30,7 @@
 #include <math.h>
 #include <stdio.h>
 
+#define SDL_MAIN_HANDLED
 #include "SDL.h"
 #include "SDL_audio.h"
 #include "SDL_error.h"
@@ -141,6 +142,8 @@ int main(int argc, char *argv[])
     (void)argc;
     (void)argv;
 
+    SDL_SetMainReady();
+
     /* Print out error if extension is missing. */
     if(!alcIsExtensionPresent(NULL, "ALC_SOFT_loopback"))
     {
@@ -197,6 +200,10 @@ int main(int argc, char *argv[])
         attrs[3] = ALC_UNSIGNED_SHORT_SOFT;
     else if(obtained.format == AUDIO_S16SYS)
         attrs[3] = ALC_SHORT_SOFT;
+    else if(obtained.format == AUDIO_S32SYS)
+        attrs[3] = ALC_INT_SOFT;
+    else if(obtained.format == AUDIO_F32SYS)
+        attrs[3] = ALC_FLOAT_SOFT;
     else
     {
         fprintf(stderr, "Unhandled SDL format: 0x%04x\n", obtained.format);
-- 
cgit v1.2.3