.mailcap: Remove outdated `smplayer` and `mediaplayer_open`

diff --git a/.mailcap b/.mailcap
index 2fac3c4ec38df94c78cb6575a4b2e3381d18a015..144dcfdba2a1c8b23d13f021989c92efd52319e1 100644 (file)
--- a/.mailcap
+++ b/.mailcap
@@ -1,6 +1,5 @@
 # MIME types -> viewers map, RFC 1524.
 
-application/ogg; smplay %s; description="Ogg container files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`"
 application/ogg; mplay %s; description="Ogg container files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`"
 application/ogg; audtool --playlist-clear --playlist-addurl %s --playback-play; description="Ogg container files"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0
 application/ogg; audacious %s; description="Ogg container files"; test=test -n "$DISPLAY" -a -n "`which audacious 2>/dev/null`"
@@ -41,20 +40,16 @@ application/vnd.openxmlformats-officedocument.wordprocessingml.document; docx2tx
 audio/mpeg; audtool --playlist-clear --playlist-addurl %s --playback-play; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0
 audio/mpeg; audacious %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which audacious 2>/dev/null`"
 audio/mpeg; foobar %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which foobar 2>/dev/null`"
-audio/mpeg; smplay %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`"
 audio/mpeg; mplay %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`"
 audio/mpeg3; audtool --playlist-clear --playlist-addurl %s --playback-play; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0
 audio/mpeg3; audacious %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which audacious 2>/dev/null`"
 audio/mpeg3; foobar %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which foobar 2>/dev/null`"
-audio/mpeg3; smplay %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`"
 audio/mpeg3; mplay %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`"
 audio/mpegurl; audtool --playlist-clear --playlist-addurl %s --playback-play; description="MPEG URLs"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0
-audio/mpegurl; smplay -playlist %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`"
 audio/mpegurl; mplay -playlist %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`"
 audio/ogg; audtool --playlist-clear --playlist-addurl %s --playback-play; description="Ogg Vorbis audio files"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0
 audio/ogg; audacious %s; description="Ogg Vorbis audio files"; test=test -n "$DISPLAY" -a -n "`which audacious 2>/dev/null`"
 audio/ogg; foobar %s; description="Ogg Vorbis audio files"; test=test -n "$DISPLAY" -a -n "`which foobar 2>/dev/null`"
-audio/ogg; smplay %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`"
 audio/ogg; mplay %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`"
 audio/x-mod; audtool --playlist-clear --playlist-addurl %s --playback-play; description="MOD audio files"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0
 audio/x-mod; audacious %s; description="MOD audio files"; test=test -n "$DISPLAY" -a -n "`which audacious 2>/dev/null`"
@@ -62,19 +57,16 @@ audio/x-mod; foobar %s; description="MOD audio files"; test=test -n "$DISPLAY" -
 audio/x-mpeg; audtool --playlist-clear --playlist-addurl %s --playback-play; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0
 audio/x-mpeg; audacious %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which audacious 2>/dev/null`"
 audio/x-mpeg; foobar %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which foobar 2>/dev/null`"
-audio/x-mpeg; smplay %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`"
 audio/x-mpeg; mplay %s; description="MPEG audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`"
 audio/x-pn-realaudio; realplay %s; description="RealAudio files"; test=test -n "$DISPLAY" -a -n "`which realplay 2>/dev/null`"
 audio/x-realaudio; realplay %s; description="RealAudio files"; test=test -n "$DISPLAY" -a -n "`which realplay 2>/dev/null`"
 audio/x-wav; audtool --playlist-clear --playlist-addurl %s --playback-play; description="WAV audio files"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0
 audio/x-wav; audacious %s; description="WAV audio files"; test=test -n "$DISPLAY" -a -n "`which audacious 2>/dev/null`"
 audio/x-wav; foobar %s; description="WAV audio files"; test=test -n "$DISPLAY" -a -n "`which foobar 2>/dev/null`"
-audio/x-wav; smplay %s; description="WAV audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`"
 audio/x-wav; mplay %s; description="WAV audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`"
 audio/*; audtool --playlist-clear --playlist-addurl %s --playback-play; description="Audio files"; test=test -n "$DISPLAY" -a -n "`which audtool 2>/dev/null`" && test "`audtool --get-volume`" -gt 0
 audio/*; audacious %s; description="Audio files"; test=test -n "$DISPLAY" -a -n "`which audacious 2>/dev/null`"
 audio/*; foobar %s; description="Audio files"; test=test -n "$DISPLAY" -a -n "`which foobar 2>/dev/null`"
-audio/*; smplay %s; description="Audio files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`"
 audio/*; mplay %s; description="Audio files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`"
 
 image/gif; xli %s; description="GIF image files"; test=test -n "$DISPLAY" -a -n "`which xli 2>/dev/null`"
@@ -121,15 +113,10 @@ text/*; gview %s; edit=gvim -f %s; compose=gvim -f %s; description="Text"; test=
 text/*; less %s; edit=vim %s; needsterminal; description=Text; test=test -n "`which less 2>/dev/null`"
 text/*; more %s; edit=vi %s; needsterminal; description=Text; test=test -n "`which more 2>/dev/null`"
 
-video/mpeg; smplay %s; description="MPEG video files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`"
 video/mpeg; mplay %s; description="MPEG video files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`"
-video/ogg; smplay %s; description="Ogg Theora files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`"
 video/ogg; mplay %s; description="Ogg Theora files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`"
-video/quicktime; smplay %s; description="QuickTime video files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`"
 video/quicktime; mplay %s; description="QuickTime video files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`"
-video/x-msvideo; smplay %s; description="AVI video files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`"
 video/x-msvideo; mplay %s; description="AVI video files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`"
-video/*; smplay %s; description="Video files"; test=test -n "$DISPLAY" -a -n "`which smplayer 2>/dev/null`" -a -n "`which smplay 2>/dev/null`"
 video/*; mplay %s; description="Video files"; test=test -n "$DISPLAY" -a -n "`which mplayer 2>/dev/null`" -a -n "`which mplay 2>/dev/null`"
 
 x-world/x-vrml; freewrl -url %s; test=test -n "$DISPLAY" -a -n "`which freewrl 2>/dev/null`"; description="VRML world"; nametemplate=%s.wrl

diff --git a/.mc/mc.ext b/.mc/mc.ext
index e0a8118e4538d35ece207d2b9aa6ce403e834d71..3388f4f6ec81fef113c788be737aed192872b93c 100644 (file)
--- a/.mc/mc.ext
+++ b/.mc/mc.ext
@@ -777,7 +777,6 @@ include/audio
    Open=[ "`audtool --get-volume`" -eq 0 ] && (audacious & sleep 3); audtool --playlist-clear --playlist-addurl %f --playback-play
    #Open=mplayer %f &
    #Open=deadbeef %f &
-   #Open=mediaplayer_open %f
    View=%view{ascii} %f
 
 include/msoffice
@@ -787,7 +786,6 @@ include/msoffice
 
 include/video
    Open=mplayer %f &
-   #Open=mediaplayer_open %f
    View=%view{ascii} %f
 
 include/xml

diff --git a/.mc/menu b/.mc/menu
index 89be2d2828324e888676f9d9dbe305e9acc1ecf1..e868e72c8f03a1cc28914913cc7c52c76d9b2349 100644 (file)
--- a/.mc/menu
+++ b/.mc/menu
@@ -118,7 +118,6 @@ a  Add the audiofile(s) or playlist(s)
    for f in %s; do
       audtool --playlist-addurl "$f"
    done
-   #smplay -add-to-playlist %s &
    #deadbeef --queue %s &
 
 + t lr & f \.(aac|ac3|ape|cue|dts|flac|m3u|mka|mp3|MP3|ogg|OGG|pls|WAV|wav|wv)$ | t t
@@ -129,8 +128,6 @@ p  Load the audiofile(s) or playlist(s)
    for f in %s; do
       audtool --playlist-addurl "$f"
    done
-   #smplayer -send-action pl_remove_all
-   #smplay -add-to-playlist %s &
    #deadbeef --queue %s &
 
 + t lr & f \.(aac|ac3|ape|cue|dts|flac|m3u|mka|mp3|MP3|ogg|OGG|pls|WAV|wav|wv)$ | t t
@@ -142,9 +139,7 @@ P  Play the audiofile(s) or playlist(s)
    done
    exec audtool --playback-play
    #mplayer -playlist %f &
-   #smplay %s &
    #deadbeef %s &
-   #exec mediaplayer_open %f
 
 + t lr & f \.m3u
 R  Play the playlist in random order
@@ -154,20 +149,9 @@ R  Play the playlist in random order
    audtool --playlist-addurl random-playlist-tmp.m3u
    audtool --playback-play
    #mplayer -playlist random-playlist-tmp.m3u &
-   #smplay random-playlist-tmp.m3u &
-   #smplay -actions pl_shuffle %f &
    #deadbeef --queue random-playlist-tmp.m3u & deadbeef --play
-   #mediaplayer_open random-playlist-tmp.m3u
    (sleep 5; exec rm random-playlist-tmp.m3u) &
 
-+ f \.(aac|ac3|ape|cue|dts|flac|m3u|mp3|MP3|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|iso|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t d | t t
-s  Play audio/video file(s) or directory with smplayer
-   smplay %s &
-
-+ t d & f (video_ts|VIDEO_TS)$
-c  Play the current directory with smplayer
-   smplay . &
-
 + t lr & f \.(m3u|mp3|MP3|cue|aac|ac3|ape|dts|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)$
 i  Audio/video info
    exec "$HOME"/.config/mpv/mpv_identify.sh %f