X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=emus.el;h=71c6bd29a594eaea453e1f75490af0f2d01fed1a;hb=77849dd4c8b7e8485d9113e6afcdf721b316c12c;hp=cfa3d650f5ae69fe345c436ceae24fa28811368d;hpb=fb0e676fc470481bb45da18eebf27a9a63fe3a25;p=emus.git

diff --git a/emus.el b/emus.el
index cfa3d65..71c6bd2 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
@@ -125,8 +125,8 @@
                                (setq tagstr (concat tagstr string))
                                (when (string-suffix-p "@P 1\n" string)
                                  (add-to-list 'emus-tracks
-                                              (emus--make-track-from-tagstr (car filenames
-                                                                             tagstr)))
+                                              (emus--make-track-from-tagstr (car filenames)
+                                                                            tagstr))
                                  (setq tagstr "")
                                  (setq filenames (cdr filenames))
                                  (if filenames
@@ -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)
@@ -315,11 +315,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 +433,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 +459,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 +515,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.")