diff options
| author | Michael Olson <mwolson@gnu.org> | 2008-09-20 10:33:29 -0700 |
|---|---|---|
| committer | Michael Olson <mwolson@gnu.org> | 2008-09-20 10:33:29 -0700 |
| commit | c5bf649d13f04bf2e22a548163b971f3fbf74b1b (patch) | |
| tree | 7d48f10701f59c174967259c6edc0691b9ad72e6 /lisp/emms-player-simple.el | |
| parent | ba8b47960a5722d28ada46d850a9272cd5482a66 (diff) | |
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.
Diffstat (limited to 'lisp/emms-player-simple.el')
| -rw-r--r-- | lisp/emms-player-simple.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/emms-player-simple.el b/lisp/emms-player-simple.el index 6286504..08b3b7d 100644 --- a/lisp/emms-player-simple.el +++ b/lisp/emms-player-simple.el @@ -175,9 +175,9 @@ PLAYER is the name of the current player." (emms-player-simple-regexp "mp3" "ogg" "mod" "flac" "xm" "it" "ft") "gst-wrapper" "alsasink") (define-emms-simple-player mikmod '(file) - (emms-player-simple-regexp ".669" ".amf" ".dsm" ".far" ".gdm" ".it" - ".imf" ".mod" ".med" ".mtm" ".okt" ".s3m" - ".stm" ".stx" ".ult" ".apun" ".xm" ".mod") + (emms-player-simple-regexp "669" "amf" "dsm" "far" "gdm" "it" + "imf" "mod" "med" "mtm" "okt" "s3m" + "stm" "stx" "ult" "apun" "xm" "mod") "mikmod" "-q" "-p" "1" "-X") (define-emms-simple-player timidity '(file) (emms-player-simple-regexp "mid" "rmi" "rcp" "r36" "g18" "g36" "mfi") @@ -186,7 +186,8 @@ PLAYER is the name of the current player." (emms-player-simple-regexp "mid") "fluidsynth" "-aalsa" "-in" "/media/music/sf/FluidR3-GM.SF2") (define-emms-simple-player alsaplayer '(file url) - (emms-player-simple-regexp ".ogg" ".mp3" ".wav" ".flac" ".pls" ".m3u" "http://") + (concat "\\`http://\\|" + (emms-player-simple-regexp "ogg" "mp3" "wav" "flac" "pls" "m3u")) "alsaplayer" "--quiet" "--nosave" "\"--interface text\"") (emms-player-set emms-player-alsaplayer |