New upstream version 2.7upstream/2.7

1 files changed, 51 insertions, 51 deletions

diff --git a/completions/mplayer b/completions/mplayer
index 88e9dc7d..ab08b9a9 100644
--- a/completions/mplayer
+++ b/completions/mplayer
@@ -4,8 +4,8 @@ _mplayer_options_list()
 {
     cur=${cur%\\}
     COMPREPLY=( $( compgen -W "$( $1 -nomsgcolor -nomsgmodule $2 help 2>/dev/null | \
-        sed -e '/^Available/,/^$/!d' -e '/^Available/d' | awk '{print $1}' | \
-        sed -e 's/:$//' -e 's/^'${2#-}'$//' -e 's/<.*//' )" -- "$cur" ) )
+        command sed -e '/^Available/,/^$/!d' -e '/^Available/d' | awk '{print $1}' | \
+        command sed -e 's/:$//' -e 's/^'${2#-}'$//' -e 's/<.*//' )" -- "$cur" ) )
 }
 
 _mplayer()
@@ -19,15 +19,15 @@ _mplayer()
         -[av][cfo]|-[av]fm|-vop|-fstype|-demuxer|-o[av]c|-of|-profile| \
         -audio-demuxer|-sub-demuxer)
             _mplayer_options_list $cmd $prev
-            return 0
+            return
             ;;
         -show-profile)
             _mplayer_options_list $cmd -profile
-            return 0
+            return
             ;;
-        -audiofile)
-            _filedir '@(mp3|mpg|ogg|w?(a)v|mid|flac|mka|ape)'
-            return 0
+        -audiofile|-audio-file)
+            _filedir '@(mp3|mpg|ogg|w?(a)v|mid|flac|mka|ac3|ape)'
+            return
             ;;
         -font|-subfont)
             if [[ $prev == -font ]]; then
@@ -37,11 +37,11 @@ _mplayer()
             fi
             local IFS=$'\n'
             COMPREPLY+=( $( compgen -W '$( fc-list 2>/dev/null )' -- "$cur" ) )
-            return 0
+            return
             ;;
-        -sub)
+        -sub|-sub-file)
             _filedir '@(srt|sub|txt|utf|rar|mpsub|smi|js|ssa|ass)'
-            return 0
+            return
             ;;
         -vobsub)
             _filedir '@(idx|ifo|sub)'
@@ -52,26 +52,26 @@ _mplayer()
                         else
                             printf '%s\n' $i
                         fi
-                       done ) )
-            return 0
+                        done ) )
+            return
             ;;
         -subcp|-msgcharset)
             local cp
-            cp=( $( iconv --list 2>/dev/null | sed -e "s@//@@;" 2>/dev/null ) )
+            cp=( $( iconv --list 2>/dev/null | command sed -e "s@//@@;" 2>/dev/null ) )
             if [[ "$cur" == "${cur,,}" ]]; then
                 COMPREPLY=( $( compgen -W '${cp[@],,}' -- "$cur" ) )
             else
                 COMPREPLY=( $( compgen -W '${cp[@]^^}' -- "$cur" ) )
             fi
-            return 0
+            return
             ;;
         -ifo)
             _filedir ifo
-            return 0
+            return
             ;;
         -cuefile)
             _filedir '@(bin|cue)'
-            return 0
+            return
             ;;
         -skin)
             # if you don't have installed mplayer in /usr you
@@ -86,37 +86,38 @@ _mplayer()
             local IFS=$'\n'
             for i in ~/.mplayer/skins ${dirs[@]}; do
                 if [[ -d $i && -r $i ]]; then
-                    for j in $( compgen -d $i/$cur ); do
+                    for j in $( compgen -d -- $i/$cur ); do
                         COMPREPLY[$k]=${j#$i/}
                         k=$((++k))
                     done
                 fi
             done
-            return 0
+            return
             ;;
         -cdrom-device)
             _cd_devices
             _dvd_devices
-            return 0
+            return
             ;;
         -dvd-device)
-            _filedir
-            return 0
+            _dvd_devices
+            _filedir iso
+            return
             ;;
         -bluray-device)
             _filedir -d
-            return 0
+            return
             ;;
         -mixer|-dvdauth|-fb|-zrdev)
             cur=${cur:=/dev/}
             _filedir
-            return 0
+            return
             ;;
         -edl|-edlout|-lircconf|-menu-cfg|-playlist|-csslib|-dumpfile| \
         -subfile|-vobsub|-aofile|-fbmodeconfig|-include|-o|-dvdkey| \
         -passlogfile)
             _filedir
-            return 0
+            return
             ;;
         -autoq|-autosync|-loop|-menu-root|-speed|-sstep|-aid|-alang| \
         -bandwidth|-bluray-angle|-bluray-chapter|-cache|-chapter|-dvd-speed| \
@@ -134,23 +135,23 @@ _mplayer()
         -subalign|-subwidth|-subfont-blur|-subfont-outline| \
         -subfont-autoscale|-subfont-encoding|-subfont-osd-scale| \
         -subfont-text-scale)
-            return 0
+            return
             ;;
         -channels)
             COMPREPLY=( $( compgen -W '2 4 6 8' -- "$cur" ) )
-            return 0
+            return
             ;;
         -aspect|-monitoraspect)
             COMPREPLY=( $( compgen -W '1:1 3:2 4:3 5:4 14:9 14:10 16:9 16:10
                 2.35:1' -- "$cur" ) )
             __ltrim_colon_completions "$cur"
-            return 0
+            return
             ;;
         -lavdopts)
             COMPREPLY=( $( compgen -W 'bitexact bug= debug= ec= er= fast gray
                 idct= lowres= sb= st= skiploopfilter= skipidct= skipframe=
                 threads= vismv= vstats' -- "$cur" ) )
-            return 0
+            return
             ;;
         -lavcopts)
             COMPREPLY=( $( compgen -W 'vcodec= vqmin= vqscale= vqmax= mbqmin=
@@ -163,21 +164,21 @@ _mplayer()
                 scplx_mask= naq ildct format= pred qpel precmp= cmp= subcmp=
                 predia= dia= trell last_pred= preme= subq= psnr mpeg_quant aic
                 umv' -- "$cur" ) )
-            return 0
+            return
             ;;
         -ssf)
             COMPREPLY=( $( compgen -W 'lgb= cgb= ls= cs= chs= cvs=' \
                 -- "$cur" ) )
-            return 0
+            return
             ;;
         -jpeg)
             COMPREPLY=( $( compgen -W 'noprogressive progressive nobaseline
                 baseline optimize= smooth= quality= outdir=' -- "$cur" ) )
-            return 0
+            return
             ;;
         -xvidopts)
             COMPREPLY=( $( compgen -W 'dr2 nodr2' -- "$cur" ) )
-            return 0
+            return
             ;;
         -xvidencopts)
             COMPREPLY=( $( compgen -W 'pass= bitrate= fixed_quant= me_quality=
@@ -185,38 +186,38 @@ _mplayer()
                 quant_range= min_key_interval= max_key_interval= mpeg_quant
                 mod_quant lumi_mask hintedme hintfile debug keyframe_boost=
                 kfthreshold= kfreduction=' -- "$cur" ) )
-            return 0
+            return
             ;;
         -divx4opts)
             COMPREPLY=( $( compgen -W 'br= key= deinterlace q= min_quant=
                 max_quant= rc_period= rc_reaction_period= crispness=
                 rc_reaction_ratio= pass= vbrpass= help' -- "$cur" ) )
-            return 0
+            return
             ;;
         -info)
             COMPREPLY=( $( compgen -W 'name= artist= genre= subject=
                 copyright= srcform= comment= help' -- "$cur" ) )
-            return 0
+            return
             ;;
         -lameopts)
             COMPREPLY=( $( compgen -W 'vbr= abr cbr br= q= aq= ratio= vol=
                 mode= padding= fast preset= help' -- "$cur" ) )
-            return 0
+            return
             ;;
         -rawaudio)
             COMPREPLY=( $( compgen -W 'on channels= rate= samplesize= format=' \
                 -- "$cur" ) )
-            return 0
+            return
             ;;
         -rawvideo)
             COMPREPLY=( $( compgen -W 'on fps= sqcif qcif cif 4cif pal ntsc w=
                 h= y420 yv12 yuy2 y8 format= size=' -- "$cur" ) )
-            return 0
+            return
             ;;
         -aop)
             COMPREPLY=( $( compgen -W 'list= delay= format= fout= volume= mul=
                 softclip' -- "$cur" ) )
-            return 0
+            return
             ;;
         -dxr2)
             COMPREPLY=( $( compgen -W 'ar-mode= iec958-encoded iec958-decoded
@@ -225,7 +226,7 @@ _mplayer()
                 ck-rmin= ck-gmin= ck-bmin= ck-rmax= ck-gmax= ck-bmax= ck-r=
                 ck-g= ck-b= ignore-cache= ol-osd= olh-cor= olw-cor= olx-cor=
                 oly-cor= overlay overlay-ratio= update-cache' -- "$cur" ) )
-            return 0
+            return
             ;;
         -tv)
             COMPREPLY=( $( compgen -W 'on noaudio driver= device= input= freq=
@@ -233,30 +234,30 @@ _mplayer()
                 audiorate= forceaudio alsa amode= forcechan= adevice= audioid=
                 volume= bass= treble= balance= fps= channels= immediatemode=' \
                 -- "$cur" ) )
-            return 0
+            return
             ;;
         -mf)
             COMPREPLY=( $( compgen -W 'on w= h= fps= type=' -- "$cur" ) )
-            return 0
+            return
             ;;
         -cdda)
             COMPREPLY=( $( compgen -W 'speed= paranoia= generic-dev=
                 sector-size= overlap= toc-bias toc-offset= skip noskip' \
                 -- "$cur" ) )
-            return 0
+            return
             ;;
         -input)
             COMPREPLY=( $( compgen -W 'conf= ar-delay ar-rate keylist cmdlist
                 js-dev file' -- "$cur" ) )
-            return 0
+            return
             ;;
         -af-adv)
             COMPREPLY=( $( compgen -W 'force= list=' -- "$cur" ) )
-            return 0
+            return
             ;;
         -noconfig)
             COMPREPLY=( $( compgen -W 'all gui system user' -- "$cur" ) )
-            return 0
+            return
             ;;
         -*)
             # Assume arg is required for everything else except options
@@ -267,24 +268,23 @@ _mplayer()
                     [[ ${j,,} != @(flag|print) ]] && return 1
                     break
                 fi
-            done || return 0
+            done || return
             ;;
     esac
 
     case $cur in
         -*)
             COMPREPLY=( $( compgen -W '$( $cmd -nomsgcolor -nomsgmodule -list-options 2>/dev/null | \
-                sed -ne '1,/^[[:space:]]*Name/d' \
+                command sed -ne '1,/^[[:space:]]*Name/d' \
                     -e "s/^[[:space:]]*/-/" -e "s/[[:space:]:].*//" \
                     -e "/^-\(Total\|.*\*\)\{0,1\}$/!p" )' -- "$cur" ) )
             ;;
         *)
-            _filedir '@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m[24]v|M[24]V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|3gpp?(2)|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2t?(s)|M2T?(S)|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|webm|WEBM|amr|AMR|awb|AWB|iso|ISO|opus|OPUS)?(.part)'
+            _filedir '@(m?(j)p?(e)g|M?(J)P?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|fxm|FXM|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m?(p)4[av]|M?(P)4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|aac|AAC|m2v|M2V|dv|DV|rmvb|RMVB|mid|MID|t[ps]|T[PS]|3g[p2]|3gpp?(2)|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2t?(s)|M2T?(S)|mts|MTS|vdr|VDR|xvid|XVID|ape|APE|gif|GIF|nut|NUT|bik|BIK|web[am]|WEB[AM]|amr|AMR|awb|AWB|iso|ISO|opus|OPUS)?(.part)'
             ;;
     esac
 
-    return 0
 } &&
 complete -F _mplayer mplayer mplayer2 mencoder gmplayer kplayer
 
-# ex: ts=4 sw=4 et filetype=sh
+# ex: filetype=sh