Merge branch 'master' of https://github.com/mvdan/ranger

1 files changed, 4 insertions, 0 deletions

diff --git a/ranger/config/rifle.conf b/ranger/config/rifle.conf
index 9e29062a..364d7c28 100644
--- a/ranger/config/rifle.conf
+++ b/ranger/config/rifle.conf
@@ -104,6 +104,7 @@ ext php = php -- "$1"
 #-------------------------------------------
 mime ^audio|ogg$, terminal, has mplayer  = mplayer -- "$@"
 mime ^audio|ogg$, terminal, has mplayer2 = mplayer2 -- "$@"
+mime ^audio|ogg$, terminal, has mpv      = mpv -- "$@"
 ext midi?,        terminal, has wildmidi = wildmidi -- "$@"
 
 #--------------------------------------------
@@ -111,6 +112,8 @@ ext midi?,        terminal, has wildmidi = wildmidi -- "$@"
 #-------------------------------------------
 mime ^video|audio, has gmplayer, X, flag f = gmplayer -- "$@"
 mime ^video|audio, has smplayer, X, flag f = smplayer "$@"
+mime ^video,       has mpv,      X, flag f = mpv -- "$@"
+mime ^video,       has mpv,      X, flag f = mpv --fs -- "$@"
 mime ^video,       has mplayer2, X, flag f = mplayer2 -- "$@"
 mime ^video,       has mplayer2, X, flag f = mplayer2 -fs -- "$@"
 mime ^video,       has mplayer,  X, flag f = mplayer -- "$@"
@@ -122,6 +125,7 @@ mime ^video|audio, has totem,    X, flag f = totem --fullscreen -- "$@"
 #--------------------------------------------
 # Video without X:
 #-------------------------------------------
+mime ^video, terminal, !X, has mpv       = mpv -- "$@"
 mime ^video, terminal, !X, has mplayer2  = mplayer2 -- "$@"
 mime ^video, terminal, !X, has mplayer   = mplayer -- "$@"