X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=emus.el;h=cfa674a86ea8b49a1142003d5b40738dbeb3d607;hb=2da3ca6418339e37c7ba8c801492b99ac6faed37;hp=e5296978cf703384622228d51b9241019c8365bc;hpb=b1db216e7ebeb8f52138a0ec201b3aba6c6c5c31;p=emus.git diff --git a/emus.el b/emus.el index e529697..cfa674a 100644 --- a/emus.el +++ b/emus.el @@ -57,11 +57,13 @@ :type '(string)) (defface emus-artist - '((t :inherit font-lock-string-face :background "#333")) + '(((background dark) :inherit font-lock-string-face :inverse-video t :extend t) + (t :inherit font-lock-string-face :background "#ddd" :extend t)) "Face used for artist names in browser.") (defface emus-album - '((t :inherit font-lock-constant-face :background "#222")) + '(((background dark) :inherit font-lock-constant-face :inverse-video t :extend t) + (t :inherit font-lock-constant-face :background "#eee" :extend t)) "Face used for album names in browser.") (defface emus-track @@ -115,7 +117,6 @@ Used to prevent commands from interfering with library construction.") emus-process (let ((proc (make-process :name "emus-process" - ;; :buffer (get-buffer-create "*emus-process*") :command `(,emus-mpg123-program "-R")))) (set-process-query-on-exit-flag proc nil) (process-send-string proc "silence\n") @@ -141,7 +142,10 @@ be used by `emus--load-library'." (defun emus-get-audio-files () "Get all mp3 files in main emus directory." - (directory-files-recursively emus-directory ".*\\.mp3")) + (mapcar + (lambda (f) + (expand-file-name f)) + (directory-files-recursively emus-directory ".*\\.mp3"))) (defun emus-make-track (artist album title filename &optional pos) "Create an object representing an emus track. @@ -238,7 +242,7 @@ by the filesystem." (defmacro emus--with-library (&rest body) "Evaluate BODY with the library initialized." `(if emus-tracks - (progn ,@body) + (unless emus--proc-in-use ,@body) (emus--load-library (lambda () ,@body)))) @@ -269,7 +273,8 @@ by the filesystem." (setq emus-current-track track) (emus--update-track old-track) (emus--update-track track) - (emus--resume-cp)))) + (emus--resume-cp) + (emus-goto-current)))) (defun emus-select-track (track) "Set TRACK as current, but do not start playing." @@ -280,7 +285,8 @@ by the filesystem." (emus--update-track old-track) (emus--update-track track) (emus-send-cmd "o") - (emus--resume-cp)))) + (emus--resume-cp) + (emus-goto-current)))) (defun emus-stop () "Stop playback of the current track." @@ -431,7 +437,8 @@ and thus requires both artist and album headers." (let* ((artist (emus-track-artist track)) (album (emus-track-album track)) (title (emus-track-title track)) - (help-str (format "mouse-1, RET: Play '%.30s' (%.20s)" title artist))) + (help-str (format "mouse-1, RET: Play '%.30s' (%.20s)" title artist)) + (field (intern album))) ;Allows easy jumping between albums with cursor. (when (or prev-track first) (unless (equal (emus-track-artist prev-track) artist) (insert-text-button @@ -439,16 +446,22 @@ and thus requires both artist and album headers." 'action #'emus--click-track 'follow-link t 'help-echo help-str - 'emus-track track) - (insert (propertize "\n" 'face 'emus-artist))) + 'emus-track track + 'field field) + (insert (propertize "\n" + 'face 'emus-artist + 'field field))) (unless (equal (emus-track-album prev-track) album) (insert-text-button (propertize (concat " " album) 'face 'emus-album) 'action #'emus--click-track 'follow-link t 'help-echo help-str - 'emus-track track) - (insert (propertize "\n" 'face 'emus-album)))) + 'emus-track track + 'field field) + (insert (propertize "\n" + 'face 'emus-album + 'field field)))) (emus-set-track-browser-pos track (point)) (let ((is-current (equal track emus-current-track))) (insert-text-button @@ -468,11 +481,13 @@ and thus requires both artist and album headers." 'action #'emus--click-track 'follow-link t 'help-echo help-str - 'emus-track track) + 'emus-track track + 'field field) (insert (propertize "\n" 'face (if is-current 'emus-track-current - 'emus-track)))))) + 'emus-track) + 'field field))))) (defun emus--update-track (track) "Rerender entry for TRACK in emus browser buffer. @@ -508,22 +523,22 @@ Used to update browser display when `emus-current-track' and/or `emus-state' cha (emus-play-track (button-get button 'emus-track)) (emus-display-status)) -(defun emus-centre-current () - "Centre the current track in the browser buffer, if available." +(defun emus-goto-current () + "Move point to the current track in the browser buffer, if available." (interactive) - (when (and (eq (current-buffer) (get-buffer "*emus*")) + (when (and (get-buffer "*emus*") emus-current-track) - (goto-char (emus-track-browser-pos emus-current-track)) - (recenter))) + (with-current-buffer "*emus*" + (goto-char (emus-track-browser-pos emus-current-track))))) (defun emus-browse () "Switch to *emus* audio library browser." (interactive) (emus--with-library - (pop-to-buffer "*emus*") + (pop-to-buffer-same-window "*emus*") (emus-browser-mode) (emus--render-tracks) - (emus-centre-current))) + (emus-goto-current))) (defun emus-refresh () "Refresh the emus library." @@ -596,10 +611,10 @@ Used to update browser display when `emus-current-track' and/or `emus-state' cha (emus-jump-10s-backward) (emus-display-status)) -(defun emus-centre-current-status () - "Jump 10s backward in current track, then display the emus status in the minibuffer." +(defun emus-goto-current-status () + "Move point to the current track, then display the emus status in the minibuffer." (interactive) - (emus-centre-current) + (emus-goto-current) (emus-display-status)) (defun emus-refresh-status () @@ -625,7 +640,7 @@ Used to update browser display when `emus-current-track' and/or `emus-state' cha (define-key map (kbd "P") 'emus-play-prev-album-status) (define-key map (kbd ",") 'emus-jump-10s-backward-status) (define-key map (kbd ".") 'emus-jump-10s-forward-status) - (define-key map (kbd "c") 'emus-centre-current-status) + (define-key map (kbd "c") 'emus-goto-current-status) (when (fboundp 'evil-define-key*) (evil-define-key* 'motion map (kbd "SPC") 'emus-playpause-status @@ -640,7 +655,7 @@ Used to update browser display when `emus-current-track' and/or `emus-state' cha (kbd "P") 'emus-play-prev-album-status (kbd ",") 'emus-jump-10s-backward-status (kbd ".") 'emus-jump-10s-forward-status - (kbd "c") 'emus-centre-current-status)) + (kbd "c") 'emus-goto-current-status)) map) "Keymap for emus browser.")