[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/emms 0f9bc54 2/7: *.el: Avoid the obsolete `defadvice`
From: |
ELPA Syncer |
Subject: |
[elpa] externals/emms 0f9bc54 2/7: *.el: Avoid the obsolete `defadvice` system |
Date: |
Mon, 3 May 2021 09:57:14 -0400 (EDT) |
branch: externals/emms
commit 0f9bc54e22819255a02758850bd940491923b7ce
Author: Yoni Rabkin <yoni@rabkins.net>
Commit: Yoni Rabkin <yoni@rabkins.net>
*.el: Avoid the obsolete `defadvice` system
* emms.el: Require `nadvice` for compatibility with Emacs<24.4.
* emms-player-vlc.el (emms-player-vlc-start): Use `advice-add` rather
than `defadvice`.
patch by Stefan Monnier
---
emms-browser.el | 10 ++++++----
emms-player-vlc.el | 7 ++++---
emms.el | 2 +-
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/emms-browser.el b/emms-browser.el
index 1ae727b..fcb4ef3 100644
--- a/emms-browser.el
+++ b/emms-browser.el
@@ -190,10 +190,12 @@
;; artist->track instead of artist->album->track when you switch to
;; the 'singles' filter.
-;; (defadvice emms-browser-next-mapping-type
-;; (after no-album (current-mapping))
-;; (when (eq ad-return-value 'info-album)
-;; (setq ad-return-value 'info-title)))
+;; (advice-add 'emms-browser-next-mapping-type :around #'my-emms--types)
+;; (defun my-emms--types (orig-fun &rest args)
+;; (let ((type (apply orig-fun args)))
+;; (if (eq type 'info-album)
+;; 'info-title)
+;; type)))
;; (defun toggle-album-display ()
;; (if (string= emms-browser-current-filter-name "singles")
diff --git a/emms-player-vlc.el b/emms-player-vlc.el
index 7a502cd..060f0d8 100644
--- a/emms-player-vlc.el
+++ b/emms-player-vlc.el
@@ -43,14 +43,15 @@
;; track, so the player sentinel has no way of telling that the next
;; track should be played. Therefore I redefine this low-level
;; function and add a "quit" track which is invisible to Emms.
-(defadvice emms-player-vlc-start (around quit-vlc-after-finish activate)
- (let ((process (apply 'start-process
+(advice-add 'emms-player-vlc-start :override #'emms--vlc-quit-after-finish)
+(defun emms--vlc-quit-after-finish (track &rest _)
+ (let ((process (apply #'start-process
emms-player-simple-process-name
nil
emms-player-vlc-command-name
;; splice in params here
(append emms-player-vlc-parameters
- (list (emms-track-name (ad-get-arg 0)))
+ (list (emms-track-name track))
'("vlc://quit")))))
;; Add a sentinel for signaling termination.
(set-process-sentinel process #'emms-player-simple-sentinel))
diff --git a/emms.el b/emms.el
index d2c9662..8c950b1 100644
--- a/emms.el
+++ b/emms.el
@@ -7,7 +7,7 @@
;; Version: 7.1
;; Keywords: emms, mp3, ogg, flac, music, mpeg, video, multimedia
;; Package-Type: multi
-;; Package-Requires: ((cl-lib "0.5") (seq))
+;; Package-Requires: ((cl-lib "0.5") (nadvice "0.3") (seq))
;; url: https://www.gnu.org/software/emms/
;; This file is part of EMMS.
- [elpa] externals/emms updated (7556382 -> 6958871), ELPA Syncer, 2021/05/03
- [elpa] externals/emms 7263ea6 1/7: *.el: Misc improvements and fixes w.r.t lexical binding, ELPA Syncer, 2021/05/03
- [elpa] externals/emms 0f9bc54 2/7: *.el: Avoid the obsolete `defadvice` system,
ELPA Syncer <=
- [elpa] externals/emms 02915f7 3/7: * emms-player-mpv.el: use closure, ELPA Syncer, 2021/05/03
- [elpa] externals/emms 3a8ba30 4/7: *.el: Minor improvements and simplifications, ELPA Syncer, 2021/05/03
- [elpa] externals/emms 6958871 7/7: Fix typo in emms-cache-reset, ELPA Syncer, 2021/05/03
- [elpa] externals/emms d56d705 5/7: emms-(playing-time|mode-line).el: Use `define-minor-mode`, ELPA Syncer, 2021/05/03
- [elpa] externals/emms 74429d5 6/7: Make it possible to force-update Emms cache, ELPA Syncer, 2021/05/03