From c92da9a0c269c046433c427caafb175cb250de94 Mon Sep 17 00:00:00 2001 From: Lucas Bonnet Date: Tue, 29 Jun 2010 09:03:34 +0200 Subject: From: Dimitry Gashinsky * emms-player-vlc.el (define-emms-simple-player): Change the command line arguments from two to one. * emms-player-vlc.el (emms-player-vlc-start): Use the variables that are defined earlier --- lisp/emms-player-vlc.el | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'lisp') diff --git a/lisp/emms-player-vlc.el b/lisp/emms-player-vlc.el index 34ddd25..08b0760 100644 --- a/lisp/emms-player-vlc.el +++ b/lisp/emms-player-vlc.el @@ -31,15 +31,15 @@ ;; 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")) - "vlc" "--intf" "rc") ; these are never used + (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")) + "vlc" "--intf=rc") (define-emms-simple-player vlc-playlist '(streamlist) "\\`http://" - "vlc" "--intf" "rc") ; these are never used + "vlc" "--intf=rc") ;; (kludge) By default, VLC does not quit after finishing to play a ;; track, so the player sentinel has no way of telling that the next @@ -47,13 +47,13 @@ ;; function and add a "quit" track which is invisible to Emms. (defadvice emms-player-vlc-start (around quit-vlc-after-finish activate) (let ((process (apply 'start-process - emms-player-simple-process-name - nil - "vlc" - ;; splice in params here - (append '("vlc" "--intf" "rc") - (list (emms-track-name (ad-get-arg 0))) - '("vlc://quit"))))) + emms-player-simple-process-name + nil + emms-player-vlc-command-name + ;; splice in params here + (append emms-player-vlc-parameters + (list (emms-track-name (ad-get-arg 0))) + '("vlc://quit"))))) ;; add a sentinel for signaling termination (set-process-sentinel process 'emms-player-simple-sentinel)) (emms-player-started emms-player-vlc)) -- cgit v1.2.3