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.
This commit is contained in:
NRK
2023-10-19 20:26:26 +06:00
committed by sfan5
parent 450a69b1d6
commit d05ef7fdc4
25 changed files with 72 additions and 68 deletions

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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 */