From bb46e7695549d207cc00ca216286d1b634f811ee Mon Sep 17 00:00:00 2001 From: William Xu Date: Fri, 22 Feb 2008 09:13:00 +0000 Subject: mplayer,xine: Replace regexp-opt with simple regexp-quote, to avoid using regexp-opt's shy group regexp feature, so that external "find" can work properly. darcs-hash:20080222091303-cfa61-6d3979b424b933da1e6696a9538389614eab13b6.gz --- emms-player-mplayer.el | 8 +++++--- emms-player-xine.el | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/emms-player-mplayer.el b/emms-player-mplayer.el index 2bdecaa..9ed47e4 100644 --- a/emms-player-mplayer.el +++ b/emms-player-mplayer.el @@ -38,9 +38,11 @@ :group 'emms) (define-emms-simple-player mplayer '(file url) - (regexp-opt '(".ogg" ".mp3" ".wav" ".mpg" ".mpeg" ".wmv" ".wma" - ".mov" ".avi" ".divx" ".ogm" ".asf" ".mkv" "http://" "mms://" - ".rm" ".rmvb" ".mp4" ".flac" ".vob" ".m4a" ".ape")) + (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") + "\\|") "mplayer" "-slave" "-quiet" "-really-quiet") (define-emms-simple-player mplayer-playlist '(streamlist) diff --git a/emms-player-xine.el b/emms-player-xine.el index 855abfb..715dec9 100644 --- a/emms-player-xine.el +++ b/emms-player-xine.el @@ -35,9 +35,11 @@ (require 'emms-player-simple) (define-emms-simple-player xine '(file url) - (regexp-opt '(".ogg" ".mp3" ".wav" ".mpg" ".mpeg" ".wmv" ".wma" - ".mov" ".avi" ".divx" ".ogm" ".asf" ".mkv" "http://" "mms://" - ".rm" ".rmvb" ".mp4" ".flac" ".vob")) + (mapconcat 'regexp-quote + '(".ogg" ".mp3" ".wav" ".mpg" ".mpeg" ".wmv" ".wma" + ".mov" ".avi" ".divx" ".ogm" ".asf" ".mkv" "http://" "mms://" + ".rm" ".rmvb" ".mp4" ".flac" ".vob") + "\\|") "xine" "--no-gui" "--no-logo" "--no-splash" "--no-reload" "--stdctl") (emms-player-set emms-player-xine -- cgit v1.2.3