Mercurial > hg > xemacs-beta
annotate lisp/sound.el @ 5820:b3824b7f5627
Some changes to eliminate warnings with Apple clang version 1.7.
src/ChangeLog addition:
2014-10-18 Aidan Kehoe <kehoea@parhasard.net>
Some changes to eliminate warnings with Apple clang version 1.7.
* cm.c (send_string_to_tty_console):
* doprnt.c (doprnt_2):
* doprnt.c (parse_off_posnum):
* event-stream.c (dribble_out_event):
Cast various calls to Lstream_putc() to void when the result isn't
being used, for the sake of clang.
* lisp.h:
Declare #'replace here too, it's used in event-stream.c.
* lisp.h (ALLOCA):
* lisp.h (MALLOC_OR_ALLOCA):
Cast a couple of zeros in the context of the ternary operator to
void to prevent unused value warnings with clang.
* sysdep.c (child_setup_tty):
* text.h (ASSERT_ASCTEXT_ASCII_LEN):
Use DO_NOTHING in these files to quieten the compiler.
lib-src/ChangeLog addition:
2014-10-18 Aidan Kehoe <kehoea@parhasard.net>
* ootags.c (substitute):
Cast the result of strlen to int before comparing it with a signed
value, for the sake of compiler warnings.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 18 Oct 2014 21:48:10 +0100 |
| parents | cc6f0266bc36 |
| children | bbe4146603db c608d4b0b75e |
| rev | line source |
|---|---|
| 428 | 1 ;;; sound.el --- Loading sound files in XEmacs |
| 2 | |
| 3 ;; Copyright (C) 1985, 1986, 1992, 1993, 1994 Free Software Foundation, Inc. | |
| 4 ;; Copyright (C) 1995 Tinker Systems and INS Engineering Corp. | |
| 793 | 5 ;; Copyright (C) 2002 Ben Wing. |
| 428 | 6 |
| 7 ;; Maintainer: XEmacs Development Team | |
| 8 ;; Keywords: internal | |
| 9 | |
| 10 ;; This file is part of XEmacs. | |
| 11 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
793
diff
changeset
|
12 ;; XEmacs is free software: you can redistribute it and/or modify it |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
793
diff
changeset
|
13 ;; under the terms of the GNU General Public License as published by the |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
793
diff
changeset
|
14 ;; Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
793
diff
changeset
|
15 ;; option) any later version. |
| 428 | 16 |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
793
diff
changeset
|
17 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
793
diff
changeset
|
18 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
793
diff
changeset
|
19 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
793
diff
changeset
|
20 ;; for more details. |
| 428 | 21 |
| 22 ;; You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
793
diff
changeset
|
23 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
| 428 | 24 |
| 25 ;;; Synched up with: Not in FSF. | |
| 26 | |
| 27 ;;; Commentary: | |
| 28 | |
| 29 ;;; Code: | |
| 30 (defgroup sound nil | |
| 31 "Configure XEmacs sounds and properties" | |
| 32 :group 'environment) | |
| 33 | |
| 34 (defcustom sound-default-alist | |
| 35 '((default :sound bass) | |
| 36 (undefined-key :sound drum) | |
| 37 (undefined-click :sound drum) | |
| 38 ;; beginning-of-buffer or end-of-buffer errors. | |
| 39 (buffer-bound :sound drum) | |
| 40 ;; buffer-read-only error | |
| 41 (read-only :sound drum) | |
| 793 | 42 ;; any error other than those handled by undefined-key, |
| 43 ;; undefined-click, buffer-bound, read-only | |
| 428 | 44 (command-error :sound bass) |
| 45 (y-or-n-p :sound quiet) | |
| 46 (yes-or-no-p :sound quiet) | |
| 47 (auto-save-error :sound whip :volume 100) | |
| 48 (no-completion :sound whip) | |
| 49 (isearch-failed :sound quiet) | |
| 50 (isearch-quit :sound bass) | |
| 51 ;; QUIT: sound generated by ^G and its variants. | |
| 52 (quit :sound quiet :volume 75) | |
| 53 ;; READY: time-consuming task has completed... compile, | |
| 54 ;; cvs-update, etc. | |
| 55 (ready :sound cuckoo) | |
| 56 ;; WARP: XEmacs has changed the selected-window or frame | |
| 57 ;; asynchronously... Especially when it's done by an | |
| 58 ;; asynchronous process filter. Perhaps by a debugger breakpoint | |
| 59 ;; has been hit? | |
| 60 (warp :sound yeep :volume 75) | |
| 61 ;; ALARM: used for reminders... | |
| 62 (alarm :sound cuckoo :volume 100) | |
| 63 ) | |
| 64 "The alist of sounds and associated error symbols. | |
| 65 | |
| 66 Used to set sound-alist in load-default-sounds." | |
| 67 :group 'sound | |
| 68 :type '(repeat | |
| 69 (group (symbol :tag "Name") | |
| 70 (checklist :inline t | |
| 71 :greedy t | |
| 72 (group :inline t | |
| 73 (const :format "" :value :sound) | |
| 74 (symbol :tag "Sound")) | |
| 75 (group :inline t | |
| 76 (const :format "" :value :volume) | |
| 77 (integer :tag "Volume")) | |
| 78 (group :inline t | |
| 79 (const :format "" :value :pitch) | |
| 80 (integer :tag "Pitch")) | |
| 81 (group :inline t | |
| 82 (const :format "" :value :duration) | |
| 83 (integer :tag "Duration")))))) | |
| 84 | |
| 85 (defcustom sound-load-list | |
| 86 '((load-sound-file "drum-beep" 'drum) | |
| 87 (load-sound-file "quiet-beep" 'quiet) | |
| 88 (load-sound-file "bass-snap" 'bass 80) | |
| 89 (load-sound-file "whip" 'whip 70) | |
| 90 (load-sound-file "cuckoo" 'cuckoo) | |
| 91 (load-sound-file "yeep" 'yeep) | |
| 92 (load-sound-file "hype" 'hype 100) | |
| 93 ) | |
| 94 "A list of calls to load-sound-file to be processed by load-default-sounds. | |
| 95 | |
| 96 Reference load-sound-file for more information." | |
| 97 | |
| 98 :group 'sound | |
| 99 :type '(repeat (sexp :tag "Sound") | |
| 100 )) | |
| 101 | |
| 102 (defcustom default-sound-directory (locate-data-directory "sounds") | |
| 103 "Default directory to load a sound file from." | |
| 104 :group 'sound | |
| 105 :type 'directory | |
| 106 ) | |
| 107 | |
| 108 ;; #### This should really be a list. --hniksic | |
| 458 | 109 (defcustom sound-extension-list (cond ((or (eq system-type 'cygwin32) |
| 110 (eq system-type 'windows-nt)) | |
| 111 ".wav:") | |
| 112 ((eq system-type 'linux) | |
| 113 ".wav:.au:") | |
| 114 (t | |
| 115 ".au:")) | |
| 428 | 116 "Filename extensions to complete sound file name with. If more than one |
| 117 extension is used, they should be separated by \":\". " | |
| 118 :group 'sound | |
| 119 :type 'string) | |
| 120 | |
| 121 (defcustom default-sound-directory-list (locate-data-directory-list "sounds") | |
| 122 "List of directories which to search for sound files" | |
| 123 :group 'sound | |
| 124 :type '(repeat directory ) | |
| 125 ) | |
| 126 | |
| 127 ;;;###autoload | |
| 128 (or sound-alist | |
| 129 ;; these should be silent until sounds are loaded | |
| 130 (setq sound-alist '((ready nil) (warp nil)))) | |
| 131 | |
| 132 ;;;###autoload | |
| 133 (defun load-sound-file (filename sound-name &optional volume) | |
| 134 "Read in an audio-file and add it to the sound-alist. | |
| 135 | |
| 458 | 136 FILENAME can either be absolute or relative, in which case the file will |
| 137 be searched in the directories given by `default-sound-directory-list'. | |
| 138 When looking for the file, the extensions given by `sound-extension-list' are | |
| 139 also tried in the given order. | |
| 140 | |
| 428 | 141 You can only play sound files if you are running on display 0 of the |
| 142 console of a machine with native sound support or running a NetAudio | |
| 502 | 143 or ESD server and XEmacs has the necessary sound support compiled in. |
| 428 | 144 |
| 502 | 145 The sound file must be in the Sun/NeXT U-LAW format, except on Linux |
| 146 and MS Windows, where .wav files are also supported by the sound card | |
| 147 drivers." | |
| 428 | 148 (interactive "fSound file name: \n\ |
| 149 SSymbol to name this sound: \n\ | |
| 150 nVolume (0 for default): ") | |
| 151 (unless (symbolp sound-name) | |
| 152 (error "sound-name not a symbol")) | |
| 153 (unless (or (null volume) (integerp volume)) | |
| 154 (error "volume not an integer or nil")) | |
| 502 | 155 (let ((file |
| 156 ;; For absolute file names, we don't have on choice on the | |
| 157 ;; location, but sound extensions however can still be tried | |
| 158 (locate-file filename | |
| 159 (if (file-name-absolute-p filename) | |
| 160 (list (file-name-directory filename)) | |
| 161 default-sound-directory-list) | |
| 162 (split-string sound-extension-list ":"))) | |
| 458 | 163 buf data) |
| 428 | 164 (unless file |
| 165 (error "Couldn't load sound file %s" filename)) | |
| 166 (unwind-protect | |
| 167 (save-excursion | |
| 168 (set-buffer (setq buf (get-buffer-create " *sound-tmp*"))) | |
| 169 (buffer-disable-undo (current-buffer)) | |
| 170 (erase-buffer) | |
| 171 (let ((coding-system-for-read 'binary)) | |
| 172 (insert-file-contents file)) | |
| 173 (setq data (buffer-string)) | |
| 174 (erase-buffer)) | |
| 175 (and buf (kill-buffer buf))) | |
| 176 (let ((old (assq sound-name sound-alist))) | |
|
5652
cc6f0266bc36
Avoid #'delq in core Lisp, for the sake of style, a very slightly smaller binary
Aidan Kehoe <kehoea@parhasard.net>
parents:
5470
diff
changeset
|
177 (if old (setq sound-alist (remove* old sound-alist)))) |
| 428 | 178 (setq sound-alist (cons |
| 444 | 179 (nconc (list sound-name) |
| 180 (if (and volume (not (eq 0 volume))) | |
|
5344
2a54dfbe434f
Don't quote keywords, they've been self-quoting for well over a decade.
Aidan Kehoe <kehoea@parhasard.net>
parents:
793
diff
changeset
|
181 (list :volume volume)) |
|
2a54dfbe434f
Don't quote keywords, they've been self-quoting for well over a decade.
Aidan Kehoe <kehoea@parhasard.net>
parents:
793
diff
changeset
|
182 (list :sound data)) |
| 444 | 183 sound-alist))) |
| 428 | 184 sound-name) |
| 185 | |
| 186 ;;;###autoload | |
| 187 (defun load-default-sounds () | |
| 188 "Load and install some sound files as beep-types, using | |
| 189 `load-sound-file'. This only works if you're on display 0 of the | |
| 190 console of a machine with native sound support or running a NetAudio | |
| 191 server and XEmacs has the necessary sound support compiled in." | |
| 192 (interactive) | |
| 193 ;; #### - this should do NOTHING if the sounds can't be played. | |
| 194 (message "Loading sounds...") | |
| 195 (setq sound-alist nil) | |
| 196 ;; this is where the calls to load-sound-file get done | |
| 197 (mapc 'eval sound-load-list) | |
| 198 (setq sound-alist | |
| 199 (append sound-default-alist | |
| 200 sound-alist)) | |
| 201 (message "Loading sounds...done") | |
| 202 ;; (beep nil 'quiet) | |
| 203 ) | |
| 204 | |
| 205 ;;; sound.el ends here. |