diff options
author | William Xu <william.xwl@gmail.com> | 2009-07-26 12:56:27 +0800 |
---|---|---|
committer | William Xu <william.xwl@gmail.com> | 2009-07-26 12:56:27 +0800 |
commit | 79096375362b8ee33ee5842e0f94da90535e2999 (patch) | |
tree | d1545d1a940aeb8b9d4171c2d946af9c6723772b /lisp/emms-player-vlc.el | |
parent | 6ad7be5a8dfce022a64a059dd4e5e3e0061ce33f (diff) | |
parent | 67bcbeb63bd0d73632992d0106524b118a89fd29 (diff) |
Merge branch 'master' of ssh://xwl@git.sv.gnu.org/srv/git/emms
Diffstat (limited to 'lisp/emms-player-vlc.el')
-rw-r--r-- | lisp/emms-player-vlc.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emms-player-vlc.el b/lisp/emms-player-vlc.el index 3aea1d3..9a42434 100644 --- a/lisp/emms-player-vlc.el +++ b/lisp/emms-player-vlc.el @@ -33,7 +33,7 @@ (concat "\\`\\(http\\|mms\\)://\\|" (emms-player-simple-regexp "ogg" "mp3" "wav" "mpg" "mpeg" "wmv" "wma" - "mov" "avi" "divx" "ogm" "asf" "mkv" + "mov" "avi" "divx" "ogm" "ogv" "asf" "mkv" "rm" "rmvb" "mp4" "flac" "vob" "m4a" "ape")) "vlc" "--intf" "rc") ; these are never used @@ -54,7 +54,7 @@ ;; splice in params here (append '("vlc" "--intf" "rc") (list (emms-track-name track)) - '("vlc:quit"))))) + '("vlc://quit"))))) ;; add a sentinel for signaling termination (set-process-sentinel process 'emms-player-simple-sentinel)) (emms-player-started emms-player-vlc)) |