Mercurial > hg > xemacs-beta
annotate lisp/sound.el @ 4953:304aebb79cd3
function renamings to track names of char typedefs
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* internals/internals.texi (lrecords):
* internals/internals.texi (The DFC API):
* internals/internals.texi (Conversion to and from External Data):
* internals/internals.texi (Mule-izing Code):
* internals/internals.texi (Pervasive changes throughout XEmacs sources):
* internals/internals.texi (Ben's README):
* internals/internals.texi (Future Work -- Localized Text/Messages):
* emodules.texi (Defining Variables):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
modules/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_pgconn):
* postgresql/postgresql.c (Fpq_res_status):
* postgresql/postgresql.c (Fpq_result_error_message):
* postgresql/postgresql.c (Fpq_fname):
* postgresql/postgresql.c (Fpq_get_value):
* postgresql/postgresql.c (Fpq_cmd_status):
* postgresql/postgresql.c (Fpq_cmd_tuples):
* postgresql/postgresql.c (Fpq_notifies):
* postgresql/postgresql.c (Fpq_get_line):
* postgresql/postgresql.c (Fpq_get_line_async):
* postgresql/postgresql.c (FROB):
* postgresql/postgresql.c (init_postgresql_from_environment):
* ldap/eldap.c:
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* canna/canna_api.c:
* canna/canna_api.c (make_euc_string):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
src/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* .gdbinit.in.in:
* README:
* abbrev.c (write_abbrev):
* abbrev.c (describe_abbrev):
* alloc.c (make_extstring):
* alloc.c (build_istring):
* alloc.c (build_cistring):
* alloc.c (build_ascstring):
* alloc.c (build_extstring):
* alloc.c (build_msg_istring):
* alloc.c (build_defer_istring):
* buffer.c (Fgenerate_new_buffer_name):
* buffer.c (init_buffer_2):
* console-tty.c (tty_init_console):
* console-x.c (get_display_arg_connection):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* database.c (dbm_map):
* database.c (dbm_get):
* database.c (berkdb_get):
* database.c (berkdb_map):
* device-gtk.c (FROB_PIXMAP):
* device-gtk.c (Fgtk_style_info):
* device-msw.c (msprinter_default_printer):
* device-msw.c (sync_printer_with_devmode):
* device-x.c (coding_system_of_xrm_database):
* device-x.c (x_init_device):
* device-x.c (signal_if_x_error):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_server_vendor):
* device-x.c (Fx_get_font_path):
* dialog-x.c (maybe_run_dbox_text_callback):
* doc.c (extract_object_file_name):
* doc.c (unparesseuxify_doc_string):
* doc.c (get_doc_string):
* doc.c (get_object_file_name):
* doc.c (Fdocumentation):
* doc.c (Fsnarf_documentation):
* doc.c (Fsubstitute_command_keys):
* editfns.c (init_editfns):
* editfns.c (Ftemp_directory):
* editfns.c (Fuser_login_name):
* editfns.c (Fuser_real_login_name):
* editfns.c (Fuser_home_directory):
* editfns.c (Fformat_time_string):
* editfns.c (Fcurrent_time_string):
* editfns.c (Fcurrent_time_zone):
* emacs.c:
* emacs.c (main_1):
* emodules.c (Flist_modules):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_sym):
* emodules.c (vars_of_module):
* event-Xt.c (x_has_keysym):
* event-gtk.c (emacs_gtk_format_magic_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (gtk_reset_key_mapping):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* faces.c (complex_vars_of_faces):
* file-coding.c (find_coding_system):
* file-coding.c (setup_eol_coding_systems):
* file-coding.c (make_coding_system_1):
* file-coding.c (snarf_coding_system):
* fileio.c:
* fileio.c (lisp_strerror):
* fileio.c (Ffile_name_directory):
* fileio.c (Ffile_name_as_directory):
* fileio.c (Fdirectory_file_name):
* fileio.c (if):
* fileio.c (Ffile_symlink_p):
* fileio.c (Fencrypt_string):
* fileio.c (Fdecrypt_string):
* filelock.c (lock_file):
* filelock.c (Ffile_locked_p):
* floatfns.c (matherr):
* font-mgr.c (build_fcapi_string):
* font-mgr.c (make_xlfd_font_regexp):
* frame-msw.c (mswindows_window_id):
* frame-msw.c (mswindows_frame_property):
* frame-x.c:
* frame-x.c (color_to_string):
* frame-x.c (maybe_set_frame_title_format):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (Fx_window_id):
* glade.c (connector):
* glade.c (Fglade_xml_textdomain):
* glade.c (syms_of_glade):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (font_instantiate):
* glyphs-gtk.c (BUILD_GLYPH_INST):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (font_instantiate):
* glyphs-x.c (x_widget_property):
* glyphs-x.c (BUILD_GLYPH_INST):
* glyphs.c (print_image_instance):
* glyphs.c (bitmap_to_lisp_data):
* glyphs.c (pixmap_to_lisp_data):
* gpmevent.c (turn_off_gpm):
* gpmevent.c (Fgpm_enabled_p):
* gpmevent.c (Fgpm_enable):
* gtk-glue.c (__make_string_mapper):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-xemacs.c (FROB_FACE):
* gtk-xemacs.c (xemacs_gtk_convert_color):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* insdel.c (buffer_insert_ascstring_1):
* insdel.h:
* insdel.h (buffer_insert_ascstring):
* intl.c (Fcurrent_locale):
* intl.c (Fset_current_locale):
* keymap.c (make_key_description):
* keymap.c (Ftext_char_description):
* keymap.c (describe_command):
* keymap.c (describe_map):
* lisp.h:
* lread.c:
* lread.c (locate_file_in_directory_mapper):
* lread.c (locate_file_construct_suffixed_files_mapper):
* mule-charset.c (Fmake_charset):
* nt.c (Fmswindows_short_file_name):
* nt.c (Fmswindows_long_file_name):
* objects-gtk.c (__get_gtk_font_truename):
* objects-gtk.c (__gtk_font_list_internal):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (create_hfont_from_font_spec):
* objects-msw.c (mswindows_font_list):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
* objects-tty.c (tty_initialize_font_instance):
* objects-x.c (x_font_truename):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_instance_properties):
* objects-x.c (x_font_list):
* print.c (write_cistring):
* print.c (print_vector_internal):
* print.c (print_cons):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_create_process):
* process-unix.c (unix_canonicalize_host_name):
* process.c (status_message):
* process.c (status_notify):
* process.c (init_xemacs_process):
* process.c (syms_of_process):
* redisplay-tty.c (term_get_fkeys_1):
* redisplay-tty.c (CONDITIONAL_REASSIGN):
* search.c (compile_pattern_1):
* select-common.h (selection_data_to_lisp_data):
* select-gtk.c (atom_to_symbol):
* select-gtk.c (PROCESSING_GTK_CODE):
* select-msw.c (mswindows_get_foreign_selection):
* select-x.c (x_atom_to_symbol):
* select-x.c (Fx_get_cutbuffer_internal):
* symbols.c (intern_istring):
* symbols.c (intern):
* symbols.c (intern_converting_underscores_to_dashes):
* symbols.c (Fintern):
* sysdep.c (init_system_name):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* syswindows.h:
* syswindows.h (build_tstr_string):
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (DFC_RESULT_PASS):
* tests.c (Ftest_data_format_conversion):
* text.c:
* text.c (new_dfc_convert_now_damn_it):
* text.h:
* text.h (build_wext_string):
* tooltalk.c (tt_build_c_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* ui-byhand.c (Fgtk_clist_get_text):
* ui-byhand.c (Fgtk_clist_get_pixtext):
* ui-byhand.c (Fgtk_label_get):
* ui-byhand.c (Fgtk_notebook_query_tab_label_packing):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (symbol_to_enum):
* ui-gtk.c (enum_to_symbol):
* unexaix.c (report_error):
* unexaix.c (ERROR0):
* unexec.c (report_error):
* unexec.c (ERROR0):
* unicode.c (unicode_to_ichar):
* win32.c (tstr_to_local_file_format):
* win32.c (Fmswindows_cygwin_to_win32_path):
* win32.c (struct read_link_hash):
* xemacs.def.in.in:
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
These functions have been renamed so that the naming harmonizes
with the typedefs for strings: `cistring' along with CIbyte *,
`istring' along with Ibyte *, `extstring' along with Extbyte *,
`ascstring' along with Ascbyte *.
Also make buffer_insert_ascstring take Ascbyte * and assert
that its argument is ASCII.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 27 Jan 2010 00:35:36 -0600 |
| parents | e38acbeb1cae |
| children | 2a54dfbe434f 308d34e9f07d |
| 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 | |
| 12 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 13 ;; under the terms of the GNU General Public License as published by | |
| 14 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 15 ;; any later version. | |
| 16 | |
| 17 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 18 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 20 ;; General Public License for more details. | |
| 21 | |
| 22 ;; You should have received a copy of the GNU General Public License | |
| 23 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 24 ;; Free Software Foundation, 59 Temple Place - Suite 330, | |
| 25 ;; Boston, MA 02111-1307, USA. | |
| 26 | |
| 27 ;;; Synched up with: Not in FSF. | |
| 28 | |
| 29 ;;; Commentary: | |
| 30 | |
| 31 ;;; Code: | |
| 32 (defgroup sound nil | |
| 33 "Configure XEmacs sounds and properties" | |
| 34 :group 'environment) | |
| 35 | |
| 36 (defcustom sound-default-alist | |
| 37 '((default :sound bass) | |
| 38 (undefined-key :sound drum) | |
| 39 (undefined-click :sound drum) | |
| 40 ;; beginning-of-buffer or end-of-buffer errors. | |
| 41 (buffer-bound :sound drum) | |
| 42 ;; buffer-read-only error | |
| 43 (read-only :sound drum) | |
| 793 | 44 ;; any error other than those handled by undefined-key, |
| 45 ;; undefined-click, buffer-bound, read-only | |
| 428 | 46 (command-error :sound bass) |
| 47 (y-or-n-p :sound quiet) | |
| 48 (yes-or-no-p :sound quiet) | |
| 49 (auto-save-error :sound whip :volume 100) | |
| 50 (no-completion :sound whip) | |
| 51 (isearch-failed :sound quiet) | |
| 52 (isearch-quit :sound bass) | |
| 53 ;; QUIT: sound generated by ^G and its variants. | |
| 54 (quit :sound quiet :volume 75) | |
| 55 ;; READY: time-consuming task has completed... compile, | |
| 56 ;; cvs-update, etc. | |
| 57 (ready :sound cuckoo) | |
| 58 ;; WARP: XEmacs has changed the selected-window or frame | |
| 59 ;; asynchronously... Especially when it's done by an | |
| 60 ;; asynchronous process filter. Perhaps by a debugger breakpoint | |
| 61 ;; has been hit? | |
| 62 (warp :sound yeep :volume 75) | |
| 63 ;; ALARM: used for reminders... | |
| 64 (alarm :sound cuckoo :volume 100) | |
| 65 ) | |
| 66 "The alist of sounds and associated error symbols. | |
| 67 | |
| 68 Used to set sound-alist in load-default-sounds." | |
| 69 :group 'sound | |
| 70 :type '(repeat | |
| 71 (group (symbol :tag "Name") | |
| 72 (checklist :inline t | |
| 73 :greedy t | |
| 74 (group :inline t | |
| 75 (const :format "" :value :sound) | |
| 76 (symbol :tag "Sound")) | |
| 77 (group :inline t | |
| 78 (const :format "" :value :volume) | |
| 79 (integer :tag "Volume")) | |
| 80 (group :inline t | |
| 81 (const :format "" :value :pitch) | |
| 82 (integer :tag "Pitch")) | |
| 83 (group :inline t | |
| 84 (const :format "" :value :duration) | |
| 85 (integer :tag "Duration")))))) | |
| 86 | |
| 87 (defcustom sound-load-list | |
| 88 '((load-sound-file "drum-beep" 'drum) | |
| 89 (load-sound-file "quiet-beep" 'quiet) | |
| 90 (load-sound-file "bass-snap" 'bass 80) | |
| 91 (load-sound-file "whip" 'whip 70) | |
| 92 (load-sound-file "cuckoo" 'cuckoo) | |
| 93 (load-sound-file "yeep" 'yeep) | |
| 94 (load-sound-file "hype" 'hype 100) | |
| 95 ) | |
| 96 "A list of calls to load-sound-file to be processed by load-default-sounds. | |
| 97 | |
| 98 Reference load-sound-file for more information." | |
| 99 | |
| 100 :group 'sound | |
| 101 :type '(repeat (sexp :tag "Sound") | |
| 102 )) | |
| 103 | |
| 104 (defcustom default-sound-directory (locate-data-directory "sounds") | |
| 105 "Default directory to load a sound file from." | |
| 106 :group 'sound | |
| 107 :type 'directory | |
| 108 ) | |
| 109 | |
| 110 ;; #### This should really be a list. --hniksic | |
| 458 | 111 (defcustom sound-extension-list (cond ((or (eq system-type 'cygwin32) |
| 112 (eq system-type 'windows-nt)) | |
| 113 ".wav:") | |
| 114 ((eq system-type 'linux) | |
| 115 ".wav:.au:") | |
| 116 (t | |
| 117 ".au:")) | |
| 428 | 118 "Filename extensions to complete sound file name with. If more than one |
| 119 extension is used, they should be separated by \":\". " | |
| 120 :group 'sound | |
| 121 :type 'string) | |
| 122 | |
| 123 (defcustom default-sound-directory-list (locate-data-directory-list "sounds") | |
| 124 "List of directories which to search for sound files" | |
| 125 :group 'sound | |
| 126 :type '(repeat directory ) | |
| 127 ) | |
| 128 | |
| 129 ;;;###autoload | |
| 130 (or sound-alist | |
| 131 ;; these should be silent until sounds are loaded | |
| 132 (setq sound-alist '((ready nil) (warp nil)))) | |
| 133 | |
| 134 ;;;###autoload | |
| 135 (defun load-sound-file (filename sound-name &optional volume) | |
| 136 "Read in an audio-file and add it to the sound-alist. | |
| 137 | |
| 458 | 138 FILENAME can either be absolute or relative, in which case the file will |
| 139 be searched in the directories given by `default-sound-directory-list'. | |
| 140 When looking for the file, the extensions given by `sound-extension-list' are | |
| 141 also tried in the given order. | |
| 142 | |
| 428 | 143 You can only play sound files if you are running on display 0 of the |
| 144 console of a machine with native sound support or running a NetAudio | |
| 502 | 145 or ESD server and XEmacs has the necessary sound support compiled in. |
| 428 | 146 |
| 502 | 147 The sound file must be in the Sun/NeXT U-LAW format, except on Linux |
| 148 and MS Windows, where .wav files are also supported by the sound card | |
| 149 drivers." | |
| 428 | 150 (interactive "fSound file name: \n\ |
| 151 SSymbol to name this sound: \n\ | |
| 152 nVolume (0 for default): ") | |
| 153 (unless (symbolp sound-name) | |
| 154 (error "sound-name not a symbol")) | |
| 155 (unless (or (null volume) (integerp volume)) | |
| 156 (error "volume not an integer or nil")) | |
| 502 | 157 (let ((file |
| 158 ;; For absolute file names, we don't have on choice on the | |
| 159 ;; location, but sound extensions however can still be tried | |
| 160 (locate-file filename | |
| 161 (if (file-name-absolute-p filename) | |
| 162 (list (file-name-directory filename)) | |
| 163 default-sound-directory-list) | |
| 164 (split-string sound-extension-list ":"))) | |
| 458 | 165 buf data) |
| 428 | 166 (unless file |
| 167 (error "Couldn't load sound file %s" filename)) | |
| 168 (unwind-protect | |
| 169 (save-excursion | |
| 170 (set-buffer (setq buf (get-buffer-create " *sound-tmp*"))) | |
| 171 (buffer-disable-undo (current-buffer)) | |
| 172 (erase-buffer) | |
| 173 (let ((coding-system-for-read 'binary)) | |
| 174 (insert-file-contents file)) | |
| 175 (setq data (buffer-string)) | |
| 176 (erase-buffer)) | |
| 177 (and buf (kill-buffer buf))) | |
| 178 (let ((old (assq sound-name sound-alist))) | |
| 179 ;; some conses in sound-alist might have been dumped with emacs. | |
| 180 (if old (setq sound-alist (delq old (copy-sequence sound-alist))))) | |
| 181 (setq sound-alist (cons | |
| 444 | 182 (nconc (list sound-name) |
| 183 (if (and volume (not (eq 0 volume))) | |
| 184 (list ':volume volume)) | |
| 185 (list ':sound data)) | |
| 186 sound-alist))) | |
| 428 | 187 sound-name) |
| 188 | |
| 189 ;;;###autoload | |
| 190 (defun load-default-sounds () | |
| 191 "Load and install some sound files as beep-types, using | |
| 192 `load-sound-file'. This only works if you're on display 0 of the | |
| 193 console of a machine with native sound support or running a NetAudio | |
| 194 server and XEmacs has the necessary sound support compiled in." | |
| 195 (interactive) | |
| 196 ;; #### - this should do NOTHING if the sounds can't be played. | |
| 197 (message "Loading sounds...") | |
| 198 (setq sound-alist nil) | |
| 199 ;; this is where the calls to load-sound-file get done | |
| 200 (mapc 'eval sound-load-list) | |
| 201 (setq sound-alist | |
| 202 (append sound-default-alist | |
| 203 sound-alist)) | |
| 204 (message "Loading sounds...done") | |
| 205 ;; (beep nil 'quiet) | |
| 206 ) | |
| 207 | |
| 208 ;;; sound.el ends here. |