Added mpg123 command-line arguments

[emus.git] / emus.el

diff --git a/emus.el b/emus.el
index 7b65d87..e5f2ea3 100644 (file)
--- a/emus.el
+++ b/emus.el
@@ -56,6 +56,10 @@
   "Name of (and, optionally, path to) mpg123 binary."
   :type '(string))
 
+(defcustom emus-mpg123-args nil
+  "Arguments to pass to mpg123."
+  :type '(repeat string))
+
 (defface emus-artist
   '((((background dark)) :inherit font-lock-string-face :background "#222" :extend t)
     (t :inherit font-lock-string-face :background "#ddd" :extend t))
@@ -125,7 +129,9 @@ To enable or disable progress tracking, using `emus-toggle-progress-tracking'.
         emus-process
       (let ((proc
              (make-process :name "emus-process"
-                           :command `(,emus-mpg123-program "-R"))))
+                           :command `(,emus-mpg123-program
+                                      ,@emus-mpg123-args
+                                      "-R"))))
         (set-process-query-on-exit-flag proc nil)
         (unless emus-progress-enabled
           (process-send-string proc "silence\n"))
@@ -149,15 +155,10 @@ be used by `emus--load-library'."
   "Kill any existing mpg123 process."
   (let ((emus-process (get-process "emus-process")))
     (if emus-process
-        (kill-process emus-process))))
-
-(defun emus-restart ()
-  "Restart emus, regardless of current state."
-  (interactive)
-  (emus-kill-process)
-  (setq emus-state 'stopped
-        emus--proc-in-use nil
-        emus-tracks nil))
+        (kill-process emus-process))
+    (setq emus-state 'stopped
+          emus--proc-in-use nil
+          emus-tracks nil)))
 
 ;;; Library
 ;;
@@ -243,9 +244,9 @@ Once the library is initialized, the function THEN is called."
 
 (defun emus--make-track-from-tagstr (filename tagstr)
   "Parse TAGSTR to populate the fields of a track corresponding to FILENAME."
-  (let ((artist "")
-        (album "")
-        (title ""))
+  (let ((artist "Unknown Artist")
+        (album "Unknown Album")
+        (title filename))
     (dolist (line (split-string tagstr "\n"))
       (let ((found-artist (elt (split-string line "@I ID3v2.artist:") 1))
             (found-album (elt (split-string line "@I ID3v2.album:") 1))
@@ -339,20 +340,22 @@ by the filesystem."
                   (guard emus-continuous-playback)
                   (guard (eq emus-state 'playing)))
              (emus-play-next))
-            ((rx (: string-start
-                    "@I ICY-META: StreamTitle="
-                    (let str (+ (not ";")))
-                    ";"))
+            ((and (guard emus-progress-enabled)
+                  (rx (: string-start
+                         "@I ICY-META: StreamTitle="
+                         (let str (+ (not ";")))
+                         ";")))
              (message (concat "Emus: Playing stream " str)))
-            ((rx (: string-start
-                    "@F "
-                    (+ digit)
-                    " "
-                    (+ digit)
-                    " "
-                    (let left-str (+ (not " ")))
-                    " "
-                    (let right-str (+ any))))
+            ((and (guard emus-progress-enabled)
+                  (rx (: string-start
+                         "@F "
+                         (+ digit)
+                         " "
+                         (+ digit)
+                         " "
+                         (let left-str (+ (not " ")))
+                         " "
+                         (let right-str (+ any)))))
              (let* ((left (string-to-number left-str))
                     (right (string-to-number right-str))
                     (total (+ left right)))
@@ -757,9 +760,23 @@ Used to update browser display when `emus-current-track' and/or `emus-state' cha
   (interactive)
   (emus-stop)
   (setq emus-tracks nil)
-  (emus--with-library
-   (emus-browse)
-   (emus-display-status)))
+  (emus-browse)
+  (emus-display-status))
+
+(defun emus-restart-browse ()
+  "Restart the emus process, then refresh the browse window."
+  (interactive)
+  (message "Restarting mpg123.")
+  (emus-kill-process)
+  (run-at-time 0.1 nil #'emus-browse)) ;Slight delay to wait for kill signal to take effect
+
+(defun emus-restart-status ()
+  "Restart the emus process, then display the status."
+  (interactive)
+  (message "Restarting mpg123.")
+  (emus-kill-process)
+  (run-at-time 0.1 nil #'emus-display-status)) ;Slight delay to wait for kill signal to take effect
+
 
 (defvar emus-browser-mode-map
   (let ((map (make-sparse-keymap)))
@@ -778,33 +795,30 @@ Used to update browser display when `emus-current-track' and/or `emus-state' cha
     (define-key map (kbd "<") 'emus-jump-1m-backward-status)
     (define-key map (kbd ">") 'emus-jump-1m-forward-status)
     (define-key map (kbd "c") 'emus-goto-current-status)
-    (define-key map (kbd "!") 'emus-toggle-progress-status)
+    (define-key map (kbd "#") 'emus-toggle-progress-status)
+    (define-key map (kbd "!") 'emus-restart-browse)
     (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 "<") 'emus-jump-1m-backward-status
-                        (kbd ">") 'emus-jump-1m-forward-status
-                        (kbd "c") 'emus-goto-current-status
-                        (kbd "!") 'emus-toggle-progress-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 "<") 'emus-jump-1m-backward-status
+        (kbd ">") 'emus-jump-1m-forward-status
+        (kbd "c") 'emus-goto-current-status
+        (kbd "#") 'emus-toggle-progress-status
+        (kbd "!") #'emus-restart-browse))
     map)
   "Keymap for emus browser.")
 
-(defun emus-restart ()
-  "Restart emus."
-  (interactive)
-  (emus-kill-process))
-
 (define-derived-mode emus-browser-mode special-mode "emus-browser"
   "Major mode for EMUS music player file browser."
   (setq-local buffer-invisibility-spec nil))