From 9d9bba8f137a504206ee9910dd2978ff981e680d Mon Sep 17 00:00:00 2001 From: Martin Herkt Date: Thu, 24 Apr 2014 18:19:56 +0200 Subject: options: rename device-specific options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --dvdangle → --dvd-angle --tvscan → --tv-scan --- DOCS/man/en/changes.rst | 2 ++ DOCS/man/en/mpv.rst | 2 +- DOCS/man/en/options.rst | 4 ++-- options/options.c | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst index 096e6909e4..c11d9c02e2 100644 --- a/DOCS/man/en/changes.rst +++ b/DOCS/man/en/changes.rst @@ -159,6 +159,7 @@ Command Line Switches ``-cursor-autohide-delay`` ``--cursor-autohide`` ``-delay`` ``--audio-delay`` ``-dumpstream`` ``--stream-dump=`` + ``-dvdangle`` ``--dvd-angle`` ``-endpos`` ``--length`` ``-font`` ``--osd-font`` ``-forcedsubsonly`` ``--sub-forced-only`` @@ -202,6 +203,7 @@ Command Line Switches ``-subfont`` ``--sub-text-font`` ``-subfps`` ``--sub-fps`` ``-subpos`` ``--sub-pos`` + ``-tvscan`` ``--tv-scan`` ``-use-filename-title`` ``--title='${filename}'`` ``-vc ffh264vdpau`` (etc.) ``--hwdec=vdpau`` ``-vobsub`` ``--sub`` (pass the .idx file) diff --git a/DOCS/man/en/mpv.rst b/DOCS/man/en/mpv.rst index f8d00942e8..0db857dd96 100644 --- a/DOCS/man/en/mpv.rst +++ b/DOCS/man/en/mpv.rst @@ -622,7 +622,7 @@ Play only titles 5, 6, 7: ``mpv dvd://5-7`` Play a multiangle DVD: - ``mpv dvd://1 --dvdangle=2`` + ``mpv dvd://1 --dvd-angle=2`` Play from a different DVD device: ``mpv dvd://1 --dvd-device=/dev/dvd2`` diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 8ffebf3ea6..126cd601de 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -771,7 +771,7 @@ OPTIONS You need write access to the DVD device to change the speed. -``--dvdangle=`` +``--dvd-angle=`` Some DVDs contain scenes that can be viewed from multiple angles. This option tells mpv which angle to use (default: 1). @@ -2577,7 +2577,7 @@ OPTIONS Choose the quality of the JPEG compression (< 60 recommended for full size). -``--tvscan=`` +``--tv-scan=`` Tune the TV channel scanner. mpv will also print value for ``--tv=channels=`` option, including existing and just found channels. diff --git a/options/options.c b/options/options.c index 946b1192d0..8c0268b170 100644 --- a/options/options.c +++ b/options/options.c @@ -256,7 +256,7 @@ const m_option_t mp_opts[] = { #if HAVE_DVDREAD || HAVE_DVDNAV {"dvd-device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"dvd-speed", &dvd_speed, CONF_TYPE_INT, 0, 0, 0, NULL}, - {"dvdangle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL}, + {"dvd-angle", &dvd_angle, CONF_TYPE_INT, CONF_RANGE, 1, 99, NULL}, #endif /* HAVE_DVDREAD */ OPT_INTPAIR("chapter", chapterrange, 0), OPT_CHOICE_OR_INT("edition", edition_id, 0, 0, 8190, @@ -605,7 +605,7 @@ const m_option_t mp_opts[] = { OPT_FLAG("input-terminal", consolecontrols, CONF_GLOBAL), OPT_FLAG("input-cursor", vo.enable_mouse_movements, CONF_GLOBAL), #if HAVE_TV - {"tvscan", (void *) tvscan_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + {"tv-scan", (void *) tvscan_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif /* HAVE_TV */ {"screenshot", (void *) screenshot_conf, CONF_TYPE_SUBCONFIG}, -- cgit v1.2.3