X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=media.el;h=2e60e47f01dfe8ebf51cda62b8363d41d30e2789;hb=b8c447c964af6561cd1628a12423039ad86f485b;hp=c2dd4e79114d5d084d80a53d8a42f425e39c64bc;hpb=72490f36fb1816dcc4df979fcc7f2f50dbce8a02;p=elisp.git diff --git a/media.el b/media.el index c2dd4e7..2e60e47 100644 --- a/media.el +++ b/media.el @@ -103,8 +103,13 @@ title to display in the list (convenient for internet radios)." :type 'boolean :group 'media) +(defcustom media/continue-mode-hint "*" + "What to append to the MPlayer string when in repeat mode" + :type 'string + :group 'media) + (defcustom media/expert nil - "Should the keymap help be shown?" + "Should we bypass the keymap help when starting" :type 'boolean :group 'media) @@ -620,9 +625,11 @@ returns nil if no id3 tags could be found." (title (or (and (consp c) (cdr c)) url))) (if (string-match "^\\(http\\|mms\\)://" url) (media/insert-url (cons url title) 0) - (if (file-regular-p url) (media/insert-file url 0) - (if (file-directory-p url) (media/insert-dir url 0) - (error "Unknown type `%s'" url)))))) + (if (file-exists-p url) + (if (file-regular-p url) (media/insert-file url 0) + (if (file-directory-p url) (media/insert-dir url 0) + (error "Unknown type `%s'" url)))) + ))) list)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -659,8 +666,7 @@ returns nil if no id3 tags could be found." (push (cons url (cons title time)) (cdr (assoc playlist list))) ))))) - (save-excursion - (set-buffer (find-file-noselect media/playlist-file)) + (with-current-buffer (find-file-noselect media/playlist-file) (erase-buffer) (mapc (lambda (x) (insert "PLAYLIST:" (car x) "\n") @@ -914,7 +920,7 @@ which stops when the songs ends." (concat " " media/player-id - (if media/continue-mode "*") + (if media/continue-mode media/continue-mode-hint) " " (if media/current-information