diff options
| author | NRK <nrk@disroot.org> | 2023-10-19 20:26:26 +0600 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2023-10-20 21:31:09 +0200 |
| commit | d05ef7fdc4eb527a940a1ec7449e8c5bf60f5862 (patch) | |
| tree | 49a5e8f5bd1c07d890c8944728ee4985b68686f7 /audio/out | |
| parent | 450a69b1d6592d8bc45c28250b86ba4a8b1d8e54 (diff) | |
| download | mpv-d05ef7fdc4eb527a940a1ec7449e8c5bf60f5862.tar.bz2 mpv-d05ef7fdc4eb527a940a1ec7449e8c5bf60f5862.tar.xz | |
various: sort some standard headers
since i was going to fix the include order of stdatomic, might as well
sort the surrouding includes in accordance with the project's coding
style.
some headers can sometime require specific include order. standard
library headers usually don't. but mpv might "hack into" the standard
headers (e.g pthreads) so that complicates things a bit more.
hopefully nothing breaks. if it does, the style guide is to blame.
Diffstat (limited to 'audio/out')
| -rw-r--r-- | audio/out/ao_coreaudio_exclusive.c | 3 | ||||
| -rw-r--r-- | audio/out/ao_jack.c | 2 | ||||
| -rw-r--r-- | audio/out/ao_wasapi.h | 3 | ||||
| -rw-r--r-- | audio/out/internal.h | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/audio/out/ao_coreaudio_exclusive.c b/audio/out/ao_coreaudio_exclusive.c index ccd8a7d3d0..e24f791574 100644 --- a/audio/out/ao_coreaudio_exclusive.c +++ b/audio/out/ao_coreaudio_exclusive.c @@ -34,6 +34,8 @@ * when you are wanting to do good buffering of audio). */ +#include <stdatomic.h> + #include <CoreAudio/HostTime.h> #include <libavutil/intreadwrite.h> @@ -43,7 +45,6 @@ #include "internal.h" #include "audio/format.h" #include "osdep/timer.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_jack.c b/audio/out/ao_jack.c index 5795e2b224..412e91d626 100644 --- a/audio/out/ao_jack.c +++ b/audio/out/ao_jack.c @@ -22,6 +22,7 @@ * with mpv. If not, see <http://www.gnu.org/licenses/>. */ +#include <stdatomic.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -33,7 +34,6 @@ #include "ao.h" #include "internal.h" #include "audio/format.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 58840f169d..17b8f7a6d7 100644 --- a/audio/out/ao_wasapi.h +++ b/audio/out/ao_wasapi.h @@ -20,8 +20,10 @@ #ifndef MP_AO_WASAPI_H_ #define MP_AO_WASAPI_H_ +#include <stdatomic.h> #include <stdlib.h> #include <stdbool.h> + #include <windows.h> #include <mmdeviceapi.h> #include <audioclient.h> @@ -29,7 +31,6 @@ #include <endpointvolume.h> #include "common/msg.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 646132634b..182b2cbc93 100644 --- a/audio/out/internal.h +++ b/audio/out/internal.h @@ -18,10 +18,10 @@ #ifndef MP_AO_INTERNAL_H_ #define MP_AO_INTERNAL_H_ -#include <stdbool.h> #include <pthread.h> - #include <stdatomic.h> +#include <stdbool.h> + #include "audio/out/ao.h" /* global data used by ao.c and ao drivers */ |