jao-mpc tweaks (mainly notifications)

1 files changed, 20 insertions, 11 deletions

diff --git a/lib/eos/jao-notify.el b/lib/eos/jao-notify.el
index 623b8cc..8389b3a 100644
--- a/lib/eos/jao-notify.el
+++ b/lib/eos/jao-notify.el
@@ -1,6 +1,6 @@
 ;; jao-notify.el -- Interacting with notification daemon
 
-;; Copyright (c) 2017, 2019, 2020, 2021, 2024 Jose Antonio Ortega Ruiz
+;; Copyright (c) 2017, 2019, 2020, 2021, 2024, 2025 Jose Antonio Ortega Ruiz
 
 ;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
 ;; Start date: Sun Jan 08, 2017 20:24
@@ -17,21 +17,30 @@
 (defvar jao-notify-audio-icon (jao-data-file "music-player-icon.png"))
 
 (declare-function notifications-notify "notifications")
+(declare-function alert "alert")
+(declare-function jao-mac-notify "jao-mac")
 
 ;; "/usr/share/icons/Papirus/64x64/mimetypes/audio-x-generic.svg"
 ;; "/usr/share/icons/Tango/scalable/mimetypes/audio-x-generic.svg"
 
-(defun jao-notify (msg &optional title icon)
+(defun jao-notify (msg &optional title icon subtitle)
   (let ((title (when (and title (not (string-blank-p title))) title)))
-    (if jao-notify-use-messages
-        (message "%s%s%s" (or title "") (if title ": " "") (or msg ""))
-      (let* ((args `(:timeout ,jao-notify-timeout))
-             (args (append args
-                           (if title `(:title ,title :body ,msg) `(:title ,msg))))
-             (args (if (and (stringp icon) (file-exists-p icon))
-                       (append args `(:app-icon ,(format "%s" icon)))
-                     args)))
-        (apply 'notifications-notify args)))))
+    (cond ((eq jao-notify-use-messages t)
+           (message "%s%s%s" (or title "") (if title ": " "") (or msg "")))
+          ((eq jao-notify-use-messages 'notification)
+           (let* ((args `(:timeout ,jao-notify-timeout))
+                  (args (append args
+                                (if title
+                                    `(:title ,title :body ,msg)
+                                  `(:title ,msg))))
+                  (args (if (and (stringp icon) (file-exists-p icon))
+                            (append args `(:app-icon ,(format "%s" icon)))
+                          args)))
+             (apply 'notifications-notify args)))
+          ((eq jao-notify-use-messages 'alert)
+           (alert msg :title title :icon icon :never-persist t))
+          ((eq jao-notify-use-messages 'mac)
+           (jao-mac-notify title subtitle msg)))))
 
 
 (provide 'jao-notify)