diff options
| author | jao <jao@gnu.org> | 2020-10-27 03:56:51 +0000 |
|---|---|---|
| committer | jao <jao@gnu.org> | 2020-10-27 03:56:51 +0000 |
| commit | 6bbbc093f952440bc1c7a575779459988b55037c (patch) | |
| tree | 1d2e566d548acbf092f67493fac0b49b5bf534e0 | |
| parent | df16f2939e1c8a68a7df3bf68d3449653e81ecd7 (diff) | |
| download | elibs-6bbbc093f952440bc1c7a575779459988b55037c.tar.gz elibs-6bbbc093f952440bc1c7a575779459988b55037c.tar.bz2 | |
tweaks for emms track info display
| -rw-r--r-- | emms/jao-emms-info-track.el | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/emms/jao-emms-info-track.el b/emms/jao-emms-info-track.el index d2157be..9cf1c55 100644 --- a/emms/jao-emms-info-track.el +++ b/emms/jao-emms-info-track.el @@ -74,18 +74,25 @@ (defun jao-emms-info-track-file (track &optional lapsed plen titlesep) "Return a description of the current track." - (let ((no (jao-emms--to-number (emms-track-get track 'info-tracknumber "0"))) - (time (emms-track-get track 'info-playing-time)) - (artist (emms-track-get track 'info-artist "")) - (composer (emms-track-get track 'info-composer nil)) - (title (emms-track-get track 'info-title "")) - (album (emms-track-get track 'info-album)) - (last-played (or (emms-track-get track 'last-played) '(0 0 0))) - (play-count (or (emms-track-get track 'play-count) 0)) - (playlength (if plen (format "/%02d" (string-to-number plen)) ""))) + (let* ((no (jao-emms--to-number (emms-track-get track 'info-tracknumber "0"))) + (time (emms-track-get track 'info-playing-time)) + (year (emms-track-get track 'info-year)) + (year (if year (format " (%s)" year) "")) + (artist (emms-track-get track 'info-artist "")) + (composer (emms-track-get track 'info-composer nil)) + (title (emms-track-get track 'info-title "")) + (album (emms-track-get track 'info-album)) + (last-played (or (emms-track-get track 'last-played) '(0 0 0))) + (play-count (or (emms-track-get track 'play-count) 0)) + (playlength (if plen (format "/%02d" (string-to-number plen)) ""))) (if (or (not title) (not album)) (emms-track-simple-description track) (format "♪ %s%s%s%s%s%s%s" + (jao--put-face (if (zerop no) "" (format "%02d%s " no playlength)) + 'jao-emms-font-lock-track) + (jao--put-face title + 'jao-emms-font-lock-title) + (or titlesep " ") (if lapsed (format "[%s%s] " (jao-emms--fmt-time lapsed "/") @@ -94,13 +101,10 @@ (jao--put-face artist 'jao-emms-font-lock-artist) (jao--put-face (if composer (format " [%s]" composer) "") 'jao-emms-font-lock-artist) - (jao--put-face (if album (format " (%s)" album) " *") - 'jao-emms-font-lock-album) - (or titlesep "") - (jao--put-face (if (zerop no) "" (format " %02d%s " no playlength)) - 'jao-emms-font-lock-track) - (jao--put-face title - 'jao-emms-font-lock-title))))) + (jao--put-face (if album + (format " (%s%s)" album year) + (format "%s *") year) + 'jao-emms-font-lock-album))))) ;;;###autoload (defun jao-emms-info-track-description (track &optional lapsed plen tsep) @@ -137,7 +141,7 @@ (s (jao-emms-info-track-description track lapsed play-len sep)) (s (substring-no-properties s 2)) (cs (split-string s sep))) - (jao-notify (cadr cs) (car cs) jao-emms-show-icon))))) + (jao-notify (car cs) (cadr cs) jao-emms-show-icon))))) (defun jao-emms-show-osd-hook () (interactive) |