[FFmpeg-devel] [PATCH v2] fftools/ffplay: split filters & show modes cycling into separate keys

[Ondřej Fiala]

Signed-off-by: Ondřej Fiala <ofiala at airmail.cc>
---
Simplified per Zhao Zhili's suggestion.

 doc/ffplay.texi  |  5 ++++-
 fftools/ffplay.c | 11 ++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/ffplay.texi b/doc/ffplay.texi
index 93f77eeece..91d138a974 100644
--- a/doc/ffplay.texi
+++ b/doc/ffplay.texi
@@ -241,8 +241,11 @@ Cycle subtitle channel in the current program.
 @item c
 Cycle program.
 
+ at item d
+Cycle show modes.
+
 @item w
-Cycle video filters or show modes.
+Cycle video filters.
 
 @item s
 Step to the next frame.
diff --git a/fftools/ffplay.c b/fftools/ffplay.c
index 873ee8cc74..05182d9f49 100644
--- a/fftools/ffplay.c
+++ b/fftools/ffplay.c
@@ -3370,14 +3370,11 @@ static void event_loop(VideoState *cur_stream)
             case SDLK_t:
                 stream_cycle_channel(cur_stream, AVMEDIA_TYPE_SUBTITLE);
                 break;
+            case SDLK_d:
+                toggle_audio_display(cur_stream);
+                break;
             case SDLK_w:
-                if (cur_stream->show_mode == SHOW_MODE_VIDEO && cur_stream->vfilter_idx < nb_vfilters - 1) {
-                    if (++cur_stream->vfilter_idx >= nb_vfilters)
-                        cur_stream->vfilter_idx = 0;
-                } else {
-                    cur_stream->vfilter_idx = 0;
-                    toggle_audio_display(cur_stream);
-                }
+                cur_stream->vfilter_idx = (cur_stream->vfilter_idx + 1) % nb_vfilters;
                 break;
             case SDLK_PAGEUP:
                 if (cur_stream->ic->nb_chapters <= 1) {
-- 
2.43.0