Merging upstream version 0.38.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 40 insertions, 14 deletions

diff --git a/etc/builtin.conf b/etc/builtin.conf
index 7bfbace..ec0a485 100644
--- a/etc/builtin.conf
+++ b/etc/builtin.conf
@@ -26,7 +26,7 @@ input-terminal=no
 osc=no
 input-default-bindings=no
 input-vo-keyboard=no
-# OSX/Cocoa global input hooks
+# macOS global input hooks
 input-media-keys=no
 
 [encoding]
@@ -54,7 +54,6 @@ allow-delayed-peak-detect=yes
 scale=ewa_lanczossharp
 hdr-peak-percentile=99.995
 hdr-contrast-recovery=0.30
-deband=yes
 
 # Deprecated alias
 [gpu-hq]
diff --git a/etc/input.conf b/etc/input.conf
index 0b0e6da..000f7ae 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -65,6 +65,8 @@
 #ZOOMIN    add video-zoom   0.1         # zoom in
 #Alt+-     add video-zoom  -0.1         # zoom out
 #ZOOMOUT   add video-zoom  -0.1         # zoom out
+#Ctrl+WHEEL_UP   add video-zoom  0.1    # zoom in
+#Ctrl+WHEEL_DOWN add video-zoom -0.1    # zoom out
 #Alt+BS set video-zoom 0 ; set video-pan-x 0 ; set video-pan-y 0 # reset zoom and pan settings
 #PGUP add chapter 1                     # seek to the next chapter
 #PGDWN add chapter -1                   # seek to the previous chapter
@@ -118,7 +120,8 @@
 #Alt+0 set current-window-scale 0.5     # halve the window size
 #Alt+1 set current-window-scale 1.0     # reset the window size
 #Alt+2 set current-window-scale 2.0     # double the window size
-#d cycle deinterlace                    # toggle the deinterlacing filter
+#b cycle deband                         # toggle the debanding filter
+#d cycle deinterlace                    # cycle the deinterlacing filter
 #r add sub-pos -1                       # move subtitles up
 #R add sub-pos +1                       # move subtitles down
 #t add sub-pos +1                       # move subtitles down
diff --git a/etc/mpv.bash-completion b/etc/mpv.bash-completion
index d5d504a..4892d0e 100644
--- a/etc/mpv.bash-completion
+++ b/etc/mpv.bash-completion
@@ -17,12 +17,17 @@
 # License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-# Cache all the mpv options
-_mpv_options=$(mpv --no-config --list-options)
+_mpv_options()
+{
+  if [ -z ${_mpv_options_cache+x} ]; then
+    _mpv_options_cache=$(mpv --no-config --list-options)
+  fi
+  echo "$_mpv_options_cache"
+}
 
 _mpv_get_args()
 {
-  local doc=$(echo "$_mpv_options" | grep -E "^\\s*$1\\s")
+  local doc=$(_mpv_options | grep -E "^\\s*$1\\s")
   local partial="$2"
   local type=$(echo "$doc" | awk '{print $2;}')
 
@@ -81,10 +86,26 @@ _mpv_get_args()
 # This regex detects special options where we don't want an '=' appended
 _mpv_special_regex='\s(Flag.*\[not in config files\]|Print)'
 _mpv_skip_regex='\sremoved \[deprecated\]'
-_mpv_regular_options=($(echo "$_mpv_options" | grep -vE "$_mpv_skip_regex" | \
-  grep -vE "$_mpv_special_regex" | awk '{print "\\"$1;}' | grep '\--'))
-_mpv_special_options=($(echo "$_mpv_options" | grep -vE "$_mpv_skip_regex" | \
-  grep -E "$_mpv_special_regex" | awk '{print "\\"$1;}' | grep '\--'))
+
+_mpv_regular_options()
+{
+  if [ -z ${_mpv_regular_options_cache+x} ]; then
+    _mpv_regular_options_cache=($(_mpv_options | grep -vE "$_mpv_skip_regex" | \
+      grep -vE "$_mpv_special_regex" | awk '{print "\\"$1;}' | grep '\--'))
+    _mpv_regular_options_cache="${_mpv_regular_options_cache[*]}"
+  fi
+  echo "$_mpv_regular_options_cache"
+}
+
+_mpv_special_options()
+{
+  if [ -z ${_mpv_special_options_cache+x} ]; then
+    _mpv_special_options_cache=($(_mpv_options | grep -vE "$_mpv_skip_regex" | \
+      grep -E "$_mpv_special_regex" | awk '{print "\\"$1;}' | grep '\--'))
+    _mpv_special_options_cache="${_mpv_special_options_cache[*]}"
+  fi
+  echo "$_mpv_special_options_cache"
+}
 
 _mpv()
 {
@@ -106,9 +127,9 @@ _mpv()
   else
     case $cur in
       -*)
-        COMPREPLY=($(compgen -W "${_mpv_regular_options[*]}" -S '=' -- "${cur}"))
+        COMPREPLY=($(compgen -W "$(_mpv_regular_options)" -S '=' -- "${cur}"))
         local normal_count=${#COMPREPLY[@]}
-        COMPREPLY+=($(compgen -W "${_mpv_special_options[*]}" -- "${cur}"))
+        COMPREPLY+=($(compgen -W "$(_mpv_special_options)" -- "${cur}"))
         if [ $normal_count -gt 0 -o ${#COMPREPLY[@]} -gt 1 ]; then
           compopt -o nospace mpv
         fi
diff --git a/etc/mpv.desktop b/etc/mpv.desktop
index db71520..5a2b19b 100644
--- a/etc/mpv.desktop
+++ b/etc/mpv.desktop
@@ -5,6 +5,7 @@ Name[ca]=Reproductor multimèdia mpv
 Name[cs]=mpv přehrávač
 Name[da]=mpv-medieafspiller
 Name[fr]=Lecteur multimédia mpv
+Name[it]=Lettore multimediale mpv
 Name[ja]=mpv メディアプレイヤー
 Name[pl]=Odtwarzacz mpv
 Name[ru]=Проигрыватель mpv
@@ -15,6 +16,7 @@ GenericName=Multimedia player
 GenericName[cs]=Multimediální přehrávač
 GenericName[da]=Multimedieafspiller
 GenericName[fr]=Lecteur multimédia
+GenericName[it]=Lettore multimediale
 GenericName[ja]=マルチメディアプレイヤー
 GenericName[ru]=Мультимедийный проигрыватель
 GenericName[tr]=Çoklu ortam oynatıcı
@@ -28,7 +30,7 @@ Comment[de]=Filme und Musik abspielen
 Comment[es]=Reproduzca vídeos y canciones
 Comment[fr]=Lire des vidéos et des musiques
 Comment[ja]=映画や音楽を再生する
-Comment[it]=Lettore multimediale
+Comment[it]=Riproduci video e canzoni
 Comment[pl]=Odtwarzaj filmy i muzykę
 Comment[ru]=Воспроизведение фильмов и музыки
 Comment[tr]=Filmleri ve şarkıları oynatın
@@ -39,6 +41,7 @@ TryExec=mpv
 Exec=mpv --player-operation-mode=pseudo-gui -- %U
 Terminal=false
 Categories=AudioVideo;Audio;Video;Player;TV;
-MimeType=application/ogg;application/x-ogg;application/mxf;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/vnd.dolby.heaac.1;audio/vnd.dolby.heaac.2;audio/aiff;audio/x-aiff;audio/m4a;audio/x-m4a;application/x-extension-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/mpeg2;audio/mpeg3;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/musepack;audio/x-musepack;audio/ogg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg2;video/x-mpeg3;video/mp4v-es;video/x-m4v;video/mp4;application/x-extension-mp4;video/divx;video/vnd.divx;video/msvideo;video/x-msvideo;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;audio/x-ms-asf;application/vnd.ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/avi;video/x-flic;video/fli;video/x-flc;video/flv;video/x-flv;video/x-theora;video/x-theora+ogg;video/x-matroska;video/mkv;audio/x-matroska;application/x-matroska;video/webm;audio/webm;audio/vorbis;audio/x-vorbis;audio/x-vorbis+ogg;video/x-ogm;video/x-ogm+ogg;application/x-ogm;application/x-ogm-audio;application/x-ogm-video;application/x-shorten;audio/x-shorten;audio/x-ape;audio/x-wavpack;audio/x-tta;audio/AMR;audio/ac3;audio/eac3;audio/amr-wb;video/mp2t;audio/flac;audio/mp4;application/x-mpegurl;video/vnd.mpegurl;application/vnd.apple.mpegurl;audio/x-pn-au;video/3gp;video/3gpp;video/3gpp2;audio/3gpp;audio/3gpp2;video/dv;audio/dv;audio/opus;audio/vnd.dts;audio/vnd.dts.hd;audio/x-adpcm;application/x-cue;audio/m3u;
+MimeType=application/ogg;application/x-ogg;application/mxf;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/vnd.dolby.heaac.1;audio/vnd.dolby.heaac.2;audio/aiff;audio/x-aiff;audio/m4a;audio/x-m4a;application/x-extension-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/mpeg2;audio/mpeg3;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/musepack;audio/x-musepack;audio/ogg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg2;video/x-mpeg3;video/mp4v-es;video/x-m4v;video/mp4;application/x-extension-mp4;video/divx;video/vnd.divx;video/msvideo;video/x-msvideo;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;audio/x-ms-asf;application/vnd.ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/avi;video/x-flic;video/fli;video/x-flc;video/flv;video/x-flv;video/x-theora;video/x-theora+ogg;video/x-matroska;video/mkv;audio/x-matroska;application/x-matroska;video/webm;audio/webm;audio/vorbis;audio/x-vorbis;audio/x-vorbis+ogg;video/x-ogm;video/x-ogm+ogg;application/x-ogm;application/x-ogm-audio;application/x-ogm-video;application/x-shorten;audio/x-shorten;audio/x-ape;audio/x-wavpack;audio/x-tta;audio/AMR;audio/ac3;audio/eac3;audio/amr-wb;video/mp2t;audio/flac;audio/mp4;application/x-mpegurl;video/vnd.mpegurl;application/vnd.apple.mpegurl;audio/x-pn-au;video/3gp;video/3gpp;video/3gpp2;audio/3gpp;audio/3gpp2;video/dv;audio/dv;audio/opus;audio/vnd.dts;audio/vnd.dts.hd;audio/x-adpcm;application/x-cue;audio/m3u;audio/vnd.wave;video/vnd.avi;
 X-KDE-Protocols=ftp,http,https,mms,rtmp,rtsp,sftp,smb,srt,rist,webdav,webdavs
 StartupWMClass=mpv
+Keywords=mpv;media;player;video;audio;tv;