commands: rename properties, update input.conf

Use "-" instead of "_" in property names. The intent is that property
names and options names should be the same (if they refer to the same
thing), and options use "-" as word separator.

Rename some other properties too, e.g. "switch_audio" -> "audio".

Add a way to translate the old property names to the new ones, similar
to the input command legacy bridge.

Update input.conf. Use the new property names, and don't use legacy
commands.

1 files changed, 64 insertions, 65 deletions

diff --git a/etc/input.conf b/etc/input.conf
index 2dd9fee758..8c23bcde96 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -26,12 +26,12 @@
 # key combinations is only supported through the video windows of certain
 # output drivers (not in output windows of other drivers or in a terminal).
 
-MOUSE_BTN0_DBL vo_fullscreen            # toggle fullscreen on/off
-MOUSE_BTN2 pause                        # toggle pause on/off
+MOUSE_BTN0_DBL switch fullscreen        # toggle fullscreen on/off
+MOUSE_BTN2 switch pause                 # toggle pause on/off
 MOUSE_BTN3 seek 10
 MOUSE_BTN4 seek -10
-MOUSE_BTN5 volume 1
-MOUSE_BTN6 volume -1
+MOUSE_BTN5 switch volume 1
+MOUSE_BTN6 switch volume -1
 
 # Seek units are in seconds, but note that these are limited by keyframes
 RIGHT seek  10
@@ -45,8 +45,8 @@ Shift+UP    seek  5 0 1
 Shift+DOWN  seek -5 0 1
 PGUP seek 600
 PGDWN seek -600
-+ audio_delay 0.100                     # this changes audio/video sync
-- audio_delay -0.100
++ switch audio-delay 0.100              # this changes audio/video sync
+- switch audio-delay -0.100
 [ speed_mult 0.9091                     # scale playback speed
 ] speed_mult 1.1
 { speed_mult 0.5
@@ -55,79 +55,78 @@ BS speed_set 1.0                        # reset speed to normal
 q quit
 q {encode} quit
 ESC quit
-p pause                                 # toggle pause/playback mode
+p switch pause                          # toggle pause/playback mode
 . frame_step                            # advance one frame and pause
-SPACE pause
+SPACE switch pause
 > playlist_next                         # skip to next file
 ENTER playlist_next 1                   # skip to next file or quit
 < playlist_prev                         # skip to previous file
 o osd                                   # cycle through OSD mode
 I osd_show_property_text "${filename}"  # display filename in osd
 P osd_show_progression
-z sub_delay -0.1                        # subtract 100 ms delay from subs
-x sub_delay +0.1                        # add
+z switch sub-delay -0.1                 # subtract 100 ms delay from subs
+x switch sub-delay +0.1                 # add
 g sub_step -1                           # immediately display next subtitle
 y sub_step +1                           #                     previous
-9 volume -1
-/ volume -1
-0 volume 1
-* volume 1
-( balance -0.1                          # adjust audio balance in favor of left
-) balance 0.1                           #                                  right
-m mute
-1 contrast -1
-2 contrast 1
-3 brightness -1
-4 brightness 1
-5 hue -1
-6 hue 1
-7 saturation -1
-8 saturation 1
-d frame_drop                            # cycle through framedrop modes
+9 switch volume -1
+/ switch volume -1
+0 switch volume 1
+* switch volume 1
+( switch balance -0.1                   # adjust audio balance in favor of left
+) switch balance 0.1                    #                                  right
+m switch mute
+1 switch contrast -1
+2 switch contrast 1
+3 switch brightness -1
+4 switch brightness 1
+5 switch hue -1
+6 switch hue 1
+7 switch saturation -1
+8 switch saturation 1
+d switch frame_drop                     # cycle through framedrop modes
 # toggle deinterlacer; requires either vdpau output, -vf yadif or kerndeint
-D step_property_osd deinterlace
-c step_property_osd colormatrix
+D switch deinterlace
+c switch colormatrix
 # Next 3 currently only work with --no-ass
-r sub_pos -1                            # move subtitles up
-t sub_pos +1                            #                down
-v sub_visibility
+r switch sub-pos -1                     # move subtitles up
+t switch sub-pos +1                     #                down
+v switch sub-visibility
 # stretch SSA/ASS subtitles with anamorphic videos to match historical
-V step_property_osd ass_vsfilter_aspect_compat
-j sub_select                            # cycle through subtitles
-J sub_select -3                         # ...backwards
-F forced_subs_only
-SHARP switch_audio                      # switch audio streams
-_ step_property switch_video
-TAB step_property switch_program
+V switch ass-vsfilter-aspect-compat
+j switch sub                            # cycle through subtitles
+J switch sub -1                         # ...backwards
+F switch sub-forced-only
+SHARP switch audio                      # switch audio streams
+_ switch video
+TAB switch program
 i edl_mark                              # for use with --edlout mode
-T vo_ontop                              # toggle video window ontop of other windows
-f vo_fullscreen                         # toggle fullscreen
-C step_property_osd capturing
+T switch ontop                          # toggle video window ontop of other windows
+f switch fullscreen                     # toggle fullscreen
 s screenshot 0                          # take a png screenshot
 S screenshot 1                          # ...on every frame
 Alt+s screenshot 0 1                    # take a screenshot of window contents
 Alt+S screenshot 1 1                    # ...on every frame
-w panscan -0.1                          # zoom out with -panscan 0 -fs
-e panscan +0.1                          #      in
+w switch panscan -0.1                   # zoom out with -panscan 0 -fs
+e switch panscan +0.1                   #      in
 POWER quit
-MENU osd
-PLAY pause
-PAUSE pause
-PLAYPAUSE pause
+MENU switch osd
+PLAY switch pause
+PAUSE switch pause
+PLAYPAUSE switch pause
 STOP quit
 FORWARD seek 60
 REWIND seek -60
 NEXT playlist_next
 PREV playlist_prev
-VOLUME_UP volume 1
-VOLUME_DOWN volume -1
-MUTE mute
+VOLUME_UP switch volume 1
+VOLUME_DOWN switch volume -1
+MUTE switch mute
 CLOSE_WIN quit
 CLOSE_WIN {encode} quit
-! seek_chapter -1                       # skip to previous chapter
-@ seek_chapter 1                        #         next
-E step_property_osd edition             # next edition
-A switch_angle 1
+! switch chapter -1                     # skip to previous chapter
+@ switch chapter 1                      #         next
+E switch edition                        # next edition
+A switch angle 1
 U stop
 
 # TV
@@ -140,16 +139,16 @@ u tv_step_chanlist
 # Apple Remote section
 #
 
-AR_PLAY pause
+AR_PLAY switch pause
 AR_PLAY_HOLD quit
 AR_NEXT seek 30
 AR_NEXT_HOLD seek 120
 AR_PREV seek -10
 AR_PREV_HOLD seek -120
-AR_MENU osd
-AR_MENU_HOLD mute
-AR_VUP volume 1
-AR_VDOWN volume -1
+AR_MENU switch osd
+AR_MENU_HOLD switch mute
+AR_VUP switch volume 1
+AR_VDOWN switch volume -1
 
 #
 # Joystick section
@@ -161,15 +160,15 @@ JOY_AXIS0_PLUS seek 10
 JOY_AXIS0_MINUS seek -10
 JOY_AXIS1_MINUS seek 60
 JOY_AXIS1_PLUS seek -60
-JOY_BTN0 pause
-JOY_BTN1 osd
-JOY_BTN2 volume 1
-JOY_BTN3 volume -1
+JOY_BTN0 switch pause
+JOY_BTN1 switch osd
+JOY_BTN2 switch volume 1
+JOY_BTN3 switch volume -1
 
 #
 # Not assigned by default
 # (not an exhaustive list of unbound commands)
 #
 
-#? sub_scale +0.1                       # increase subtitle font size
-#? sub_scale -0.1                       # decrease subtitle font size
+#? switch sub-scale +0.1                # increase subtitle font size
+#? switch sub-scale -0.1                # decrease subtitle font size