:type '(string))
(defface emus-artist
- '((t :inherit font-lock-string-face :background "#333"))
+ '((((background dark)) :inherit font-lock-string-face :background "#222" :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 :background "#111" :extend t)
+ (t :inherit font-lock-constant-face :background "#eee" :extend t))
"Face used for album names in browser.")
(defface emus-track
"Face used for track titles in browser.")
(defface emus-track-current
- '((t :inherit font-lock-keyword-face :inverse-video t))
+ '((t :inherit font-lock-keyword-face :inverse-video t :extend t))
"Face used for track titles in browser.")
(defface emus-cursor
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
+ #'expand-file-name
+ (directory-files-recursively emus-directory ".*\\.mp3")))
+
+(defun emus-get-playlist-files ()
+ "Get all m3u files in the main emus music directory."
+ (mapcar
+ #'expand-file-name
+ (directory-files-recursively emus-directory ".*\\.m3u")))
(defun emus-make-track (artist album title filename &optional pos)
"Create an object representing an emus track.
refers to the mp3 file containing the track. If non-nil, POS
specifies the position of the record representing this track in the
emus browser buffer."
- (vector artist album title filename pos))
+ (list artist album title filename pos))
(defun emus-track-artist (track)
"The artist corresponding to TRACK."
(defun emus-set-track-browser-pos (track pos)
"Set the location of the browser buffer record corresponding to TRACK to POS."
- (aset track 4 pos))
+ (setf (seq-elt track 4) pos))
(defun emus--load-library (then)
"Initialize the emus track library.
(setq emus--proc-in-use t)
(emus--suspend-cp)
(setq emus-state 'stopped)
+ (setq emus-tracks (emus--make-tracks-from-playlist-files (emus-get-playlist-files)))
(let ((proc (emus-get-process))
(tagstr "")
(filenames (emus-get-audio-files)))
- (setq emus-tracks nil)
(set-process-filter proc (lambda (proc string)
(setq tagstr (concat tagstr string))
(when (string-suffix-p "@P 1\n" string)
(setq emus--proc-in-use nil)))))
(emus--send-cmd-raw "lp" (car filenames)))))
+(defun emus--dump-tracks ()
+ emus-tracks)
+
(defun emus--make-track-from-tagstr (filename tagstr)
"Parse TAGSTR to populate the fields of a track corresponding to FILENAME."
(let ((artist "")
(found-artist (setq artist found-artist))
(found-album (setq album found-album))
(found-title (setq title found-title)))))
- (emus-make-track artist album title filename nil)))
+ (emus-make-track artist album title filename)))
+
+(defun emus--make-tracks-from-playlist-files (filenames)
+ (let ((tracks nil))
+ (dolist (filename filenames)
+ (let ((artist "Playlists")
+ (album (file-name-base filename))
+ (title nil)
+ (lines (split-string (with-temp-buffer
+ (insert-file-contents filename)
+ (buffer-string))
+ "\n")))
+ (dolist (line lines)
+ (pcase (string-trim line)
+ ((rx (: string-start
+ (* space)
+ "#extinf:"
+ (* (not ",")) ","
+ (let display-title (* any))
+ string-end))
+ (setq title display-title))
+ ((rx (: string-start (* space) "#"))) ;skip other comments
+ ((rx (let filename (+ any)))
+ (setq tracks (cons (emus-make-track artist album (or title filename) filename)
+ tracks))
+ (setq title nil))))))
+ tracks))
(defun emus--sort-tracks ()
"Sort the library tracks according to artist and album.
Leaves the track titles unsorted, so they will appear in the order specified
by the filesystem."
- (sort emus-tracks
- (lambda (r1 r2)
- (let ((artist1 (emus-track-artist r1))
- (artist2 (emus-track-artist r2)))
- (if (string= artist1 artist2)
- (let ((album1 (emus-track-album r1))
- (album2 (emus-track-album r2)))
- (string< album1 album2))
- (string< artist1 artist2))))))
+ (setq emus-tracks
+ (sort emus-tracks
+ (lambda (r1 r2)
+ (let ((artist1 (emus-track-artist r1))
+ (artist2 (emus-track-artist r2)))
+ (if (string= artist1 artist2)
+ (let ((album1 (emus-track-album r1))
+ (album2 (emus-track-album r2)))
+ (string< album1 album2))
+ (if (equal artist1 "Playlists")
+ t
+ (if (equal artist2 "Playlists")
+ nil
+ (string< artist1 artist2)))))))))
(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."
('paused " [Paused]")
('playing " [Playing]")
(_ ""))
- (if emus-current-track
- (format " - %.30s (%.20s)"
- (emus-track-title emus-current-track)
- (emus-track-artist emus-current-track))
- ""))
- emus-current-volume)))
+ " %s")
+ emus-current-volume
+ (if emus-current-track
+ (format "- %.30s (%.20s)"
+ (emus-track-title emus-current-track)
+ (emus-track-artist emus-current-track))
+ ""))))
;;; Browser
(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)))
+ (album-symb (intern (concat artist album)))
+ (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
+ 'invisible album-symb
+ 'field field)
(insert (propertize "\n"
'face (if is-current
'emus-track-current
- 'emus-track))))))
+ 'emus-track)
+ 'field field
+ 'invisible album-symb)))))
(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 (get-buffer "*emus*")
- (when emus-current-track
- (goto-char (emus-track-browser-pos emus-current-track))
- (recenter))))
+ (when (and (get-buffer "*emus*")
+ emus-current-track)
+ (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
- (switch-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.")
(define-derived-mode emus-browser-mode special-mode "emus-browser"
- "Major mode for EMUS music player file browser.")
+ "Major mode for EMUS music player file browser."
+ (setq-local buffer-invisibility-spec nil))
(when (fboundp 'evil-set-initial-state)
(evil-set-initial-state 'emus-browser-mode 'motion))
The Lambda Lab / projects / emus.git / blobdiff