From c5bf649d13f04bf2e22a548163b971f3fbf74b1b Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Sat, 20 Sep 2008 10:33:29 -0700 Subject: Clean up use of regexps to match supported tracks. * lisp/emms-player-mpd.el (emms-player-mpd-supported-regexp): Use emms-player-simple-regexp. * lisp/emms-player-mplayer.el (mplayer): Ditto. (mplayer-playlist): Only match http:// at beginning of filename. * lisp/emms-player-simple.el (mikmod, alsaplayer): Don't put periods in extensions. Separate URLs from extensions. * lisp/emms-player-xine.el (xine): Use emms-player-simple-regexp. * lisp/emms-source-playlist.el (emms-source-playlist-parse-m3u) (emms-source-playlist-parse-pls): Make regexp easier to read. --- lisp/emms-player-mplayer.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lisp/emms-player-mplayer.el') diff --git a/lisp/emms-player-mplayer.el b/lisp/emms-player-mplayer.el index c8bf466..e172015 100644 --- a/lisp/emms-player-mplayer.el +++ b/lisp/emms-player-mplayer.el @@ -34,15 +34,15 @@ (require 'emms-player-simple) (define-emms-simple-player mplayer '(file url) - (mapconcat 'regexp-quote - '(".ogg" ".mp3" ".wav" ".mpg" ".mpeg" ".wmv" ".wma" - ".mov" ".avi" ".divx" ".ogm" ".asf" ".mkv" "http://" "mms://" - ".rm" ".rmvb" ".mp4" ".flac" ".vob" ".m4a" ".ape") - "\\|") + (concat "\\`\\(http\\|mms\\)://\\|" + (emms-player-simple-regexp + "ogg" "mp3" "wav" "mpg" "mpeg" "wmv" "wma" + "mov" "avi" "divx" "ogm" "asf" "mkv" + "rm" "rmvb" "mp4" "flac" "vob" "m4a" "ape")) "mplayer" "-slave" "-quiet" "-really-quiet") (define-emms-simple-player mplayer-playlist '(streamlist) - "http://" + "\\`http://" "mplayer" "-slave" "-quiet" "-really-quiet" "-playlist") (emms-player-set emms-player-mplayer -- cgit v1.2.3