emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/emms 3cb99a9d72 3/8: * emms-volume-pulse.el: define `em


From: ELPA Syncer
Subject: [elpa] externals/emms 3cb99a9d72 3/8: * emms-volume-pulse.el: define `emms-volume-pulse-get'
Date: Sun, 5 Mar 2023 08:57:45 -0500 (EST)

branch: externals/emms
commit 3cb99a9d72f2000d0c543c014e806c28f72efe89
Author: Yoni Rabkin <yrk@gnu.org>
Commit: Yoni Rabkin <yrk@gnu.org>

    * emms-volume-pulse.el: define `emms-volume-pulse-get'
    
    `emms-volume-pulse-get' is now the interface function for
    emms-volume-pulse.el for the volume level.
---
 emms-volume-pulse.el | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/emms-volume-pulse.el b/emms-volume-pulse.el
index cc8d158cb1..4df9ecfe3e 100644
--- a/emms-volume-pulse.el
+++ b/emms-volume-pulse.el
@@ -59,11 +59,6 @@ See full list of devices on your system by running
                  (const :tag "Default sink" nil))
   :group 'emms-volume)
 
-(defcustom emms-volume-pulse-max-volume 100
-  "The maximum volume percentage."
-  :type 'integer
-  :group 'emms-volume)
-
 ;; 'pactl get-sink-volume' was only added recently (version 14.1).
 ;; When that version is more widespread this function can be
 ;; simplified
@@ -103,6 +98,14 @@ See full list of devices on your system by running
        (string-to-number volume-string)
       (error "cannot get volume from sink, check `emms-volume-pulse-sink'"))))
 
+(defun emms-volume-pulse-limit (v)
+  "Limit V to the range [0-100]"
+  (max (min v 100) 0))
+
+(defun emms-volume-pulse-get ()
+  "Return the pulse volume."
+  (emms-volume-pulse-limit
+   (emms-volume--pulse-get-volume)))
 
 ;;;###autoload
 (defun emms-volume-pulse-change (amount)
@@ -110,9 +113,8 @@ See full list of devices on your system by running
   (message "Volume is %s%%"
            (let ((pactl (or (executable-find "pactl")
                             (error "pactl is not in PATH")))
-                 (next-vol (max (min (+ (emms-volume--pulse-get-volume) amount)
-                                     emms-volume-pulse-max-volume)
-                                0)))
+                 (next-vol (emms-volume-pulse-limit
+                           (+ (emms-volume--pulse-get-volume) amount))))
              (when (zerop (shell-command
                            (format "%s set-sink-volume %s %s%%"
                                    pactl



reply via email to

[Prev in Thread] Current Thread [Next in Thread]