Simplify automating closing devices in examples

kcat · Sep 20, 2024 · 72e6db0 · 72e6db0
1 parent 5435317
commit 72e6db0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 22 deletions.
diff --git a/examples/allafplay.cpp b/examples/allafplay.cpp
@@ -877,16 +877,11 @@ auto main(al::span<std::string_view> args) -> int
     }
     args = args.subspan(1);
 
-    /* A simple RAII container for OpenAL startup and shutdown. */
-    struct AudioManager {
-        AudioManager(al::span<std::string_view> &args_)
-        {
-            if(InitAL(args_) != 0)
-                throw std::runtime_error{"Failed to initialize OpenAL"};
-        }
-        ~AudioManager() { CloseAL(); }
-    };
-    AudioManager almgr{args};
+    if(InitAL(args) != 0)
+        throw std::runtime_error{"Failed to initialize OpenAL"};
+    /* A simple RAII container for automating OpenAL shutdown. */
+    struct AudioManager { ~AudioManager() { CloseAL(); } };
+    AudioManager almgr;
 
     std::for_each(args.begin(), args.end(), PlayLAF);
 

diff --git a/examples/alstreamcb.cpp b/examples/alstreamcb.cpp
@@ -486,26 +486,20 @@ struct StreamPlayer {
 
 int main(al::span<std::string_view> args)
 {
-    /* A simple RAII container for OpenAL startup and shutdown. */
-    struct AudioManager {
-        AudioManager(al::span<std::string_view> &args_)
-        {
-            if(InitAL(args_) != 0)
-                throw std::runtime_error{"Failed to initialize OpenAL"};
-        }
-        ~AudioManager() { CloseAL(); }
-    };
-
     /* Print out usage if no arguments were specified */
     if(args.size() < 2)
     {
         fprintf(stderr, "Usage: %.*s [-device <name>] <filenames...>\n", al::sizei(args[0]),
             args[0].data());
         return 1;
     }
-
     args = args.subspan(1);
-    AudioManager almgr{args};
+
+    if(InitAL(args) != 0)
+        throw std::runtime_error{"Failed to initialize OpenAL"};
+    /* A simple RAII container for automating OpenAL shutdown. */
+    struct AudioManager { ~AudioManager() { CloseAL(); } };
+    AudioManager almgr;
 
     if(!alIsExtensionPresent("AL_SOFT_callback_buffer"))
     {