aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/emms-player-mplayer.el7
-rw-r--r--lisp/emms-player-vlc.el7
-rw-r--r--lisp/emms.el13
3 files changed, 14 insertions, 13 deletions
diff --git a/lisp/emms-player-mplayer.el b/lisp/emms-player-mplayer.el
index b52503a..2fc5d3b 100644
--- a/lisp/emms-player-mplayer.el
+++ b/lisp/emms-player-mplayer.el
@@ -35,11 +35,8 @@
(define-emms-simple-player mplayer '(file url)
(concat "\\`\\(http\\|mms\\)://\\|"
- (emms-player-simple-regexp
- "ogg" "mp3" "wav" "mpg" "mpeg" "wmv" "wma"
- "mov" "avi" "divx" "ogm" "ogv" "asf" "mkv"
- "rm" "rmvb" "mp4" "flac" "vob" "m4a" "ape"
- "flv" "webm" "aif"))
+ (apply #'emms-player-simple-regexp
+ emms-player-base-format-list))
"mplayer" "-slave" "-quiet" "-really-quiet")
(define-emms-simple-player mplayer-playlist '(streamlist)
diff --git a/lisp/emms-player-vlc.el b/lisp/emms-player-vlc.el
index b11b33d..8a95297 100644
--- a/lisp/emms-player-vlc.el
+++ b/lisp/emms-player-vlc.el
@@ -31,11 +31,8 @@
;; in order to accomodate VLC's particular idioms.
(define-emms-simple-player vlc '(file url)
(concat "\\`\\(http\\|mms\\)://\\|"
- (emms-player-simple-regexp
- "ogg" "mp3" "wav" "mpg" "mpeg" "wmv" "wma"
- "mov" "avi" "divx" "ogm" "ogv" "asf" "mkv"
- "rm" "rmvb" "mp4" "flac" "vob" "m4a" "ape"
- "flv" "webm" "aif"))
+ (apply #'emms-player-simple-regexp
+ emms-player-base-format-list))
"vlc" "--intf=rc")
(define-emms-simple-player vlc-playlist '(streamlist)
diff --git a/lisp/emms.el b/lisp/emms.el
index 148477a..253cfd2 100644
--- a/lisp/emms.el
+++ b/lisp/emms.el
@@ -316,9 +316,9 @@ This also disables any read-onliness of the current buffer."
(emms-playlist-current-clear))
(let ((emms-source-old-buffer (or emms-source-old-buffer
(current-buffer))))
- (with-current-buffer emms-playlist-buffer
- (let ((inhibit-read-only t))
- ,@body)))))
+ (with-current-buffer emms-playlist-buffer
+ (let ((inhibit-read-only t))
+ ,@body)))))
(put 'with-current-emms-playlist 'lisp-indent-function 0)
(put 'with-current-emms-playlist 'edebug-form-spec '(body))
@@ -358,6 +358,13 @@ Point will not be restored afterward."
(put 'emms-walk-tracks 'lisp-indent-function 0)
(put 'emms-walk-tracks 'edebug-form-spec '(body))
+(defvar emms-player-base-format-list
+ '("ogg" "mp3" "wav" "mpg" "mpeg" "wmv" "wma"
+ "mov" "avi" "divx" "ogm" "ogv" "asf" "mkv"
+ "rm" "rmvb" "mp4" "flac" "vob" "m4a" "ape"
+ "flv" "webm" "aif")
+ "A list of common formats which player definitions can use.")
+
;;; User Interface