Use (s)mplayer2 instead of (s)mplayer

[dotfiles.git] / .mc / menu

diff --git a/.mc/menu b/.mc/menu
index b2725a954cece3556287684897b83c7e97ea08cd..220f66fcafa72caae778ef5910b602a7d56a3c55 100644 (file)
--- a/.mc/menu
+++ b/.mc/menu
@@ -57,6 +57,10 @@ T  fb2txt
    esac
    $A %f | xsltproc /usr/local/src/FictionBook/FB2_2_txt_ru.xsl - | webstdin -e txt -t
 
++= t r & f \.(pdf|PDF|ps|PS|djvu)(\.bz2|\.gz)?$
+e  View pdf/ps/djvu with evince
+   evince %f &
+
 += t r & f \.(odt|ott|sxw|stw|ods|ots|sxc|stc|odp|otp|sxi|sti|odg|otg|sxd|std|odb|odf|sxm|odm|sxg)$
 o  View OpenDoc with odt2txt
    odt2txt %f | ${PAGER:-more}
@@ -65,10 +69,6 @@ o  View OpenDoc with odt2txt
 e  Edit OpenDoc with libreoffice
    libreoffice %f &
 
-+= t r & f \.(pdf|PDF|ps|PS|djvu)(\.bz2|\.gz)?$
-e  View pdf/ps/djvu with evince
-   evince %f &
-
 += t r & f \.(doc|DOC|rtf)$
 d  View doc with catdoc
    catdoc %f | ${PAGER:-more}
@@ -162,14 +162,14 @@ c  Play the current directory with smplayer
 
 + t r & f \.(m3u|mp3|MP3|cue|aac|ac3|ape|flac|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t t
 i  Audio/video info
-   exec mplayer -msglevel identify=6 -frames 0 %s
+   exec mplayer2 -msglevel identify=6 -frames 0 %s
 
 + t d & f (video_ts|VIDEO_TS)$
 i  DVD info
-   exec mplayer -dvd-device . dvd:// -msglevel identify=6 -frames 0
+   exec mplayer2 -dvd-device . dvd:// -msglevel identify=6 -frames 0
 
 + f \.(avi|AVI|flv|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t t
-m  Play video file(s) with mplayer
+m  Play video file(s) with mplayer2
    mplayer %s &
 
 + f \.(m3u|mp3|MP3|cue|aac|ac3|ape|flac|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t t
@@ -177,7 +177,7 @@ M  Play audio/video with gmplayer
    gmplayer %s &
 
 + t d & f (video_ts|VIDEO_TS)$
-d  Play DVD directory with mplayer
+d  Play DVD directory with mplayer2
    mplayer -dvd-device . dvd:// &
 
 + t d & f (video_ts|VIDEO_TS)$
@@ -185,7 +185,7 @@ D  Play DVD directory with gmplayer
    gmplayer -dvd-device . dvd:// &
 
 + t d & f (video_ts|VIDEO_TS)$
-t  Play DVD title with mplayer
+t  Play DVD title with mplayer2
    title=%{Enter title}
    mplayer -dvd-device . dvd://"$title" &
 
@@ -195,7 +195,7 @@ T  Play DVD title with gmplayer
    gmplayer -dvd-device . dvd://"$title" &
 
 + t d
-p  Play directory with mplayer
+p  Play directory with mplayer2
    mplayer %f/* &
 
 + t d
@@ -358,7 +358,7 @@ x  Extract the contents of a compressed tar file
       exit 1
       ;;
    esac
-   $PRG %f | tar xvf -
+   $PRG %f | tar xvpf -
 
 + F \.tar\.gz$ | F \.tar\.z$ | F \.tgz$ | F \.tpz$ | F \.tar\.lz$ | F \.tar\.lzma$ | F \.tar\.7z$ | F \.tar\.xz$ | F \.tar\.Z$ | F \.tar\.bz2$ & T r
 X  Extract the contents of an other compressed tar file
@@ -386,7 +386,7 @@ X  Extract the contents of an other compressed tar file
       exit 1
       ;;
    esac
-   $PRG %D/%F | tar xvf -
+   $PRG %D/%F | tar xvpf -
 
 + f \.(bz2|gz|lz|lzma|7z|xz|tar|zip|ZIP|rar|RAR)$ & t r
 x  Extract a compressed file
@@ -398,7 +398,7 @@ x  Extract a compressed file
      *.7z)   P="7zr x";;
      *.xz)   P="xz -d";;
      *.tar)  P="tar xvpf";;
-     *.zip|*.ZIP) P="uzip";;
+     *.zip|*.ZIP) P="unzip";;
      *.rar|*.RAR) P="rar x -y";;
    esac
    exec $P %f
@@ -413,7 +413,7 @@ X  Extract another compressed file
      *.7z)   P="7zr x";;
      *.xz)   P="xz -d";;
      *.tar)  P="tar xvpf";;
-     *.zip|*.ZIP) P="uzip";;
+     *.zip|*.ZIP) P="unzip";;
      *.rar|*.RAR) P="rar x -y";;
    esac
    exec $P %D/%F