X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=emus.el;h=998a1e8111534e88573dd53cdd3b1c5a38d968b7;hb=b8155ff95e704becb4a93e18d286ceee504b1463;hp=d3ad227c83dd395465b11ef02e8bf30cb0304092;hpb=f657523e20a50ac48bb2163ab0f01c73eb864b2f;p=emus.git diff --git a/emus.el b/emus.el index d3ad227..998a1e8 100644 --- a/emus.el +++ b/emus.el @@ -64,19 +64,19 @@ :type '(string)) (defface emus-artist - '((t :inherit font-lock-keyword-face :background "#333")) + '((t :inherit font-lock-string-face :background "#333")) "Face used for artist names in browser.") (defface emus-album - '((t :inherit font-lock-function-name-face :background "#222")) + '((t :inherit font-lock-constant-face :background "#222")) "Face used for album names in browser.") (defface emus-track - '((t :inherit font-lock-string-face)) + '((t :inherit font-lock-keyword-face)) "Face used for track titles in browser.") (defface emus-track-current - '((t :inherit font-lock-string-face :inverse-video t)) + '((t :inherit font-lock-keyword-face :inverse-video t)) "Face used for track titles in browser.") (defface emus-cursor @@ -194,7 +194,7 @@ (set-process-query-on-exit-flag proc nil) (process-send-string proc "silence\n") proc)))) - + (defun emus-send-cmd (cmd &rest args) (process-send-string (emus-get-process) @@ -241,6 +241,7 @@ (setq emus-current-track track) (emus--update-track old-track) (emus--update-track track) + (emus-centre-current) (emus--resume-cp)))) (defun emus-select-track (track) @@ -251,6 +252,7 @@ (setq emus-current-track track) (emus--update-track old-track) (emus--update-track track) + (emus-centre-current) (emus-send-cmd "o") (emus--resume-cp)))) @@ -315,11 +317,11 @@ (seq-subseq emus-tracks (+ idx 1)))) (current-album (emus-track-album emus-current-track)) (next-track (seq-some (lambda (r) - (if (string= (emus-track-album r) - current-album) - nil - r) - search-list)))) + (if (string= (emus-track-album r) + current-album) + nil + r)) + search-list))) (if next-track (if (eq emus-state 'playing) (emus-play-track next-track) @@ -433,12 +435,12 @@ (with-current-buffer "*emus*" (let ((inhibit-read-only t) (old-point (point))) - (goto-char track-pos) - (search-forward "\n") - (delete-region track-pos (point)) - (goto-char track-pos) - (emus--insert-track track) - (goto-char old-point)))))) + (goto-char track-pos) + (search-forward "\n") + (delete-region track-pos (point)) + (goto-char track-pos) + (emus--insert-track track) + (goto-char old-point)))))) (defun emus--render-tracks () (with-current-buffer "*emus*" @@ -459,7 +461,6 @@ (defun emus-centre-current () (interactive) (when (get-buffer "*emus*") - (switch-to-buffer "*emus*") (when emus-current-track (goto-char (emus-track-browser-pos emus-current-track)) (recenter)))) @@ -516,19 +517,19 @@ (define-key map (kbd "c") 'emus-centre-current-status) (when (fboundp 'evil-define-key*) (evil-define-key* 'motion map - (kbd "SPC") 'emus-playpause-status - (kbd "o") 'emus-stop-status - (kbd "+") 'emus-volume-up-status - (kbd "=") 'emus-volume-up-status - (kbd "-") 'emus-volume-down-status - (kbd "R") 'emus-refresh-status - (kbd "n") 'emus-play-next-status - (kbd "p") 'emus-play-prev-status - (kbd "N") 'emus-play-next-album-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 "SPC") 'emus-playpause-status + (kbd "o") 'emus-stop-status + (kbd "+") 'emus-volume-up-status + (kbd "=") 'emus-volume-up-status + (kbd "-") 'emus-volume-down-status + (kbd "R") 'emus-refresh-status + (kbd "n") 'emus-play-next-status + (kbd "p") 'emus-play-prev-status + (kbd "N") 'emus-play-next-album-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)) map) "Keymap for emus.")