branch: externals/emms
commit 002a8db0913c1780149eb4a9306e6f582efe8974
Author: Yoni Rabkin <[email protected]>
Commit: Yoni Rabkin <[email protected]>
Change if-let and when-let to "*" for Emacs 31 compatibility.
---
emms-mpris.el | 14 +++++-----
emms-radio-browser.el | 2 +-
emms-source-beets.el | 76 +++++++++++++++++++++++++--------------------------
3 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/emms-mpris.el b/emms-mpris.el
index b65ed183e3..92be0d49f9 100644
--- a/emms-mpris.el
+++ b/emms-mpris.el
@@ -131,7 +131,7 @@ which evaluates to that value or the value itself."
(defvar emms-mpris-player-iface-spec
'("org.mpris.MediaPlayer2.Player"
- ;; Methods:
+ ;; Methods:
(("OpenUri" emms-mpris-open-uri)
("Next" (lambda () (ignore-errors (emms-next)) :ignore))
("Previous" (lambda () (ignore-errors (emms-previous)) :ignore))
@@ -141,7 +141,7 @@ which evaluates to that value or the value itself."
("Play" (lambda () (emms-pause) :ignore))
("Seek" emms-mpris-seek)
("SetPosition" emms-mpris-set-position))
- ;; Properties: Shuffle, LoopStatus, Volume not supported (yet)
+ ;; Properties: Shuffle, LoopStatus, Volume not supported (yet)
(("LoopStatus" :readwrite emms-mpris-loop-status)
("Shuffle" :readwrite emms-random-playlist)
("PlaybackStatus" :read emms-mpris-status)
@@ -341,7 +341,7 @@ We do this when we have already taken action via the EMMS
UI.")
"Respond to PropertiesChanged signal by updating emms state to reflect
CHANGES."
(if emms-mpris-ignore-signal-p
(setq emms-mpris-ignore-signal-p nil)
- (when-let ((payload (assoc "LoopStatus" changes)))
+ (when-let* ((payload (assoc "LoopStatus" changes)))
(pcase (caadr payload)
("Track" (setq emms-repeat-playlist nil
emms-repeat-track t))
@@ -349,7 +349,7 @@ We do this when we have already taken action via the EMMS
UI.")
emms-repeat-track nil))
(_ (setq emms-repeat-playlist nil
emms-repeat-track nil))))
- (when-let ((payload (assoc "Shuffle" changes)))
+ (when-let* ((payload (assoc "Shuffle" changes)))
(setq emms-random-playlist (caadr payload))
(if emms-random-playlist
(setq emms-player-next-function #'emms-random)
@@ -433,7 +433,7 @@ Each entry of the form (info-field mpris-field dbus-type).")
metadata)
;; standard fields
(dolist (field emms-mpris-metadata-dict)
- (when-let ((entry (apply #'emms-mpris-convert-field track field)))
+ (when-let* ((entry (apply #'emms-mpris-convert-field track field)))
(push entry metadata)))
;; url
(push (emms-mpris-dict "xesam:url" (url-encode-url (concat "file:"
track-name))) metadata)
@@ -441,7 +441,7 @@ Each entry of the form (info-field mpris-field dbus-type).")
;; Shockingly, emms-browser-get-cover-from-path needs a graphical display
to
;; function (it eventually calls image-size) so we check there is one...
(when (seq-some #'display-graphic-p (frame-list))
- (when-let ((art-file (emms-browser-get-cover-from-path track-name
'medium)))
+ (when-let* ((art-file (emms-browser-get-cover-from-path track-name
'medium)))
(push (emms-mpris-dict "mpris:artUrl" (url-encode-url (concat "file://"
art-file))) metadata)))
;; length
(push
@@ -459,7 +459,7 @@ Each entry of the form (info-field mpris-field dbus-type).")
(defun emms-mpris-current-metadata ()
"Return metadata of current track if it exists, else return a placeholder."
- (if-let ((track (emms-playlist-current-selected-track)))
+ (if-let* ((track (emms-playlist-current-selected-track)))
(emms-mpris-metadata track)
'(:array (:dict-entry "mpris:trackid" (:variant :object-path
"/no/track/here")))))
diff --git a/emms-radio-browser.el b/emms-radio-browser.el
index 179624f682..2015ba3d1a 100644
--- a/emms-radio-browser.el
+++ b/emms-radio-browser.el
@@ -191,7 +191,7 @@ Returns either \"True\" or \"False\"."
;; suffix: as discussed above, we wrap the value into a cons cell.
(cl-defmethod transient-infix-value ((obj emms-radio-browser-field))
"Return the infix value of OBJ as a cons cell if non-nil."
- (when-let ((val (oref obj value)))
+ (when-let* ((val (oref obj value)))
(cons (oref obj alist-key) val)))
(cl-defmethod transient-infix-value ((obj emms-radio-browser-bool))
diff --git a/emms-source-beets.el b/emms-source-beets.el
index bd8113861d..12be515acb 100644
--- a/emms-source-beets.el
+++ b/emms-source-beets.el
@@ -116,15 +116,15 @@ Band\", the choice of year is restricted to 2001 to 2002
(or both).
Sorting occurs after filtering, and allows selecting multiple columns
to sort by."
(interactive
- (when-let (((emms-source-beets--ensure-sqlite))
- (filter (and current-prefix-arg (cons nil "")))
- (sort (prog1 (or current-prefix-arg t)
- ;; Unset after use unconditionally to prevent
- ;; EMMS's default behavior when source
- ;; commands are called with a prefix argument.
- (setq current-prefix-arg nil prefix-arg nil)))
- (db (sqlite-open emms-source-beets-database))
- (dec " (descending)"))
+ (when-let* (((emms-source-beets--ensure-sqlite))
+ (filter (and current-prefix-arg (cons nil "")))
+ (sort (prog1 (or current-prefix-arg t)
+ ;; Unset after use unconditionally to prevent
+ ;; EMMS's default behavior when source
+ ;; commands are called with a prefix argument.
+ (setq current-prefix-arg nil prefix-arg nil)))
+ (db (sqlite-open emms-source-beets-database))
+ (dec " (descending)"))
(dolist ( col (completing-read-multiple
"Filter by: "
emms-source-beets--items-columns nil t))
@@ -132,15 +132,15 @@ to sort by."
;; choosing between distinct values which correspond
;; to items which matched distinct values chosen for
;; previously processed columns.
- (when-let ((where (cdr filter))
- (dist (sqlite-select
- db (format "select distinct %s from items%s"
- col (if (string-empty-p where)
- "" (concat " where" where)))
- (car filter)))
- (dist (if (stringp (caar dist)) dist
- (mapcar (lambda (val) (number-to-string (car val)))
- dist))))
+ (when-let* ((where (cdr filter))
+ (dist (sqlite-select
+ db (format "select distinct %s from items%s"
+ col (if (string-empty-p where)
+ "" (concat " where" where)))
+ (car filter)))
+ (dist (if (stringp (caar dist)) dist
+ (mapcar (lambda (val) (number-to-string (car val)))
+ dist))))
(setcdr filter (format " %s in (%s)%s" col
(mapconcat
(lambda (_) "?")
@@ -163,25 +163,25 @@ to sort by."
,@(mapcar (lambda (c) (concat c dec))
emms-source-beets--items-columns))
nil t))))))
- (when-let (((emms-source-beets--ensure-sqlite))
- (db (or database (sqlite-open emms-source-beets-database)))
- (filter (or filter (cons nil "")))
- (where (cdr filter))
- (sort (or sort emms-source-beets-sort-columns))
- (db (sqlite-select
- db (format "select path, %s from items%s order by %s"
- (mapconcat #'identity
- emms-source-beets--items-columns
- ", ")
- (if (string-empty-p where) ""
- (concat " where" where))
- (mapconcat
- (lambda (col)
- (if (cdr col) (concat (car col) " desc")
- (car col)))
- sort ", "))
- (car filter) 'set))
- (init (gensym)))
+ (when-let* (((emms-source-beets--ensure-sqlite))
+ (db (or database (sqlite-open emms-source-beets-database)))
+ (filter (or filter (cons nil "")))
+ (where (cdr filter))
+ (sort (or sort emms-source-beets-sort-columns))
+ (db (sqlite-select
+ db (format "select path, %s from items%s order by %s"
+ (mapconcat #'identity
+ emms-source-beets--items-columns
+ ", ")
+ (if (string-empty-p where) ""
+ (concat " where" where))
+ (mapconcat
+ (lambda (col)
+ (if (cdr col) (concat (car col) " desc")
+ (car col)))
+ sort ", "))
+ (car filter) 'set))
+ (init (gensym)))
(set init (remq 'emms-info-initialize-track
emms-track-initialize-functions))
(let (item track path)
@@ -191,7 +191,7 @@ to sort by."
(emms-dictionary-set track 'type 'file)
(emms-dictionary-set track 'name path)
(mapc (lambda (type)
- (when-let ((val (car (setq item (cdr item)))))
+ (when-let* ((val (car (setq item (cdr item)))))
(setq type (cond ((string-match "_" type)
(replace-match "" nil nil type))
((member type '("track" "disc"))
