: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
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")
(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.
(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))))
(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."
(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."
(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
'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
'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.
(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."
(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 ()
(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
(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.")