clamp volume to between 0 and 100

doesn't handle muted players yet

diff --git a/squeeze.el b/squeeze.el
index 95bfdf140f358be70e5d1de1e16a4e825629fb68..bcdf4e2e055bf1c23490bdf551c3a729ae6c8554 100644 (file)
--- a/squeeze.el
+++ b/squeeze.el
@@ -60,11 +60,12 @@
                   ((string= current "1") "0"))))))
 
 (defun squeeze-update-mixer-volume (player value)
                   ((string= current "1") "0"))))))
 
 (defun squeeze-update-mixer-volume (player value)

-  (let ((current (squeeze-player-volume player)))
+  (let ((current (squeeze-player-volume player))
+        (number (string-to-number value)))

     (if (string-match "^[-+]" value)
     (if (string-match "^[-+]" value)

-        (when current
-          (setf (squeeze-player-volume player) (+ current (string-to-number value))))
-      (setf (squeeze-player-volume player) (string-to-number value)))))
+        (setf (squeeze-player-volume player)
+              (and current (max 0 (min 100 (+ current number)))))
+      (setf (squeeze-player-volume player) number))))

 
 (defun squeeze-update-state-from-line (string)
   (cond
 
 (defun squeeze-update-state-from-line (string)
   (cond