From 817bb2bbbe26a77d896abd2489c125cd79aa000e Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 14 Aug 2017 20:01:08 +0200
Subject: options: change --loop semantics

As announced by the previous deprecation.
---
 DOCS/interface-changes.rst | 3 +++
 DOCS/man/options.rst       | 8 +++-----
 options/options.c          | 3 +--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index 2163fc4066..e3ef936551 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -40,6 +40,9 @@ Interface changes
       weird behavior.
     - add --track-auto-selection to help with scripts/applications that
       make exclusive use of --lavfi-complex.
+    - undeprecate --loop, and map it from --loop-playlist to --loop-file (the
+      deprecation was to make sure no API user gets broken by a sudden behavior
+      change)
  --- mpv 0.26.0 ---
     - remove remaining deprecated audio device options, like --alsa-device
       Some of them were removed in earlier releases.
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 3de554f07c..79a4d52568 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -299,11 +299,7 @@ Playback Control
     time trying to loop a file that doesn't exist. But it might be useful for
     playing webradios under very bad network conditions.
 
-``--loop``
-    Currently a deprecated alias to ``--loop-playlist``. After a deprecation
-    period, it will be undeprecated, but changed to alias ``--loop-file``.
-
-``--loop-file=<N|inf|no>``
+``--loop-file=<N|inf|no>``, ``--loop=<N|inf|no>``
     Loop a single file N times. ``inf`` means forever, ``no`` means normal
     playback. For compatibility, ``--loop-file`` and ``--loop-file=yes`` are
     also accepted, and are the same as ``--loop-file=inf``.
@@ -313,6 +309,8 @@ Playback Control
     difference between the two option is that this option performs a seek on
     loop, instead of reloading the file.
 
+    ``--loop`` is an alias for this option.
+
 ``--ab-loop-a=<time>``, ``--ab-loop-b=<time>``
     Set loop points. If playback passes the ``b`` timestamp, it will seek to
     the ``a`` timestamp. Seeking past the ``b`` point doesn't loop (this is
diff --git a/options/options.c b/options/options.c
index 3400f9ee96..2bd7bf869d 100644
--- a/options/options.c
+++ b/options/options.c
@@ -614,6 +614,7 @@ const m_option_t mp_opts[] = {
                       ({"no", 0},
                        {"yes", -1},
                        {"inf", -1})),
+    OPT_ALIAS("loop", "loop-file"),
 
     OPT_FLAG("resume-playback", position_resume, 0),
     OPT_FLAG("save-position-on-quit", position_save_on_quit, 0),
@@ -831,8 +832,6 @@ const m_option_t mp_opts[] = {
     OPT_REPLACED("ass-scale-with-window", "sub-ass-scale-with-window"),
     OPT_REPLACED("sub-ass-style-override", "sub-ass-override"),
     OPT_REMOVED("fs-black-out-screens", NULL),
-    OPT_REPLACED_MSG("loop", "loop-playlist", "--loop will be changed to map to"
-        " --loop-file in future releases."),
     OPT_REPLACED("sub-paths", "sub-file-paths"),
 
     {0}
-- 
cgit v1.2.3