diff options
| author | NRK <nrk@disroot.org> | 2023-10-19 18:18:52 +0600 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2023-10-20 21:31:09 +0200 |
| commit | 2070331f649a1e19021d62d4e3a176dcd40732f4 (patch) | |
| tree | a41f1f4931ba1e3d4ae242be285eee18de650f38 /audio/out | |
| parent | 2fa695c3f9d4164344228ef4083e87369de3bb33 (diff) | |
| download | mpv-2070331f649a1e19021d62d4e3a176dcd40732f4.tar.bz2 mpv-2070331f649a1e19021d62d4e3a176dcd40732f4.tar.xz | |
osdep: remove atomic.h
replace it with <stdatomic.h> and replace the mp_atomic_* typedefs with
explicit _Atomic qualified types.
also add missing config.h includes on some files.
Diffstat (limited to 'audio/out')
| -rw-r--r-- | audio/out/ao_coreaudio_chmap.h | 2 | ||||
| -rw-r--r-- | audio/out/ao_coreaudio_exclusive.c | 2 | ||||
| -rw-r--r-- | audio/out/ao_coreaudio_utils.h | 2 | ||||
| -rw-r--r-- | audio/out/ao_jack.c | 2 | ||||
| -rw-r--r-- | audio/out/ao_wasapi.h | 2 | ||||
| -rw-r--r-- | audio/out/internal.h | 4 |
6 files changed, 9 insertions, 5 deletions
diff --git a/audio/out/ao_coreaudio_chmap.h b/audio/out/ao_coreaudio_chmap.h index d71dee02ce..b6d160c546 100644 --- a/audio/out/ao_coreaudio_chmap.h +++ b/audio/out/ao_coreaudio_chmap.h @@ -20,6 +20,8 @@ #include <AudioToolbox/AudioToolbox.h> +#include "config.h" + struct mp_chmap; int ca_label_to_mp_speaker_id(AudioChannelLabel label); diff --git a/audio/out/ao_coreaudio_exclusive.c b/audio/out/ao_coreaudio_exclusive.c index 821e9547f5..ccd8a7d3d0 100644 --- a/audio/out/ao_coreaudio_exclusive.c +++ b/audio/out/ao_coreaudio_exclusive.c @@ -43,7 +43,7 @@ #include "internal.h" #include "audio/format.h" #include "osdep/timer.h" -#include "osdep/atomic.h" +#include <stdatomic.h> #include "options/m_option.h" #include "common/msg.h" #include "audio/out/ao_coreaudio_chmap.h" diff --git a/audio/out/ao_coreaudio_utils.h b/audio/out/ao_coreaudio_utils.h index d7532e3051..0e2b8b1f64 100644 --- a/audio/out/ao_coreaudio_utils.h +++ b/audio/out/ao_coreaudio_utils.h @@ -22,6 +22,8 @@ #include <AudioToolbox/AudioToolbox.h> #include <inttypes.h> #include <stdbool.h> + +#include "config.h" #include "common/msg.h" #include "audio/out/ao.h" #include "internal.h" diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c index 0c9ab8e0a5..5795e2b224 100644 --- a/audio/out/ao_jack.c +++ b/audio/out/ao_jack.c @@ -33,7 +33,7 @@ #include "ao.h" #include "internal.h" #include "audio/format.h" -#include "osdep/atomic.h" +#include <stdatomic.h> #include "osdep/timer.h" #include "options/m_config.h" #include "options/m_option.h" diff --git a/audio/out/ao_wasapi.h b/audio/out/ao_wasapi.h index 3cf91f5418..58840f169d 100644 --- a/audio/out/ao_wasapi.h +++ b/audio/out/ao_wasapi.h @@ -29,7 +29,7 @@ #include <endpointvolume.h> #include "common/msg.h" -#include "osdep/atomic.h" +#include <stdatomic.h> #include "osdep/windows_utils.h" #include "internal.h" #include "ao.h" diff --git a/audio/out/internal.h b/audio/out/internal.h index 7736d3174b..646132634b 100644 --- a/audio/out/internal.h +++ b/audio/out/internal.h @@ -21,7 +21,7 @@ #include <stdbool.h> #include <pthread.h> -#include "osdep/atomic.h" +#include <stdatomic.h> #include "audio/out/ao.h" /* global data used by ao.c and ao drivers */ @@ -63,7 +63,7 @@ struct ao { atomic_uint events_; // Float gain multiplicator - mp_atomic_float gain; + _Atomic float gain; int buffer; double def_buffer; |