mirror of https://github.com/mpv-player/mpv
various: make mentions of macOS consistent
change all mentions and variations of OSX, OS X, MacOSX, MacOS X, etc consistent. use the official naming macOS.
This commit is contained in:
parent
d6fdc0ae74
commit
d954646d29
|
@ -67,7 +67,7 @@ def main():
|
|||
|
||||
version = bundle_version(src_path).rstrip()
|
||||
|
||||
print("Creating Mac OS X application bundle (version: %s)..." % version)
|
||||
print("Creating macOS application bundle (version: %s)..." % version)
|
||||
print("> copying bundle skeleton")
|
||||
copy_bundle(binary_name, src_path)
|
||||
print("> copying binary")
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* CoreAudio audio output driver for Mac OS X
|
||||
* CoreAudio audio output driver for macOS
|
||||
*
|
||||
* original copyright (C) Timothy J. Wood - Aug 2000
|
||||
* ported to MPlayer libao2 by Dan Christiansen
|
||||
|
@ -28,7 +28,7 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* The MacOS X CoreAudio framework doesn't mesh as simply as some
|
||||
* The macOS CoreAudio framework doesn't mesh as simply as some
|
||||
* simpler frameworks do. This is due to the fact that CoreAudio pulls
|
||||
* audio samples rather than having them pushed at it (which is nice
|
||||
* when you are wanting to do good buffering of audio).
|
||||
|
|
|
@ -26,7 +26,7 @@ input-terminal=no
|
|||
osc=no
|
||||
input-default-bindings=no
|
||||
input-vo-keyboard=no
|
||||
# OSX/Cocoa global input hooks
|
||||
# macOS global input hooks
|
||||
input-media-keys=no
|
||||
|
||||
[encoding]
|
||||
|
|
|
@ -181,7 +181,7 @@ extern "C" {
|
|||
* filenames in the local 8 bit encoding. It does not use fopen() either;
|
||||
* it uses _wfopen().
|
||||
*
|
||||
* On OS X, filenames and other strings taken/returned by libmpv can have
|
||||
* On macOS, filenames and other strings taken/returned by libmpv can have
|
||||
* inconsistent unicode normalization. This can sometimes lead to problems.
|
||||
* You have to hope for the best.
|
||||
*
|
||||
|
@ -197,7 +197,7 @@ extern "C" {
|
|||
*
|
||||
* There is an older way to embed the native mpv window into your own. You have
|
||||
* to get the raw window handle, and set it as "wid" option. This works on X11,
|
||||
* win32, and OSX only. It's much easier to use than the render API, but
|
||||
* win32, and macOS only. It's much easier to use than the render API, but
|
||||
* also has various problems.
|
||||
*
|
||||
* Also see client API examples and the mpv manpage. There is an extensive
|
||||
|
@ -495,7 +495,7 @@ MPV_EXPORT mpv_handle *mpv_create(void);
|
|||
* - load-scripts
|
||||
* - script
|
||||
* - player-operation-mode
|
||||
* - input-app-events (OSX)
|
||||
* - input-app-events (macOS)
|
||||
* - all encoding mode options
|
||||
*
|
||||
* @return error code
|
||||
|
|
|
@ -93,7 +93,7 @@ extern "C" {
|
|||
* MPV_RENDER_PARAM_WL_DISPLAY for Wayland)
|
||||
* - nVidia/Linux: Both GLX and EGL should work (GLX is required if vdpau is
|
||||
* used, e.g. due to old drivers.)
|
||||
* - OSX: CGL is required (CGLGetCurrentContext() returning non-NULL)
|
||||
* - macOS: CGL is required (CGLGetCurrentContext() returning non-NULL)
|
||||
* - iOS: EAGL is required (EAGLContext.currentContext returning non-nil)
|
||||
*
|
||||
* Once these things are setup, hardware decoding can be enabled/disabled at
|
||||
|
|
|
@ -30,7 +30,7 @@ void mp_init_paths(struct mpv_global *global, struct MPOpts *opts);
|
|||
|
||||
// Search for the input filename in several paths. These include user and global
|
||||
// config locations by default. Some platforms may implement additional platform
|
||||
// related lookups (i.e.: OSX inside an application bundle).
|
||||
// related lookups (i.e.: macOS inside an application bundle).
|
||||
char *mp_find_config_file(void *talloc_ctx, struct mpv_global *global,
|
||||
const char *filename);
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
// The following type values are defined:
|
||||
// "home" the native mpv-specific user config dir
|
||||
// "old_home" same as "home", but lesser priority (compatibility)
|
||||
// "osxbundle" OSX bundle resource path
|
||||
// "osxbundle" macOS bundle resource path
|
||||
// "global" the least priority, global config file location
|
||||
// "desktop" path to desktop contents
|
||||
//
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#include <sys/types.h>
|
||||
#include <semaphore.h>
|
||||
|
||||
// OSX provides non-working empty stubs, so we emulate them.
|
||||
// macOS provides non-working empty stubs, so we emulate them.
|
||||
// This should be AS-safe, but cancellation issues were ignored.
|
||||
// sem_getvalue() is not provided.
|
||||
// sem_post() won't always correctly return an error on overflow.
|
||||
|
|
|
@ -143,8 +143,8 @@ struct ra_tex_params {
|
|||
// be true depends on ra_format.linear_filter)
|
||||
bool src_repeat; // if false, clamp texture coordinates to edge
|
||||
// if true, repeat texture coordinates
|
||||
bool non_normalized; // hack for GL_TEXTURE_RECTANGLE OSX idiocy
|
||||
// always set to false, except in OSX code
|
||||
bool non_normalized; // hack for GL_TEXTURE_RECTANGLE macOS idiocy
|
||||
// always set to false, except in macOS code
|
||||
bool external_oes; // hack for GL_TEXTURE_EXTERNAL_OES idiocy
|
||||
// If non-NULL, the texture will be created with these contents. Using
|
||||
// this does *not* require setting host_mutable. Otherwise, the initial
|
||||
|
|
|
@ -398,7 +398,7 @@ static const struct gl_functions gl_functions[] = {
|
|||
.provides = MPGL_CAP_NESTED_ARRAY,
|
||||
},
|
||||
// Swap control, always an OS specific extension
|
||||
// The OSX code loads this manually.
|
||||
// The macOS code loads this manually.
|
||||
{
|
||||
.extension = "GLX_SGI_swap_control",
|
||||
.functions = (const struct gl_function[]) {
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#define GLX_CONTEXT_FLAGS_ARB 0x2094
|
||||
#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126
|
||||
#ifndef __APPLE__
|
||||
// These are respectively 0x00000001 and 0x00000002 on OSX
|
||||
// These are respectively 0x00000001 and 0x00000002 on macOS
|
||||
#define GLX_CONTEXT_DEBUG_BIT_ARB 0x0001
|
||||
#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
|
||||
#endif
|
||||
|
|
|
@ -94,7 +94,7 @@ const struct gl_format gl_formats[] = {
|
|||
// Special formats.
|
||||
{"rgb565", GL_RGB8, GL_RGB,
|
||||
GL_UNSIGNED_SHORT_5_6_5, F_TF | F_GL2 | F_GL3},
|
||||
// Worthless, but needed by OSX videotoolbox interop on old Apple hardware.
|
||||
// Worthless, but needed by macOS videotoolbox interop on old Apple hardware.
|
||||
{"appleyp", GL_RGB, GL_RGB_422_APPLE,
|
||||
GL_UNSIGNED_SHORT_8_8_APPLE, F_TF | F_APPL},
|
||||
|
||||
|
|
Loading…
Reference in New Issue