From de78c1653aad081daf28cd349e0f52801db3a180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 2 Jun 2014 13:55:03 +0300 Subject: [PATCH] mpv: New completion alias + adjustments for mplayer (Debian: #749115) --- completions/.gitignore | 1 + completions/Makefile.am | 3 ++- completions/mplayer | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/completions/.gitignore b/completions/.gitignore index af0a0d86..ae9feb60 100644 --- a/completions/.gitignore +++ b/completions/.gitignore @@ -97,6 +97,7 @@ mkisofs mogrify montage mplayer2 +mpv msgsnarf muttng ncal diff --git a/completions/Makefile.am b/completions/Makefile.am index bf5d792b..535b09de 100644 --- a/completions/Makefile.am +++ b/completions/Makefile.am @@ -513,6 +513,7 @@ CLEANFILES = \ mogrify \ montage \ mplayer2 \ + mpv \ msgsnarf \ muttng \ ncal \ @@ -785,7 +786,7 @@ symlinks: $(targetdir) $(DATA) rm -f $(targetdir)/$$file && \ $(LN_S) mcrypt $(targetdir)/$$file ; \ done - for file in mplayer2 mencoder gmplayer kplayer ; do \ + for file in mplayer2 mencoder gmplayer kplayer mpv ; do \ rm -f $(targetdir)/$$file && \ $(LN_S) mplayer $(targetdir)/$$file ; \ done diff --git a/completions/mplayer b/completions/mplayer index 2ba179f6..9b829725 100644 --- a/completions/mplayer +++ b/completions/mplayer @@ -25,8 +25,8 @@ _mplayer() _mplayer_options_list $cmd -profile return 0 ;; - -audiofile) - _filedir '@(mp3|mpg|ogg|w?(a)v|mid|flac|mka|ape)' + -audiofile|-audio-file) + _filedir '@(mp3|mpg|ogg|w?(a)v|mid|flac|mka|ac3|ape)' return 0 ;; -font|-subfont) @@ -39,7 +39,7 @@ _mplayer() COMPREPLY+=( $( compgen -W '$( fc-list 2>/dev/null )' -- "$cur" ) ) return 0 ;; - -sub) + -sub|-sub-file) _filedir '@(srt|sub|txt|utf|rar|mpsub|smi|js|ssa|ass)' return 0 ;; @@ -286,6 +286,6 @@ _mplayer() return 0 } && -complete -F _mplayer mplayer mplayer2 mencoder gmplayer kplayer +complete -F _mplayer mplayer mplayer2 mencoder gmplayer kplayer mpv # ex: ts=4 sw=4 et filetype=sh