X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.mc%2Fmenu;h=393bf298c5a2c8f840ce19bdbcb30741a637df31;hb=0f4dc79d6fbbea0dddd98ee5e3ced118b45fa2df;hp=12cccaec8695fd78cdd72f110a6339de5c1b0888;hpb=d233a7efd2c541be29f92d94a1c6f2b467bf2bc4;p=dotfiles.git

diff --git a/.mc/menu b/.mc/menu
index 12cccae..393bf29 100644
--- a/.mc/menu
+++ b/.mc/menu
@@ -63,7 +63,7 @@ T  fb2txt
 
 + t lr & f \.(pdf|PDF)$
 v  View pdf
-   pdftotext %f - | iconv.py -f utf-8 | ${PAGER:-more}
+   pdftotext -layout -q %f - | iconv.py -f utf-8 | ${PAGER:-more}
 
 += t lr & f \.(pdf|PDF)$
 e  View pdf with evince
@@ -122,28 +122,43 @@ I  View icon, JPEG-2000, TIFF, WebP image
 
 + t lr & f \.(aac|ac3|ape|cue|dts|flac|m3u|mka|mp3|MP3|ogg|OGG|pls|WAV|wav|wv)$ | t t
 a  Add the audiofile(s) or playlist(s)
-   if [ "`audtool --get-volume`" -eq 0 ]; then cgmem_nice 200 audacious & sleep 3; fi
+   if [ "`audtool --get-volume`" -eq 0 ]; then audacious & sleep 3; fi
    for f in %s; do
-      audtool --playlist-addurl "$f"
+      case "$f" in
+         *.m3u) while read song; do
+            audtool --playlist-addurl "$song"
+         done < "$f" ;;
+         *) audtool --playlist-addurl "$f" ;;
+      esac
    done
    #deadbeef --queue %s &
 
 + t lr & f \.(aac|ac3|ape|cue|dts|flac|m3u|mka|mp3|MP3|ogg|OGG|pls|WAV|wav|wv)$ | t t
 = t lr & f \.(aac|ac3|ape|cue|dts|flac|m3u|mka|mp3|MP3|ogg|OGG|pls|WAV|wav|wv)$
 p  Load the audiofile(s) or playlist(s)
-   if [ "`audtool --get-volume`" -eq 0 ]; then cgmem_nice 200 audacious & sleep 3; fi
+   if [ "`audtool --get-volume`" -eq 0 ]; then audacious & sleep 3; fi
    audtool --playlist-clear
    for f in %s; do
-      audtool --playlist-addurl "$f"
+      case "$f" in
+         *.m3u) while read song; do
+            audtool --playlist-addurl "$song"
+         done < "$f" ;;
+         *) audtool --playlist-addurl "$f" ;;
+      esac
    done
    #deadbeef --queue %s &
 
 + t lr & f \.(aac|ac3|ape|cue|dts|flac|m3u|mka|mp3|MP3|ogg|OGG|pls|WAV|wav|wv)$ | t t
 P  Play the audiofile(s) or playlist(s)
-   if [ "`audtool --get-volume`" -eq 0 ]; then cgmem_nice 200 audacious & sleep 3; fi
+   if [ "`audtool --get-volume`" -eq 0 ]; then audacious & sleep 3; fi
    audtool --playlist-clear
    for f in %s; do
-      audtool --playlist-addurl "$f"
+      case "$f" in
+         *.m3u) while read song; do
+            audtool --playlist-addurl "$song"
+         done < "$f" ;;
+         *) audtool --playlist-addurl "$f" ;;
+      esac
    done
    exec audtool --playback-play
    #mplayer -playlist %f &
@@ -151,14 +166,16 @@ P  Play the audiofile(s) or playlist(s)
 
 + t lr & f \.m3u
 R  Play the playlist in random order
-   "$HOME"/admin/prog/audio-cdr-video/audio/shuffle-playlist.py %f random-playlist-tmp.m3u
-   if [ "`audtool --get-volume`" -eq 0 ]; then cgmem_nice 200 audacious & sleep 3; fi
+   "$HOME"/admin/prog/audio-cdr-video/audio/shuffle-playlist.py %f /tmp/random-playlist-tmp.m3u
+   if [ "`audtool --get-volume`" -eq 0 ]; then audacious & sleep 3; fi
    audtool --playlist-clear
-   audtool --playlist-addurl random-playlist-tmp.m3u
+   while read song; do
+      audtool --playlist-addurl "$song"
+   done < /tmp/random-playlist-tmp.m3u
    audtool --playback-play
    #mplayer -playlist random-playlist-tmp.m3u &
    #deadbeef --queue random-playlist-tmp.m3u & deadbeef --play
-   (sleep 5; exec rm random-playlist-tmp.m3u) &
+   (sleep 5; exec rm /tmp/random-playlist-tmp.m3u) &
 
 + 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