The Lambda Lab
/
projects
/
emus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated faces for 27.1.
[emus.git]
/
emus.el
diff --git
a/emus.el
b/emus.el
index
7c90711
..
cfa674a
100644
(file)
--- a/
emus.el
+++ b/
emus.el
@@
-57,11
+57,13
@@
:type '(string))
(defface emus-artist
: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
"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
"Face used for album names in browser.")
(defface emus-track
@@
-115,7
+117,6
@@
Used to prevent commands from interfering with library construction.")
emus-process
(let ((proc
(make-process :name "emus-process"
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")
:command `(,emus-mpg123-program "-R"))))
(set-process-query-on-exit-flag proc nil)
(process-send-string proc "silence\n")
@@
-141,7
+142,10
@@
be used by `emus--load-library'."
(defun emus-get-audio-files ()
"Get all mp3 files in main emus directory."
(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.
(defun emus-make-track (artist album title filename &optional pos)
"Create an object representing an emus track.
@@
-238,7
+242,7
@@
by the filesystem."
(defmacro emus--with-library (&rest body)
"Evaluate BODY with the library initialized."
`(if emus-tracks
(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))))
(emus--load-library
(lambda () ,@body))))
@@
-531,7
+535,7
@@
Used to update browser display when `emus-current-track' and/or `emus-state' cha
"Switch to *emus* audio library browser."
(interactive)
(emus--with-library
"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-goto-current)))
(emus-browser-mode)
(emus--render-tracks)
(emus-goto-current)))