branch: externals/listen
commit 99fdff93ea93eb683ca239b68846745103332d21
Author: Adam Porter <[email protected]>
Commit: Adam Porter <[email protected]>
Tidy: Rename listen--player to listen-current-player
Seems like an intended part of the API by this point.
---
listen-lib.el | 2 +-
listen-library.el | 2 +-
listen-queue.el | 12 ++++++------
listen.el | 24 ++++++++++++------------
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/listen-lib.el b/listen-lib.el
index 94a7a771fc..c5f3d319f8 100644
--- a/listen-lib.el
+++ b/listen-lib.el
@@ -91,7 +91,7 @@
;; FIXME: Declare this differently or something.
(declare-function make-listen-player-vlc "listen-vlc")
-(defun listen--player ()
+(defun listen-current-player ()
"Return variable `listen-player' or a newly set one if nil."
(or listen-player
(setf listen-player (make-listen-player-vlc))))
diff --git a/listen-library.el b/listen-library.el
index 19df10bc4d..43fc01bb57 100644
--- a/listen-library.el
+++ b/listen-library.el
@@ -167,7 +167,7 @@ prompt for a QUEUE to add them to."
(listen-queue-complete :prompt "Add tracks to queue"
:allow-new-p t)))))
(if queue
(listen-queue-add-files (mapcar #'listen-track-filename tracks) queue)
- (listen-play (listen--player) (listen-track-filename (car tracks)))))
+ (listen-play (listen-current-player) (listen-track-filename (car
tracks)))))
(defun listen-library-jump (track)
"Jump to TRACK in a Dired buffer."
diff --git a/listen-queue.el b/listen-queue.el
index 579e5f7952..c436c03da5 100644
--- a/listen-queue.el
+++ b/listen-queue.el
@@ -287,7 +287,7 @@ select track as well."
(listen-queue-complete-track queue)
(car (listen-queue-tracks queue)))))
(list queue track)))
- (let ((player (listen--player)))
+ (let ((player (listen-current-player)))
(listen-play player (listen-track-filename track))
(setf (listen-queue-current queue) track
(map-elt (listen-player-etc player) :queue) queue)
@@ -322,7 +322,7 @@ If ALLOW-NEW-P, accept the name of a non-existent queue and
return a new one having it. PROMPT is passed to `format-prompt',
which see."
(cl-labels ((read-queue ()
- (let* ((player (listen--player))
+ (let* ((player (listen-current-player))
(default-queue-name (or (when listen-queue
;; In a listen buffer: offer
its queue as default.
(listen-queue-name
listen-queue))
@@ -603,7 +603,7 @@ tracks in the queue unchanged)."
do (forward-line 1)
while (<= (point) end))))))
-(cl-defun listen-queue-remaining-duration (&optional (player (listen--player)))
+(cl-defun listen-queue-remaining-duration (&optional (player
(listen-current-player)))
"Return seconds remaining in PLAYER's queue."
(when-let ((queue (map-elt (listen-player-etc player) :queue))
(current-track-remaining (- (listen--length player)
(listen--elapsed player)))
@@ -613,7 +613,7 @@ tracks in the queue unchanged)."
(remaining-tracks-duration (cl-reduce #'+ remaining-tracks :key
#'listen-track-duration)))
(+ current-track-remaining remaining-tracks-duration)))
-(cl-defun listen-queue-format-remaining (&optional (player (listen--player)))
+(cl-defun listen-queue-format-remaining (&optional (player
(listen-current-player)))
"Return PLAYER's queue's remaining duration formatted."
(when-let ((duration (listen-queue-remaining-duration player)))
(concat "-" (listen-format-seconds duration))))
@@ -623,7 +623,7 @@ tracks in the queue unchanged)."
;;;###autoload
(defun listen-view-track (track)
"View information about TRACK."
- (interactive (list (listen-queue-current (map-elt (listen-player-etc
(listen--player)) :queue))))
+ (interactive (list (listen-queue-current (map-elt (listen-player-etc
(listen-current-player)) :queue))))
(with-current-buffer (get-buffer-create (format "*Listen track: %S*"
(listen-track-filename track)))
(let ((inhibit-read-only t))
(read-only-mode)
@@ -795,7 +795,7 @@ Delay according to `listen-queue-delay-time-range', which
see."
:columns
(list (list :name "▶" :primary 'descend
:getter (lambda (queue _table)
- (when-let ((player (listen--player)))
+ (when-let ((player (listen-current-player)))
(if (eq queue (map-elt (listen-player-etc
player) :queue))
"▶" " "))))
(list :name "Name" :primary 'ascend
diff --git a/listen.el b/listen.el
index c2ccfe774e..007ab5daa6 100755
--- a/listen.el
+++ b/listen.el
@@ -111,7 +111,7 @@ its current track will be the one that just finished
playing)."
"Quit PLAYER.
Interactively, uses the default player."
(interactive
- (list (listen--player)))
+ (list (listen-current-player)))
(delete-process (listen-player-process player))
(when (eq player listen-player)
(setf listen-player nil))
@@ -121,7 +121,7 @@ Interactively, uses the default player."
(defun listen-next (player)
"Play next track in PLAYER's queue.
Interactively, uses the default player."
- (interactive (list (listen--player)))
+ (interactive (list (listen-current-player)))
(listen-queue-next (map-elt (listen-player-etc player) :queue)))
(defun listen-pause (player)
@@ -139,7 +139,7 @@ Interactively, uses the default player."
"Play FILE with PLAYER.
Interactively, uses the default player."
(interactive
- (list (listen--player)
+ (list (listen-current-player)
(read-file-name "Play file: " listen-directory nil t)))
(listen--play player file))
@@ -148,7 +148,7 @@ Interactively, uses the default player."
Interactively, uses the default player."
;; TODO: Relative volume (at least for VLC).
(interactive
- (let* ((player (listen--player))
+ (let* ((player (listen-current-player))
(volume (floor (listen--volume player))))
(list player (read-number "Volume %: " volume))))
(listen--volume player volume)
@@ -160,7 +160,7 @@ Interactively, use the default player, and read a position
timestamp, like \"23\" or \"1:23\", with optional -/+ prefix for
relative seek."
(interactive
- (let* ((player (listen--player))
+ (let* ((player (listen-current-player))
(position (read-string "Seek to position: "))
(prefix (when (string-match (rx bos (group (any "-+")) (group (1+
anything))) position)
(prog1 (match-string 1 position)
@@ -174,7 +174,7 @@ relative seek."
Interactively, use the current player's current track, and read
command with completion."
(interactive
- (let* ((player (listen--player))
+ (let* ((player (listen-current-player))
(filenames (list (abbreviate-file-name (listen--filename player))))
(command (read-shell-command (format "Run command on %S: "
filenames))))
(list command filenames)))
@@ -188,7 +188,7 @@ command with completion."
(defun listen-jump (track)
"Jump to TRACK in a Dired buffer.
Interactively, jump to current queue's current track."
- (interactive (list (listen-queue-current (map-elt (listen-player-etc
(listen--player)) :queue))))
+ (interactive (list (listen-queue-current (map-elt (listen-player-etc
(listen-current-player)) :queue))))
(dired-jump-other-window (listen-track-filename track)))
;;;; Mode
@@ -253,7 +253,7 @@ Interactively, jump to current queue's current track."
(defun listen-lighter-format-rating ()
"Return the rating of the current track for display in the lighter."
- (when-let ((player (listen--player))
+ (when-let ((player (listen-current-player))
(queue (map-elt (listen-player-etc player) :queue))
(track (listen-queue-current queue))
(rating (or (listen-track-rating track)
@@ -357,12 +357,12 @@ TIME is a string like \"SS\", \"MM:SS\", or \"HH:MM:SS\"."
("=" "Set" listen-volume)
("v" "Down" (lambda ()
(interactive)
- (let ((player (listen--player)))
+ (let ((player (listen-current-player)))
(listen-volume player (max 0 (- (listen--volume player)
5)))))
:transient t)
("V" "Up" (lambda ()
(interactive)
- (let ((player (listen--player)))
+ (let ((player (listen-current-player)))
(listen-volume player (min 100 (+ (listen--volume player)
5)))))
:transient t)]
["Repeat"
@@ -395,9 +395,9 @@ TIME is a string like \"SS\", \"MM:SS\", or \"HH:MM:SS\"."
("qq" "View current" (lambda ()
"View current queue."
(interactive)
- (listen-queue (map-elt (listen-player-etc
(listen--player)) :queue)))
+ (listen-queue (map-elt (listen-player-etc
(listen-current-player)) :queue)))
:if (lambda ()
- (map-elt (listen-player-etc (listen--player)) :queue))
+ (map-elt (listen-player-etc (listen-current-player)) :queue))
:transient t)
("qo" "View other" listen-queue)
("qp" "Play other" listen-queue-play
