From 1251f7bbf9f74431325b968d2c02bb4425970710 Mon Sep 17 00:00:00 2001 From: Leo Izen Date: Fri, 1 Jan 2021 18:53:23 -0500 Subject: manpage: rename OS X references to macOS Apple has decided that Mac OS X is now named macOS for the time being. For consistency, it makes sense to use the same name for the operating system in all places where it occurs. This commit renames OS X to macOS in the documentation in places where it was otherwise still using the old name. --- DOCS/man/ao.rst | 8 ++++---- DOCS/man/mpv.rst | 16 ++++++++-------- DOCS/man/options.rst | 44 ++++++++++++++++++++++---------------------- DOCS/man/vo.rst | 4 ++-- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/DOCS/man/ao.rst b/DOCS/man/ao.rst index cc42ec23a6..d70286647f 100644 --- a/DOCS/man/ao.rst +++ b/DOCS/man/ao.rst @@ -65,8 +65,8 @@ Available audio output drivers are: mode is probably not very useful, other than for debugging or when used with fixed setups. -``coreaudio`` (Mac OS X only) - Native Mac OS X audio output driver using AudioUnits and the CoreAudio +``coreaudio`` (macOS only) + Native macOS audio output driver using AudioUnits and the CoreAudio sound server. Automatically redirects to ``coreaudio_exclusive`` when playing compressed @@ -92,8 +92,8 @@ Available audio output drivers are: extreme care. -``coreaudio_exclusive`` (Mac OS X only) - Native Mac OS X audio output driver using direct device access and +``coreaudio_exclusive`` (macOS only) + Native macOS audio output driver using direct device access and exclusive mode (bypasses the sound server). ``openal`` diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst index d00c8a77f4..736c9a097d 100644 --- a/DOCS/man/mpv.rst +++ b/DOCS/man/mpv.rst @@ -247,16 +247,16 @@ corresponding adjustment.) 7 and 8 Adjust saturation. -Alt+0 (and command+0 on OSX) +Alt+0 (and command+0 on macOS) Resize video window to half its original size. -Alt+1 (and command+1 on OSX) +Alt+1 (and command+1 on macOS) Resize video window to its original size. -Alt+2 (and command+2 on OSX) +Alt+2 (and command+2 on macOS) Resize video window to double its original size. -command + f (OSX only) +command + f (macOS only) Toggle fullscreen (see also ``--fs``). (The following keys are valid if you have a keyboard with multimedia keys.) @@ -439,8 +439,8 @@ Name Meaning ``~/`` user home directory root (similar to shell, ``$HOME``) ``~~home/`` same as ``~~/`` ``~~global/`` the global config path, if available (not on win32) -``~~osxbundle/`` the OSX bundle resource path (OSX only) -``~~desktop/`` the path to the desktop (win32, OSX) +``~~osxbundle/`` the macOS bundle resource path (macOS only) +``~~desktop/`` the path to the desktop (win32, macOS) ``~~exe_dir`` win32 only: the path to the directory containing the exe (for config file purposes; ``$MPV_HOME`` overrides it) ``~~old_home`` do not use @@ -1262,7 +1262,7 @@ Currently this happens only in the following cases: or file associations provided by desktop environments) - if started from explorer.exe on Windows (technically, if it was started on Windows, and all of the stdout/stderr/stdin handles are unset) -- started out of the bundle on OSX +- started out of the bundle on macOS - if you manually use ``--player-operation-mode=pseudo-gui`` on the command line This mode applies options from the builtin profile ``builtin-pseudo-gui``, but @@ -1300,7 +1300,7 @@ Linux desktop issues ==================== This subsection describes common problems on the Linux desktop. None of these -problems exist on systems like Windows or OSX. +problems exist on systems like Windows or macOS. Disabling Screensaver --------------------- diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 18dee24e35..3beda8b00d 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -1196,9 +1196,9 @@ Video :vdpau-copy: copies video back into system RAM (Linux with some GPUs only) :vaapi: requires ``--vo=gpu`` or ``--vo=vaapi`` (Linux only) :vaapi-copy: copies video back into system RAM (Linux with some GPUs only) - :videotoolbox: requires ``--vo=gpu`` (OS X 10.8 and up), + :videotoolbox: requires ``--vo=gpu`` (macOS 10.8 and up), or ``--vo=libmpv`` (iOS 9.0 and up) - :videotoolbox-copy: copies video back into system RAM (OS X 10.8 or iOS 9.0 and up) + :videotoolbox-copy: copies video back into system RAM (macOS 10.8 or iOS 9.0 and up) :dxva2: requires ``--vo=gpu`` with ``--gpu-context=d3d11``, ``--gpu-context=angle`` or ``--gpu-context=dxinterop`` (Windows only) @@ -2799,7 +2799,7 @@ Subtitles ``--sub-font-provider=`` Which libass font provider backend to use (default: auto). ``auto`` will attempt to use the native font provider: fontconfig on Linux, CoreText on - OSX, DirectWrite on Windows. ``fontconfig`` forces fontconfig, if libass + macOS, DirectWrite on Windows. ``fontconfig`` forces fontconfig, if libass was built with support (if not, it behaves like ``none``). The ``none`` font provider effectively disables system fonts. It will still @@ -2859,9 +2859,9 @@ Window This option works properly only with window managers which understand the EWMH ``_NET_WM_FULLSCREEN_MONITORS`` hint. - .. admonition:: Note (OS X) + .. admonition:: Note (macOS) - ``all`` does not work on OS X and will behave like ``current``. + ``all`` does not work on macOS and will behave like ``current``. See also ``--screen``. @@ -2968,7 +2968,7 @@ Window Manager. ``--ontop-level=`` - (OS X only) + (macOS only) Sets the level of an ontop window (default: window). :window: On top of all other windows. @@ -3018,9 +3018,9 @@ Window Generally only supported by GUI VOs. Ignored for encoding. - .. admonition: Note (OS X) + .. admonition: Note (macOS) - On Mac OS X the origin of the screen coordinate system is located on the + On macOS, the origin of the screen coordinate system is located on the bottom-left corner. For instance, ``0:0`` will place the window at the bottom-left of the screen. @@ -3188,14 +3188,14 @@ Window - ``--monitoraspect=16:9`` or ``--monitoraspect=1.7777`` ``--hidpi-window-scale``, ``--no-hidpi-window-scale`` - (OS X, Windows, X11, and Wayland only) + (macOS, Windows, X11, and Wayland only) Scale the window size according to the backing scale factor (default: yes). On regular HiDPI resolutions the window opens with double the size but appears - as having the same size as on non-HiDPI resolutions. This is the default OS X - behavior. + as having the same size as on non-HiDPI resolutions. This is enabled by + default on macOS. ``--native-fs``, ``--no-native-fs`` - (OS X only) + (macOS only) Uses the native fullscreen mechanism of the OS (default: yes). ``--monitorpixelaspect=`` @@ -3228,8 +3228,8 @@ Window ``intptr_t``. mpv will create its own window, and set the wid window as parent, like with X11. - On OSX/Cocoa, the ID is interpreted as ``NSView*``. Pass it as value cast - to ``intptr_t``. mpv will create its own sub-view. Because OSX does not + On macOS/Cocoa, the ID is interpreted as ``NSView*``. Pass it as value cast + to ``intptr_t``. mpv will create its own sub-view. Because macOS does not support window embedding of foreign processes, this works only with libmpv, and will crash when used from the command line. @@ -3866,7 +3866,7 @@ Input Support depends on the VO in use. ``--input-media-keys=`` - (OS X and Windows only) + (macOS and Windows only) Enable/disable media keys support. Enabled by default (except for libmpv). ``--input-right-alt-gr``, ``--no-input-right-alt-gr`` @@ -5808,7 +5808,7 @@ The following video options are currently all specific to ``--vo=gpu`` and Deactivates the automatic graphics switching and forces the dedicated GPU. (default: no) - OS X only. + macOS only. ``--cocoa-cb-sw-renderer=`` Use the Apple Software Renderer when using cocoa-cb (default: auto). If set @@ -5817,14 +5817,14 @@ The following video options are currently all specific to ``--vo=gpu`` and software renderer, and ``auto`` only falls back to the software renderer when the usual pixel format couldn't be created. - OS X only. + macOS only. ``--cocoa-cb-10bit-context=`` Creates a 10bit capable pixel format for the context creation (default: yes). Instead of 8bit integer framebuffer a 16bit half-float framebuffer is requested. - OS X only. + macOS only. ``--macos-title-bar-appearance=`` Sets the appearance of the title bar (default: auto). Not all combinations @@ -5905,7 +5905,7 @@ The following video options are currently all specific to ``--vo=gpu`` and 1000ms since it's possible that Apple or the user changes the system defaults. Anything higher than 1000ms though seems too long and shouldn't be set anyway. - OS X and cocoa-cb only + (macOS and cocoa-cb only) ``--macos-app-activation-policy=`` @@ -5942,7 +5942,7 @@ The following video options are currently all specific to ``--vo=gpu`` and auto auto-select (default) cocoa - Cocoa/OS X (deprecated, use --vo=libmpv instead) + Cocoa/macOS (deprecated, use --vo=libmpv instead) win Win32/WGL winvk @@ -6037,7 +6037,7 @@ The following video options are currently all specific to ``--vo=gpu`` and With ambient illuminance of 16 lux, mpv will pick the 1.0 gamma value (no boost), and slightly increase the boost up until 1.2 for 256 lux. - NOTE: Only implemented on OS X. + NOTE: Only implemented on macOS. ``--target-prim=`` Specifies the primaries of the display. Video colors will be adapted to @@ -6419,7 +6419,7 @@ The following video options are currently all specific to ``--vo=gpu`` and flipping GL front and backbuffers immediately (i.e. it doesn't call it in display-sync mode). - On OSX this is always deactivated because it only causes performance + On macOS this is always deactivated because it only causes performance problems and other regressions. ``--gpu-dumb-mode=`` diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst index 265787e73a..d8aefd871b 100644 --- a/DOCS/man/vo.rst +++ b/DOCS/man/vo.rst @@ -253,7 +253,7 @@ Available video output drivers are: quality or performance by changing the ``--fbo-format`` option to ``rgb16f``, ``rgb32f`` or ``rgb``. Known problems include Mesa/Intel not accepting ``rgb16``, Mesa sometimes not being compiled with float texture - support, and some OS X setups being very slow with ``rgb16`` but fast + support, and some macOS setups being very slow with ``rgb16`` but fast with ``rgb32f``. If you have problems, you can also try enabling the ``--gpu-dumb-mode=yes`` option. @@ -498,7 +498,7 @@ Available video output drivers are: Specify the directory to save the image files to (default: ``./``). ``libmpv`` - For use with libmpv direct embedding. As a special case, on OS X it + For use with libmpv direct embedding. As a special case, on macOS it is used like a normal VO within mpv (cocoa-cb). Otherwise useless in any other contexts. (See ````.) -- cgit v1.2.3