mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-19 19:42:24 +02:00
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:
parent
450a69b1d6
commit
d05ef7fdc4
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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 */
|
||||
|
12
common/msg.c
12
common/msg.c
@ -15,19 +15,19 @@
|
||||
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <assert.h>
|
||||
#include <pthread.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdatomic.h>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "mpv_talloc.h"
|
||||
|
||||
#include "misc/bstr.h"
|
||||
#include <stdatomic.h>
|
||||
#include "common/common.h"
|
||||
#include "common/global.h"
|
||||
#include "misc/bstr.h"
|
||||
|
@ -1,4 +1,5 @@
|
||||
#include <pthread.h>
|
||||
#include <stdatomic.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
@ -8,7 +9,6 @@
|
||||
#include "misc/node.h"
|
||||
#include "msg.h"
|
||||
#include "options/m_option.h"
|
||||
#include <stdatomic.h>
|
||||
#include "osdep/timer.h"
|
||||
#include "stats.h"
|
||||
|
||||
|
@ -15,15 +15,16 @@
|
||||
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <assert.h>
|
||||
#include <float.h>
|
||||
#include <limits.h>
|
||||
#include <pthread.h>
|
||||
#include <stdatomic.h>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
#include <unistd.h>
|
||||
#include <limits.h>
|
||||
#include <pthread.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include <math.h>
|
||||
|
||||
@ -42,7 +43,6 @@
|
||||
#include "common/stats.h"
|
||||
#include "misc/charset_conv.h"
|
||||
#include "misc/thread_tools.h"
|
||||
#include <stdatomic.h>
|
||||
#include "osdep/timer.h"
|
||||
#include "osdep/threads.h"
|
||||
|
||||
|
@ -1,10 +1,10 @@
|
||||
#include <limits.h>
|
||||
#include <pthread.h>
|
||||
#include <stdatomic.h>
|
||||
|
||||
#include "audio/aframe.h"
|
||||
#include "common/common.h"
|
||||
#include "common/msg.h"
|
||||
#include <stdatomic.h>
|
||||
|
||||
#include "f_async_queue.h"
|
||||
#include "filter_internal.h"
|
||||
|
@ -1,12 +1,12 @@
|
||||
#include <math.h>
|
||||
#include <pthread.h>
|
||||
#include <stdatomic.h>
|
||||
|
||||
#include <libavutil/hwcontext.h>
|
||||
|
||||
#include "common/common.h"
|
||||
#include "common/global.h"
|
||||
#include "common/msg.h"
|
||||
#include <stdatomic.h>
|
||||
#include "osdep/timer.h"
|
||||
#include "video/hwdec.h"
|
||||
#include "video/img_format.h"
|
||||
|
@ -14,10 +14,11 @@
|
||||
*/
|
||||
|
||||
#include <assert.h>
|
||||
#include <errno.h>
|
||||
#include <stdatomic.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
|
||||
#ifdef __MINGW32__
|
||||
#include <windows.h>
|
||||
@ -27,7 +28,6 @@
|
||||
|
||||
#include "common/common.h"
|
||||
#include "misc/linked_list.h"
|
||||
#include <stdatomic.h>
|
||||
#include "osdep/io.h"
|
||||
#include "osdep/timer.h"
|
||||
|
||||
|
@ -15,14 +15,15 @@
|
||||
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
#include <errno.h>
|
||||
#include <pthread.h>
|
||||
#include <stdatomic.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <strings.h>
|
||||
#include <assert.h>
|
||||
#include <stdbool.h>
|
||||
#include <pthread.h>
|
||||
|
||||
#include "m_config_core.h"
|
||||
#include "options/m_option.h"
|
||||
@ -31,7 +32,6 @@
|
||||
#include "common/msg.h"
|
||||
#include "common/msg_control.h"
|
||||
#include "misc/dispatch.h"
|
||||
#include <stdatomic.h>
|
||||
|
||||
// For use with m_config_cache.
|
||||
struct m_config_shadow {
|
||||
|
@ -15,15 +15,16 @@
|
||||
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <float.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
#include <errno.h>
|
||||
#include <float.h>
|
||||
#include <pthread.h>
|
||||
#include <stdatomic.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <strings.h>
|
||||
#include <assert.h>
|
||||
#include <stdbool.h>
|
||||
#include <pthread.h>
|
||||
|
||||
#include "libmpv/client.h"
|
||||
|
||||
@ -36,7 +37,6 @@
|
||||
#include "common/msg_control.h"
|
||||
#include "misc/dispatch.h"
|
||||
#include "misc/node.h"
|
||||
#include <stdatomic.h>
|
||||
|
||||
extern const char mp_help_text[];
|
||||
|
||||
|
@ -17,9 +17,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <stdatomic.h>
|
||||
#include <stdbool.h>
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
#include "common/common.h"
|
||||
#include "common/global.h"
|
||||
@ -29,7 +30,6 @@
|
||||
#include "misc/bstr.h"
|
||||
#include "misc/dispatch.h"
|
||||
#include "options/m_option.h"
|
||||
#include <stdatomic.h>
|
||||
|
||||
// m_config provides an API to manipulate the config variables in MPlayer.
|
||||
// It makes use of the Options API to provide a context stack that
|
||||
|
@ -15,8 +15,9 @@
|
||||
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <inttypes.h>
|
||||
#include <stdatomic.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include <windows.h>
|
||||
#include <errors.h>
|
||||
@ -25,7 +26,6 @@
|
||||
#include <dxgi1_2.h>
|
||||
|
||||
#include "common/common.h"
|
||||
#include <stdatomic.h>
|
||||
#include "windows_utils.h"
|
||||
|
||||
char *mp_GUID_to_str_buf(char *buf, size_t buf_size, const GUID *guid)
|
||||
|
@ -13,14 +13,15 @@
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <assert.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <math.h>
|
||||
#include <stdatomic.h>
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
#include <math.h>
|
||||
#include <assert.h>
|
||||
|
||||
#include "common/common.h"
|
||||
#include "common/global.h"
|
||||
@ -39,7 +40,6 @@
|
||||
#include "options/m_property.h"
|
||||
#include "options/path.h"
|
||||
#include "options/parse_configfile.h"
|
||||
#include <stdatomic.h>
|
||||
#include "osdep/threads.h"
|
||||
#include "osdep/timer.h"
|
||||
#include "osdep/io.h"
|
||||
|
@ -19,9 +19,8 @@
|
||||
#define MPLAYER_MP_CORE_H
|
||||
|
||||
#include <pthread.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
#include <stdatomic.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
#include "libmpv/client.h"
|
||||
|
||||
|
@ -2,8 +2,8 @@
|
||||
#define MP_OSD_STATE_H_
|
||||
|
||||
#include <pthread.h>
|
||||
|
||||
#include <stdatomic.h>
|
||||
|
||||
#include "osd.h"
|
||||
|
||||
enum mp_osdtype {
|
||||
|
@ -17,6 +17,8 @@
|
||||
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <stdatomic.h>
|
||||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
#import <IOKit/pwr_mgt/IOPMLib.h>
|
||||
#import <IOKit/IOKitLib.h>
|
||||
@ -30,7 +32,6 @@
|
||||
#import "video/out/cocoa/mpvadapter.h"
|
||||
|
||||
#include "osdep/threads.h"
|
||||
#include <stdatomic.h>
|
||||
#include "osdep/macosx_compat.h"
|
||||
#include "osdep/macosx_events_objc.h"
|
||||
|
||||
|
@ -1,12 +1,12 @@
|
||||
#include <stdlib.h>
|
||||
#include <assert.h>
|
||||
#include <pthread.h>
|
||||
#include <stdatomic.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <libavutil/buffer.h>
|
||||
|
||||
#include "mpv_talloc.h"
|
||||
#include "misc/dispatch.h"
|
||||
#include <stdatomic.h>
|
||||
#include "video/mp_image.h"
|
||||
|
||||
#include "dr_helper.h"
|
||||
|
@ -15,8 +15,9 @@
|
||||
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <stddef.h>
|
||||
#include <assert.h>
|
||||
#include <stdatomic.h>
|
||||
#include <stddef.h>
|
||||
|
||||
#include <bcm_host.h>
|
||||
|
||||
@ -24,7 +25,6 @@
|
||||
#include <EGL/eglext.h>
|
||||
|
||||
#include "common/common.h"
|
||||
#include <stdatomic.h>
|
||||
#include "video/out/win_state.h"
|
||||
#include "context.h"
|
||||
#include "egl_helpers.h"
|
||||
|
@ -15,18 +15,18 @@
|
||||
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <assert.h>
|
||||
#include <math.h>
|
||||
#include <pthread.h>
|
||||
#include <stdatomic.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <assert.h>
|
||||
#include <stdbool.h>
|
||||
#include <pthread.h>
|
||||
#include <math.h>
|
||||
|
||||
#include "mpv_talloc.h"
|
||||
|
||||
#include "config.h"
|
||||
#include <stdatomic.h>
|
||||
#include "osdep/timer.h"
|
||||
#include "osdep/threads.h"
|
||||
#include "misc/dispatch.h"
|
||||
|
@ -1,11 +1,12 @@
|
||||
#include <assert.h>
|
||||
#include <limits.h>
|
||||
#include <math.h>
|
||||
#include <pthread.h>
|
||||
#include <stdatomic.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
#include <stdbool.h>
|
||||
#include <limits.h>
|
||||
#include <pthread.h>
|
||||
#include <assert.h>
|
||||
|
||||
#include "mpv_talloc.h"
|
||||
#include "common/common.h"
|
||||
@ -19,7 +20,6 @@
|
||||
#include "vo.h"
|
||||
#include "video/mp_image.h"
|
||||
#include "sub/osd.h"
|
||||
#include <stdatomic.h>
|
||||
#include "osdep/timer.h"
|
||||
|
||||
#include "common/global.h"
|
||||
|
@ -15,10 +15,12 @@
|
||||
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
#include <limits.h>
|
||||
#include <pthread.h>
|
||||
#include <assert.h>
|
||||
#include <stdatomic.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include <windows.h>
|
||||
#include <windowsx.h>
|
||||
#include <dwmapi.h>
|
||||
@ -42,7 +44,6 @@
|
||||
#include "osdep/io.h"
|
||||
#include "osdep/threads.h"
|
||||
#include "osdep/w32_keyboard.h"
|
||||
#include <stdatomic.h>
|
||||
#include "misc/dispatch.h"
|
||||
#include "misc/rendezvous.h"
|
||||
#include "mpv_talloc.h"
|
||||
|
@ -14,6 +14,7 @@
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include <stdatomic.h>
|
||||
|
||||
#include <windows.h>
|
||||
#include <ole2.h>
|
||||
@ -23,7 +24,6 @@
|
||||
#include "common/common.h"
|
||||
#include "input/input.h"
|
||||
#include "input/event.h"
|
||||
#include <stdatomic.h>
|
||||
#include "osdep/io.h"
|
||||
#include "osdep/windows_utils.h"
|
||||
#include "mpv_talloc.h"
|
||||
|
@ -18,13 +18,14 @@
|
||||
#ifndef MPLAYER_X11_COMMON_H
|
||||
#define MPLAYER_X11_COMMON_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdatomic.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
|
||||
#include "common/common.h"
|
||||
#include <stdatomic.h>
|
||||
|
||||
#include "config.h"
|
||||
#if !HAVE_GPL
|
||||
|
Loading…
Reference in New Issue
Block a user