;; Copyright (C) 1996 Free Software Foundation
;; Author: Steven L. Baur <steve@miranova.com>
-;; Keywords: news fun sound
-
-;; This file is part of GNU Emacs.
-
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2, or (at your option)
(if (null (boundp 'running-xemacs))
(defvar running-xemacs (string-match "XEmacs\\|Lucid" emacs-version)))
-(require 'gnus)
-(require 'gnus-sound)
(eval-when-compile (require 'cl))
+(require 'gnus)
+(require 'gnus-audio)
+(require 'gnus-art)
+
+(defgroup earcon nil
+ "Turn ** sounds ** into noise."
+ :group 'gnus-visual)
-(defvar earcon-auto-play nil
- "When True, automatially play sounds as well as buttonize them.")
+(defcustom earcon-auto-play nil
+ "*When True, automatically play sounds as well as buttonize them."
+ :type 'boolean
+ :group 'earcon)
-(defvar earcon-prefix "**"
- "The start of an earcon")
+(defcustom earcon-prefix "**"
+ "*String denoting the start of an earcon."
+ :type 'string
+ :group 'earcon)
-(defvar earcon-suffix "**"
- "The end of an earcon")
+(defcustom earcon-suffix "**"
+ "String denoting the end of an earcon."
+ :type 'string
+ :group 'earcon)
-(defvar earcon-regexp-alist
+(defcustom earcon-regexp-alist
'(("boring" 1 "Boring.au")
("evil[ \t]+laugh" 1 "Evil_Laugh.au")
("gag\\|puke" 1 "Puke.au")
("cackle" 1 "witch.au")
("yell\\|roar" 1 "yell2.au")
("whoop-de-doo" 1 "whistle.au"))
- "A list of regexps to map earcons to real sounds.")
-
+ "*A list of regexps to map earcons to real sounds."
+ :type '(repeat (list regexp
+ (integer :tag "Match")
+ (string :tag "Sound")))
+ :group 'earcon)
(defvar earcon-button-marker-list nil)
(make-variable-buffer-local 'earcon-button-marker-list)
-
-
;;; FIXME!! clone of code from gnus-vis.el FIXME!!
(defun earcon-article-push-button (event)
"Check text under the mouse pointer for a callback function.
gnus-article-button-face
(gnus-overlay-put (gnus-make-overlay from to)
'face gnus-article-button-face))
- (gnus-add-text-properties
+ (gnus-add-text-properties
from to
(nconc (and gnus-article-mouse-face
(list gnus-mouse-face-prop gnus-article-mouse-face))
(setq entry nil)))
entry))
-
(defun earcon-button-push (marker)
;; Push button starting at MARKER.
(save-excursion
(goto-char marker)
(let* ((entry (earcon-button-entry))
(inhibit-point-motion-hooks t)
- (fun 'gnus-sound-play)
+ (fun 'gnus-audio-play)
(args (list (nth 2 entry))))
(cond
((fboundp fun)
(setq beg (point))
(while (setq entry (pop alist))
(setq regexp (concat (regexp-quote earcon-prefix)
- ".*\\("
- (car entry)
- "\\).*"
- (regexp-quote earcon-suffix)))
+ ".*\\("
+ (car entry)
+ "\\).*"
+ (regexp-quote earcon-suffix)))
(goto-char beg)
(while (re-search-forward regexp nil t)
(let* ((start (and entry (match-beginning 1)))
start end 'earcon-button-push
(car (push (set-marker (make-marker) from)
earcon-button-marker-list)))
- (gnus-sound-play (caddr entry))))))))
+ (gnus-audio-play (caddr entry))))))))
;;;###autoload
(defun gnus-earcon-display ()