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-source-playlist.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lisp/emms-source-playlist.el') diff --git a/lisp/emms-source-playlist.el b/lisp/emms-source-playlist.el index 3db4ba2..6c580f3 100644 --- a/lisp/emms-source-playlist.el +++ b/lisp/emms-source-playlist.el @@ -265,7 +265,7 @@ detected and simply return non-nil always." (defun emms-source-playlist-parse-m3u () "Parse the m3u playlist in the current buffer." (mapcar (lambda (file) - (if (string-match "\\`http://\\|\\`mms://" file) + (if (string-match "\\`\\(http\\|mms\\)://" file) (emms-track 'url file) (emms-track 'file file))) (emms-source-playlist-m3u-files))) @@ -333,7 +333,7 @@ OUT should be the buffer where tracks are stored in m3u format." (defun emms-source-playlist-parse-pls () "Parse the pls playlist in the current buffer." (mapcar (lambda (file) - (if (string-match "\\`http://\\|\\`mms://" file) + (if (string-match "\\`\\(http\\|mms\\)://" file) (emms-track 'url file) (emms-track 'file file))) (emms-source-playlist-pls-files))) -- cgit v1.2.3