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
Expands "~" in file names before sending to mpg123.
[emus.git]
/
emus.el
diff --git
a/emus.el
b/emus.el
index
84a9b9c
..
23a1da1
100644
(file)
--- a/
emus.el
+++ b/
emus.el
@@
-115,7
+115,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
+140,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
+240,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))))