Pass on atomic usage

Signed-off-by: Andrew Opalach <andrew@akon.city>

2 files changed, 21 insertions, 20 deletions

diff --git a/src/render/meson.build b/src/render/meson.build
index a7ccb58..d0ad643 100644
--- a/src/render/meson.build
+++ b/src/render/meson.build
@@ -169,6 +169,23 @@ if get_option('subtitles').enabled()
   endif
   if not libass_found
     libass_opts = ['test=disabled']
+    # freetype2(42608f7):meson.build:346
+    harfbuz = dependency('harfbuzz',
+      version: '>=2.0.0',
+      default_options: [
+        'glib=disabled',
+        'gobject=disabled',
+        'cairo=disabled',
+        'chafa=disabled',
+        'icu=disabled',
+        'freetype=disabled',
+        # This does not override yield, and yielding breaks the build if tests=enabled.
+        # https://github.com/mesonbuild/meson/issues/5214
+        'tests=disabled',
+        'introspection=disabled',
+        'docs=disabled',
+        'utilities=disabled'
+      ])
     if not is_windows
       libass_opts += ['fontconfig=enabled']
       # libass(e46aede):meson.build:126
@@ -179,7 +196,8 @@ if get_option('subtitles').enabled()
           'nls=disabled',
           'tests=disabled',
           'tools=disabled',
-          'cache-build=disabled'
+          'cache-build=disabled',
+          'xml-backend=libxml2'
         ])
     else
       libass_opts += ['directwrite=enabled']
@@ -204,23 +222,6 @@ if get_option('subtitles').enabled()
         'tests=false',
         'bin=false'
       ])
-    # freetype2(42608f7):meson.build:346
-    harfbuz = dependency('harfbuzz',
-      version: '>=2.0.0',
-      default_options: [
-        'glib=disabled',
-        'gobject=disabled',
-        'cairo=disabled',
-        'chafa=disabled',
-        'icu=disabled',
-        'freetype=disabled',
-        # This does not override yield, and yielding breaks the build if tests=enabled.
-        # https://github.com/mesonbuild/meson/issues/5214
-        'tests=disabled',
-        'introspection=disabled',
-        'docs=disabled',
-        'utilities=disabled'
-      ])
     libass = dependency('libass', default_options: libass_opts)
   endif
   render_deps += [libass]
diff --git a/src/render/renderer_libplacebo.c b/src/render/renderer_libplacebo.c
index 01aa764..3551979 100644
--- a/src/render/renderer_libplacebo.c
+++ b/src/render/renderer_libplacebo.c
@@ -376,7 +376,7 @@ static bool renderer_lp_render(struct camu_renderer *renderer, struct camu_scree
     struct camu_renderer_lp *lr = (struct camu_renderer_lp *)renderer;
 
 #ifdef CAMU_SCREEN_THREADED
-    if (al_atomic_load(u8)(&scr->queued, AL_ATOMIC_RELAXED)) {
+    if (atomic_load(bool)(&scr->queued, AL_ATOMIC_RELAXED)) {
         camu_screen_run_queue(scr);
     }
 #endif
@@ -478,7 +478,7 @@ static bool renderer_lp_render(struct camu_renderer *renderer, struct camu_scree
         }
         if (any_eof) {
 #ifdef CAMU_SCREEN_THREADED
-            if (al_atomic_load(u8)(&scr->queued, AL_ATOMIC_RELAXED)) {
+            if (atomic_load(bool)(&scr->queued, AL_ATOMIC_RELAXED)) {
                 camu_screen_run_queue(scr);
             }
 #endif