mirror of https://github.com/mpv-player/mpv
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.
This commit is contained in:
parent
2fa695c3f9
commit
2070331f64
|
@ -20,6 +20,8 @@
|
||||||
|
|
||||||
#include <AudioToolbox/AudioToolbox.h>
|
#include <AudioToolbox/AudioToolbox.h>
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
struct mp_chmap;
|
struct mp_chmap;
|
||||||
|
|
||||||
int ca_label_to_mp_speaker_id(AudioChannelLabel label);
|
int ca_label_to_mp_speaker_id(AudioChannelLabel label);
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
#include "audio/format.h"
|
#include "audio/format.h"
|
||||||
#include "osdep/timer.h"
|
#include "osdep/timer.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
#include "options/m_option.h"
|
#include "options/m_option.h"
|
||||||
#include "common/msg.h"
|
#include "common/msg.h"
|
||||||
#include "audio/out/ao_coreaudio_chmap.h"
|
#include "audio/out/ao_coreaudio_chmap.h"
|
||||||
|
|
|
@ -22,6 +22,8 @@
|
||||||
#include <AudioToolbox/AudioToolbox.h>
|
#include <AudioToolbox/AudioToolbox.h>
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
#include "common/msg.h"
|
#include "common/msg.h"
|
||||||
#include "audio/out/ao.h"
|
#include "audio/out/ao.h"
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
#include "ao.h"
|
#include "ao.h"
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
#include "audio/format.h"
|
#include "audio/format.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
#include "osdep/timer.h"
|
#include "osdep/timer.h"
|
||||||
#include "options/m_config.h"
|
#include "options/m_config.h"
|
||||||
#include "options/m_option.h"
|
#include "options/m_option.h"
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#include <endpointvolume.h>
|
#include <endpointvolume.h>
|
||||||
|
|
||||||
#include "common/msg.h"
|
#include "common/msg.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
#include "osdep/windows_utils.h"
|
#include "osdep/windows_utils.h"
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
#include "ao.h"
|
#include "ao.h"
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
|
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
#include "audio/out/ao.h"
|
#include "audio/out/ao.h"
|
||||||
|
|
||||||
/* global data used by ao.c and ao drivers */
|
/* global data used by ao.c and ao drivers */
|
||||||
|
@ -63,7 +63,7 @@ struct ao {
|
||||||
atomic_uint events_;
|
atomic_uint events_;
|
||||||
|
|
||||||
// Float gain multiplicator
|
// Float gain multiplicator
|
||||||
mp_atomic_float gain;
|
_Atomic float gain;
|
||||||
|
|
||||||
int buffer;
|
int buffer;
|
||||||
double def_buffer;
|
double def_buffer;
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#include "mpv_talloc.h"
|
#include "mpv_talloc.h"
|
||||||
|
|
||||||
#include "misc/bstr.h"
|
#include "misc/bstr.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
#include "common/common.h"
|
#include "common/common.h"
|
||||||
#include "common/global.h"
|
#include "common/global.h"
|
||||||
#include "misc/bstr.h"
|
#include "misc/bstr.h"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
#include "misc/node.h"
|
#include "misc/node.h"
|
||||||
#include "msg.h"
|
#include "msg.h"
|
||||||
#include "options/m_option.h"
|
#include "options/m_option.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
#include "osdep/timer.h"
|
#include "osdep/timer.h"
|
||||||
#include "stats.h"
|
#include "stats.h"
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
#include "common/stats.h"
|
#include "common/stats.h"
|
||||||
#include "misc/charset_conv.h"
|
#include "misc/charset_conv.h"
|
||||||
#include "misc/thread_tools.h"
|
#include "misc/thread_tools.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
#include "osdep/timer.h"
|
#include "osdep/timer.h"
|
||||||
#include "osdep/threads.h"
|
#include "osdep/threads.h"
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include "audio/aframe.h"
|
#include "audio/aframe.h"
|
||||||
#include "common/common.h"
|
#include "common/common.h"
|
||||||
#include "common/msg.h"
|
#include "common/msg.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
|
|
||||||
#include "f_async_queue.h"
|
#include "f_async_queue.h"
|
||||||
#include "filter_internal.h"
|
#include "filter_internal.h"
|
||||||
|
@ -16,7 +16,7 @@ struct mp_async_queue {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct async_queue {
|
struct async_queue {
|
||||||
mp_atomic_uint64 refcount;
|
_Atomic uint64_t refcount;
|
||||||
|
|
||||||
pthread_mutex_t lock;
|
pthread_mutex_t lock;
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include "common/common.h"
|
#include "common/common.h"
|
||||||
#include "common/global.h"
|
#include "common/global.h"
|
||||||
#include "common/msg.h"
|
#include "common/msg.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
#include "osdep/timer.h"
|
#include "osdep/timer.h"
|
||||||
#include "video/hwdec.h"
|
#include "video/hwdec.h"
|
||||||
#include "video/img_format.h"
|
#include "video/img_format.h"
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
|
|
||||||
#include "common/common.h"
|
#include "common/common.h"
|
||||||
#include "misc/linked_list.h"
|
#include "misc/linked_list.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
#include "osdep/io.h"
|
#include "osdep/io.h"
|
||||||
#include "osdep/timer.h"
|
#include "osdep/timer.h"
|
||||||
|
|
||||||
|
|
|
@ -31,13 +31,13 @@
|
||||||
#include "common/msg.h"
|
#include "common/msg.h"
|
||||||
#include "common/msg_control.h"
|
#include "common/msg_control.h"
|
||||||
#include "misc/dispatch.h"
|
#include "misc/dispatch.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
|
|
||||||
// For use with m_config_cache.
|
// For use with m_config_cache.
|
||||||
struct m_config_shadow {
|
struct m_config_shadow {
|
||||||
pthread_mutex_t lock;
|
pthread_mutex_t lock;
|
||||||
// Incremented on every option change.
|
// Incremented on every option change.
|
||||||
mp_atomic_uint64 ts;
|
_Atomic uint64_t ts;
|
||||||
// -- immutable after init
|
// -- immutable after init
|
||||||
// List of m_sub_options instances.
|
// List of m_sub_options instances.
|
||||||
// Index 0 is the top-level and is always present.
|
// Index 0 is the top-level and is always present.
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
#include "common/msg_control.h"
|
#include "common/msg_control.h"
|
||||||
#include "misc/dispatch.h"
|
#include "misc/dispatch.h"
|
||||||
#include "misc/node.h"
|
#include "misc/node.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
|
|
||||||
extern const char mp_help_text[];
|
extern const char mp_help_text[];
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#include "misc/bstr.h"
|
#include "misc/bstr.h"
|
||||||
#include "misc/dispatch.h"
|
#include "misc/dispatch.h"
|
||||||
#include "options/m_option.h"
|
#include "options/m_option.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
|
|
||||||
// m_config provides an API to manipulate the config variables in MPlayer.
|
// 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
|
// It makes use of the Options API to provide a context stack that
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
/*
|
|
||||||
* This file is part of mpv.
|
|
||||||
* Copyright (c) 2013 Stefano Pigozzi <stefano.pigozzi@gmail.com>
|
|
||||||
*
|
|
||||||
* mpv is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* mpv is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef MP_ATOMIC_H
|
|
||||||
#define MP_ATOMIC_H
|
|
||||||
|
|
||||||
#include <inttypes.h>
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#include <stdatomic.h>
|
|
||||||
typedef _Atomic float mp_atomic_float;
|
|
||||||
typedef _Atomic double mp_atomic_double;
|
|
||||||
typedef _Atomic int64_t mp_atomic_int64;
|
|
||||||
typedef _Atomic uint64_t mp_atomic_uint64;
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include <dxgi1_2.h>
|
#include <dxgi1_2.h>
|
||||||
|
|
||||||
#include "common/common.h"
|
#include "common/common.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
#include "windows_utils.h"
|
#include "windows_utils.h"
|
||||||
|
|
||||||
char *mp_GUID_to_str_buf(char *buf, size_t buf_size, const GUID *guid)
|
char *mp_GUID_to_str_buf(char *buf, size_t buf_size, const GUID *guid)
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
#include "options/m_property.h"
|
#include "options/m_property.h"
|
||||||
#include "options/path.h"
|
#include "options/path.h"
|
||||||
#include "options/parse_configfile.h"
|
#include "options/parse_configfile.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
#include "osdep/threads.h"
|
#include "osdep/threads.h"
|
||||||
#include "osdep/timer.h"
|
#include "osdep/timer.h"
|
||||||
#include "osdep/io.h"
|
#include "osdep/io.h"
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
|
|
||||||
#include "libmpv/client.h"
|
#include "libmpv/client.h"
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
|
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
#include "osd.h"
|
#include "osd.h"
|
||||||
|
|
||||||
enum mp_osdtype {
|
enum mp_osdtype {
|
||||||
|
@ -71,7 +71,7 @@ struct osd_state {
|
||||||
struct osd_object *objs[MAX_OSD_PARTS];
|
struct osd_object *objs[MAX_OSD_PARTS];
|
||||||
|
|
||||||
bool render_subs_in_filter;
|
bool render_subs_in_filter;
|
||||||
mp_atomic_double force_video_pts;
|
_Atomic double force_video_pts;
|
||||||
|
|
||||||
bool want_redraw;
|
bool want_redraw;
|
||||||
bool want_redraw_notification;
|
bool want_redraw_notification;
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
#import "video/out/cocoa/mpvadapter.h"
|
#import "video/out/cocoa/mpvadapter.h"
|
||||||
|
|
||||||
#include "osdep/threads.h"
|
#include "osdep/threads.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
#include "osdep/macosx_compat.h"
|
#include "osdep/macosx_compat.h"
|
||||||
#include "osdep/macosx_events_objc.h"
|
#include "osdep/macosx_events_objc.h"
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
#include "mpv_talloc.h"
|
#include "mpv_talloc.h"
|
||||||
#include "misc/dispatch.h"
|
#include "misc/dispatch.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
#include "video/mp_image.h"
|
#include "video/mp_image.h"
|
||||||
|
|
||||||
#include "dr_helper.h"
|
#include "dr_helper.h"
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include <EGL/eglext.h>
|
#include <EGL/eglext.h>
|
||||||
|
|
||||||
#include "common/common.h"
|
#include "common/common.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
#include "video/out/win_state.h"
|
#include "video/out/win_state.h"
|
||||||
#include "context.h"
|
#include "context.h"
|
||||||
#include "egl_helpers.h"
|
#include "egl_helpers.h"
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#include "mpv_talloc.h"
|
#include "mpv_talloc.h"
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
#include "osdep/timer.h"
|
#include "osdep/timer.h"
|
||||||
#include "osdep/threads.h"
|
#include "osdep/threads.h"
|
||||||
#include "misc/dispatch.h"
|
#include "misc/dispatch.h"
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
#include "vo.h"
|
#include "vo.h"
|
||||||
#include "video/mp_image.h"
|
#include "video/mp_image.h"
|
||||||
#include "sub/osd.h"
|
#include "sub/osd.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
#include "osdep/timer.h"
|
#include "osdep/timer.h"
|
||||||
|
|
||||||
#include "common/global.h"
|
#include "common/global.h"
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
#include "osdep/io.h"
|
#include "osdep/io.h"
|
||||||
#include "osdep/threads.h"
|
#include "osdep/threads.h"
|
||||||
#include "osdep/w32_keyboard.h"
|
#include "osdep/w32_keyboard.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
#include "misc/dispatch.h"
|
#include "misc/dispatch.h"
|
||||||
#include "misc/rendezvous.h"
|
#include "misc/rendezvous.h"
|
||||||
#include "mpv_talloc.h"
|
#include "mpv_talloc.h"
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#include "common/common.h"
|
#include "common/common.h"
|
||||||
#include "input/input.h"
|
#include "input/input.h"
|
||||||
#include "input/event.h"
|
#include "input/event.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
#include "osdep/io.h"
|
#include "osdep/io.h"
|
||||||
#include "osdep/windows_utils.h"
|
#include "osdep/windows_utils.h"
|
||||||
#include "mpv_talloc.h"
|
#include "mpv_talloc.h"
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include <X11/Xutil.h>
|
#include <X11/Xutil.h>
|
||||||
|
|
||||||
#include "common/common.h"
|
#include "common/common.h"
|
||||||
#include "osdep/atomic.h"
|
#include <stdatomic.h>
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#if !HAVE_GPL
|
#if !HAVE_GPL
|
||||||
|
|
Loading…
Reference in New Issue