X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=emus.el;h=04a8e7328cc93c480a5ac36a3313cc6d0b9a7ab5;hb=d0b58f6dbe917c240dd64a0dc7191b831951788a;hp=b03c09d6b90a6ae1c2944cb97a52a8c9d2698db4;hpb=a3e5f8f22a5729e791e0a8d497e62d8ddd1ed8c2;p=emus.git

diff --git a/emus.el b/emus.el
index b03c09d..04a8e73 100644
--- a/emus.el
+++ b/emus.el
@@ -1,17 +1,53 @@
-;;; emus.el --- Simple music player for Emacs.  -*- lexical-binding:t -*-
+;;; emus.el --- Simple mp3 player  -*- lexical-binding:t -*-
+
+;; Copyright (C) 2019 Tim Vaughan
 
 ;; Author: Tim Vaughan <timv@ughan.xyz>
+;; Created: 12 December 2019
 ;; Version: 1.0
 ;; Keywords: multimedia
-;; URL: https://thelambdalab.xyz/emus
+;; Homepage: http://thelambdalab.xy/emus
+;; Package-Requires: ((emacs "26"))
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this file.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
-;; This is a simple package for playing audio from a local library
-;; of audio files.
+;; This is a simple package for playing audio from a local directory
+;; tree of mp3 files.  It uses the program mpg123 as its back-end.
+;; Currently the library is loaded completely every time emus starts.
 
 ;;; Code:
 
+(provide 'emus)
+
+
+;;; Dependencies
+;;
+
+(require 'seq)
+
+
+;;; Global constants
+;;
+
+(defconst emus-version "1.0.0"
+  "Current version of emus.")
+
+
 ;;; Customizations
 ;;
 
@@ -28,17 +64,25 @@
   :type '(string))
 
 (defface emus-artist
-  '((t :inherit font-lock-keyword-face))
+  '((t :inherit font-lock-keyword-face :background "#333"))
   "Face used for artist names in browser.")
 
 (defface emus-album
-  '((t :inherit font-lock-function-name-face))
+  '((t :inherit font-lock-function-name-face :background "#222"))
   "Face used for album names in browser.")
 
-(defface emus-title
+(defface emus-track
   '((t :inherit font-lock-string-face))
   "Face used for track titles in browser.")
 
+(defface emus-track-current
+  '((t :inherit font-lock-string-face :inverse-video t))
+  "Face used for track titles in browser.")
+
+(defface emus-cursor
+  '((t :inherit bold))
+  "Face used for current track cursor")
+
 ;;; Library
 ;;
 
@@ -49,19 +93,8 @@
 (defvar emus-records nil
   "Emus audio library.")
 
-(defun emus-make-record (filename tagstr)
-  (let ((artist "")
-        (album "")
-        (title ""))
-    (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))
-            (found-title (elt (split-string line "@I ID3v2.title:") 1)))
-        (cond
-         (found-artist (setq artist found-artist))
-         (found-album (setq album found-album))
-         (found-title (setq title found-title)))))
-    (vector artist album title filename nil)))
+(defun emus-make-record (artist album title filename &optional pos)
+  (vector artist album title filename pos))
 
 (defun emus-record-artist (record)
   (elt record 0))
@@ -81,8 +114,7 @@
 (defun emus-set-record-browser-pos (record pos)
   (aset record 4 pos))
 
-(defun emus-update-records ()
-  (interactive)
+(defun emus--load-library (then)
   (emus--suspend-cp)
   (setq emus-state 'stopped)
   (let ((proc (emus-get-process))
@@ -93,20 +125,37 @@
                                (setq tagstr (concat tagstr string))
                                (when (string-suffix-p "@P 1\n" string)
                                  (add-to-list 'emus-records
-                                              (emus-make-record (car filenames)
-                                                                tagstr))
+                                              (emus--make-record-from-tagstr (car filenames)
+                                                                             tagstr))
                                  (setq tagstr "")
                                  (setq filenames (cdr filenames))
                                  (if filenames
                                      (emus-send-cmd "lp" (car filenames))
                                    (set-process-filter proc nil)
                                    (setq emus-records (reverse emus-records))
-                                   (emus-sort-records)
-                                   (emus-render-records)
+                                   (emus--sort-records)
+                                   (unless emus-current-record
+                                     (setq emus-current-record (car emus-records)))
+                                   (funcall then)
+                                   ;; (emus-render-records)
                                    (emus--resume-cp)))))
     (emus-send-cmd "lp" (car filenames))))
 
-(defun emus-sort-records ()
+(defun emus--make-record-from-tagstr (filename tagstr)
+  (let ((artist "")
+        (album "")
+        (title ""))
+    (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))
+            (found-title (elt (split-string line "@I ID3v2.title:") 1)))
+        (cond
+         (found-artist (setq artist found-artist))
+         (found-album (setq album found-album))
+         (found-title (setq title found-title)))))
+    (emus-make-record artist album title filename nil)))
+
+(defun emus--sort-records ()
   (sort emus-records
         (lambda (r1 r2)
           (let ((artist1 (emus-record-artist r1))
@@ -115,7 +164,13 @@
                 (let ((album1 (emus-record-album r1))
                       (album2 (emus-record-album r2)))
                   (string< album1 album2))
-              (string< artist1 artist2))))))        
+              (string< artist1 artist2))))))
+
+(defmacro emus--with-library (&rest args)
+  `(if emus-records
+       (progn ,@args)
+     (emus--load-library
+      (lambda () ,@args))))
 
 ;;; mpg123 process
 ;;
@@ -136,6 +191,7 @@
              (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")
         proc))))
                     
@@ -177,109 +233,185 @@
                              (emus-play-next)))))
 
 (defun emus-play-record (record)
-  (let ((old-record emus-current-record))
-    (emus-send-cmd "l" (emus-record-file record))
-    (setq emus-state 'playing)
-    (setq emus-current-record record)
-    (emus-update-record old-record)
-    (emus-update-record record)
-    (emus--resume-cp)))
+  "Set RECORD as current and start playing."
+  (emus--with-library
+   (let ((old-record emus-current-record))
+     (emus-send-cmd "l" (emus-record-file record))
+     (setq emus-state 'playing)
+     (setq emus-current-record record)
+     (emus--update-record old-record)
+     (emus--update-record record)
+     (emus--resume-cp))))
+
+(defun emus-select-record (record)
+  "Set RECORD as current, but do not start playing."
+  (emus--with-library
+   (let ((old-record emus-current-record))
+     (setq emus-state 'stopped)
+     (setq emus-current-record record)
+     (emus--update-record old-record)
+     (emus--update-record record)
+     (emus-send-cmd "o")
+     (emus--resume-cp))))
 
 (defun emus-stop ()
+  "Stop playback of the current record."
   (interactive)
-  (setq emus-state 'stopped)
-  (emus-update-record emus-current-record)
-  (emus-send-cmd "s"))
+  (emus--with-library
+   (setq emus-state 'stopped)
+   (emus--update-record emus-current-record)
+   (emus-send-cmd "s")))
 
 (defun emus-playpause ()
   (interactive)
-  (when emus-current-record
-    (if (eq emus-state 'stopped)
-        (emus-play-record emus-current-record)
-      (emus-send-cmd "p")
-      (pcase emus-state
-        ((or 'paused 'stopped) (setq emus-state 'playing))
-        ('playing (setq emus-state 'paused)))
-      (unless (eq emus-state 'paused)))
-    (emus-update-record emus-current-record)))
-
-(defun emus-set-volume (pct)
-  (emus-send-cmd "v" (number-to-string pct)))
+  (emus--with-library
+   (when emus-current-record
+     (if (eq emus-state 'stopped)
+         (emus-play-record emus-current-record)
+       (emus-send-cmd "p")
+       (pcase emus-state
+         ((or 'paused 'stopped) (setq emus-state 'playing))
+         ('playing (setq emus-state 'paused)))
+       (unless (eq emus-state 'paused)))
+     (emus--update-record emus-current-record))))
 
 (defvar emus-current-volume 100)
 
-(defun emus-volume-delta (delta)
-  (setq emus-current-volume (max 0 (min 100 (+ emus-current-volume delta))))
-  (emus-set-volume emus-current-volume))
+(defun emus-set-volume (pct)
+  (emus--with-library
+   (setq emus-current-volume pct)
+   (emus-send-cmd "v" (number-to-string pct))))
+
+(defun emus-volume-increase-by (delta)
+  (emus-set-volume (max 0 (min 100 (+ emus-current-volume delta)))))
 
 (defun emus-volume-up ()
   (interactive)
-  (emus-volume-delta 10))
+  (emus-volume-increase-by 10))
 
 (defun emus-volume-down ()
   (interactive)
-  (emus-volume-delta -10))
-
-(defun emus--play-nearby (offset)
-  (let ((idx (seq-position emus-records emus-current-record)))
-    (if idx
-        (let ((next-record (elt emus-records (+ idx offset))))
-          (if next-record
-              (emus-play-record next-record)
-            (error "Track does not exist")))
-      (error "No track is currently selected."))))
+  (emus-volume-increase-by -10))
+
+(defun emus--play-adjacent-track (&optional prev)
+  (emus--with-library
+   (let ((idx (seq-position emus-records emus-current-record))
+         (offset (if prev -1 +1)))
+     (if idx
+         (let ((next-record (elt emus-records (+ idx offset))))
+           (if next-record
+               (if (eq emus-state 'playing)
+                   (emus-play-record next-record)
+                 (emus-select-record next-record))
+             (error "Track does not exist")))
+       (error "No track selected")))))
+
+(defun emus--play-adjacent-album (&optional prev)
+  (emus--with-library
+   (let ((idx (seq-position emus-records emus-current-record)))
+     (if idx
+         (let* ((search-list (if prev
+                                 (reverse (seq-subseq emus-records 0 idx))
+                               (seq-subseq emus-records (+ idx 1))))
+                (current-album (emus-record-album emus-current-record))
+                (next-record (seq-some (lambda (r)
+                                         (if (string= (emus-record-album r)
+                                                      current-album)
+                                             nil
+                                           r))
+                                       search-list)))
+           (if next-record
+               (if (eq emus-state 'playing)
+                   (emus-play-record next-record)
+                 (emus-select-record next-record))
+             (error "Track does not exist")))
+       (error "No track selected")))))
 
 (defun emus-play-next ()
   (interactive)
-  (emus--play-nearby 1))
+  (emus--play-adjacent-track))
 
 (defun emus-play-prev ()
   (interactive)
-  (emus--play-nearby -1))
+  (emus--play-adjacent-track t))
+
+(defun emus-play-next-album ()
+  (interactive)
+  (emus--play-adjacent-album))
+
+(defun emus-play-prev-album ()
+  (interactive)
+  (emus--play-adjacent-album t))
 
 (defun emus-display-status ()
   (interactive)
-  (message
-   (concat "Emus: Volume %d%%"
-           (pcase emus-state
-             ('stopped " [Stopped]")
-             ('paused " [Paused]")
-             ('playing " [Playing]")
-             (_ ""))
-           (if emus-current-record
-               (format " - %.30s (%.20s)"
-                       (emus-record-title emus-current-record)
-                       (emus-record-artist emus-current-record))
-             ""))
-   emus-current-volume))
+  (emus--with-library
+   (message
+    (concat "Emus: Volume %d%%"
+            (pcase emus-state
+              ('stopped " [Stopped]")
+              ('paused " [Paused]")
+              ('playing " [Playing]")
+              (_ ""))
+            (if emus-current-record
+                (format " - %.30s (%.20s)"
+                        (emus-record-title emus-current-record)
+                        (emus-record-artist emus-current-record))
+              ""))
+    emus-current-volume)))
 
 
 ;;; Browser
 ;;
 
-(defun emus-insert-record (record &optional pref-record)
-  (emus-set-record-browser-pos record (point))
-  (let ((current (equal record emus-current-record)))
-   (insert-text-button
-    (concat
-     (if current
-         (pcase emus-state
-           ('playing (propertize ">" 'face 'bold))
-           ('paused (propertize ")" 'face 'bold))
-           ('stopped (propertize "]" 'face 'bold)))
-       (propertize " " 'face 'default))
-     (propertize (format "%-20.20s" (emus-record-artist record))
-                 'face 'emus-artist)
-     (propertize (format "%  -20.20s" (emus-record-album record))
-                 'face 'emus-album)
-     (propertize (format "  %s" (emus-record-title record))
-                 'face 'emus-title))
-    'action #'emus-click-record
-    'follow-link t
-    'emus-record record))
-  (insert "\n"))
-
-(defun emus-update-record (record)
+(defun emus--insert-record (record &optional prev-record first)
+  (let* ((artist (emus-record-artist record))
+         (album (emus-record-album record))
+         (title (emus-record-title record))
+         (help-str (format "mouse-1, RET: Play '%.30s' (%.20s)" title artist)))
+    (when (or prev-record first)
+      (unless (equal (emus-record-artist prev-record) artist)
+        (insert-text-button
+         (propertize artist 'face 'emus-artist)
+         'action #'emus--click-record
+         'follow-link t
+         'help-echo help-str
+         'emus-record record)
+        (insert (propertize "\n" 'face 'emus-artist)))
+      (unless (equal (emus-record-album prev-record) album)
+        (insert-text-button
+         (propertize (concat "  " album) 'face 'emus-album)
+         'action #'emus--click-record
+         'follow-link t
+         'help-echo help-str
+         'emus-record record)
+        (insert (propertize "\n" 'face 'emus-album))))
+    (emus-set-record-browser-pos record (point))
+    (let ((is-current (equal record emus-current-record)))
+      (insert-text-button
+       (concat
+        (if is-current
+            (propertize
+             (pcase emus-state
+               ('playing "->")
+               ('paused "-)")
+               ('stopped "-]"))
+             'face 'emus-cursor)
+          (propertize "  " 'face 'default))
+        (propertize (format "   %s" title)
+                    'face (if is-current
+                              'emus-track-current
+                            'emus-track)))
+       'action #'emus--click-record
+       'follow-link t
+       'help-echo help-str
+       'emus-record record)
+      (insert (propertize "\n"
+                          'face (if is-current
+                                    'emus-track-current
+                                  'emus-track))))))
+
+(defun emus--update-record (record)
   (let ((record-pos (emus-record-browser-pos record)))
     (when (and (get-buffer "*emus*")
                (emus-record-browser-pos record))
@@ -290,51 +422,85 @@
             (search-forward "\n")
             (delete-region record-pos (point))
             (goto-char record-pos)
-            (emus-insert-record record)
+            (emus--insert-record record)
             (goto-char old-point))))))
 
-(defun emus-render-records ()
-  (save-mark-and-excursion
-    (with-current-buffer "*emus*"
-      (let ((inhibit-read-only t))
-        (erase-buffer)
-        (goto-char (point-min))
+(defun emus--render-records ()
+  (with-current-buffer "*emus*"
+    (let ((inhibit-read-only t)
+          (old-pos (point)))
+      (erase-buffer)
+      (goto-char (point-min))
+      (let ((prev-record nil))
         (dolist (record emus-records)
-          (emus-insert-record record))))))
+          (emus--insert-record record prev-record (not prev-record))
+          (setq prev-record record)))
+      (goto-char old-pos))))
 
-(defun emus-click-record (button)
-  (emus-play-record (button-get button 'emus-record)))
+(defun emus--click-record (button)
+  (emus-play-record (button-get button 'emus-record))
+  (emus-display-status))
+
+(defun emus-centre-current ()
+  (interactive)
+  (when (get-buffer "*emus*")
+    (switch-to-buffer "*emus*")
+    (when emus-current-record
+      (goto-char (emus-record-browser-pos emus-current-record))
+      (recenter))))
 
 (defun emus-browse ()
   "Switch to *emus* audio library browser."
   (interactive)
-  (switch-to-buffer "*emus*")
-  (emus-browser-mode)
-  (emus-volume emus-current-volume)
-  (if emus-records
-      (emus-render-records)
-    (emus-update-records)))
+  (emus--with-library
+   (switch-to-buffer "*emus*")
+   (emus-browser-mode)
+   (emus--render-records)
+   (emus-centre-current)))
+
+(defun emus-refresh ()
+  (interactive)
+  (emus-stop)
+  (setq emus-records nil)
+  (emus-browse))
+
+(defun emus-playpause-status () (interactive) (emus-playpause) (emus-display-status))
+(defun emus-stop-status () (interactive) (emus-stop) (emus-display-status))
+(defun emus-volume-up-status () (interactive) (emus-volume-up) (emus-display-status))
+(defun emus-volume-down-status () (interactive) (emus-volume-down) (emus-display-status))
+(defun emus-refresh-status () (interactive) (emus-refresh) (emus-display-status))
+(defun emus-play-next-status () (interactive) (emus-play-next) (emus-display-status))
+(defun emus-play-prev-status () (interactive) (emus-play-prev) (emus-display-status))
+(defun emus-play-next-album-status () (interactive) (emus-play-next-album) (emus-display-status))
+(defun emus-play-prev-album-status () (interactive) (emus-play-prev-album) (emus-display-status))
+(defun emus-centre-current-status () (interactive) (emus-centre-current) (emus-display-status))
 
 (defvar emus-browser-mode-map
   (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "SPC") 'emus-playpause)
-    (define-key map (kbd "o") 'emus-stop)
-    (define-key map (kbd "+") 'emus-volume-up)
-    (define-key map (kbd "=") 'emus-volume-up)
-    (define-key map (kbd "-") 'emus-volume-down)
-    (define-key map (kbd "R") 'emus-update-records)
-    (define-key map (kbd "n") 'emus-play-next)
-    (define-key map (kbd "p") 'emus-play-prev)
+    (define-key map (kbd "SPC") 'emus-playpause-status)
+    (define-key map (kbd "o") 'emus-stop-status)
+    (define-key map (kbd "+") 'emus-volume-up-status)
+    (define-key map (kbd "=") 'emus-volume-up-status)
+    (define-key map (kbd "-") 'emus-volume-down-status)
+    (define-key map (kbd "R") 'emus-refresh-status)
+    (define-key map (kbd "n") 'emus-play-next-status)
+    (define-key map (kbd "p") 'emus-play-prev-status)
+    (define-key map (kbd "N") 'emus-play-next-album-status)
+    (define-key map (kbd "P") 'emus-play-prev-album-status)
+    (define-key map (kbd "c") 'emus-centre-current-status)
     (when (fboundp 'evil-define-key*)
       (evil-define-key* 'motion map
-        (kbd "SPC") 'emus-playpause
-        (kbd "o") 'emus-stop
-        (kbd "+") 'emus-volume-up
-        (kbd "=") 'emus-volume-up
-        (kbd "-") 'emus-volume-down
-        (kbd "R") 'emus-update-records
-        (kbd "n") 'emus-play-next
-        (kbd "p") 'emus-play-prev))
+        (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 "c") 'emus-centre-current-status))
     map)
   "Keymap for emus.")
 
@@ -344,6 +510,4 @@
 (when (fboundp 'evil-set-initial-state)
   (evil-set-initial-state 'emus-browser-mode 'motion))
 
-;;; Debugging
-
 ;;; emus.el ends here