annotate src/esd.c @ 502:7039e6323819

[xemacs-hg @ 2001-05-04 22:41:46 by ben] ----------------------- byte-comp warning fixes ----------------- New functions for cleanly eliminating byte-compiler warnings. Their definitions require no changes at all in bytecomp.el, meaning that any package that wants to use them and be compatible with older versions of XEmacs need only copy the code and rename the functions (i.e. prefix them with the package name). Eliminate byte-compiler warnings using the new functions in bytecomp-runtime.el. Move coding-system-put,get,category, since they're not Mule-specific and are used in prefer-coding-system. font.el was incredibly ugly. Clean it up. Avoid using defsubst for any exported functions, to avoid possible compatibility problems if we later change the internal interface. (It happened before, with face accessors, between 19.8 and 19.9). Fix tons of warnings. Clean up (new function gpm-is-supported-p eliminates duplicate code in gpm-create/delete-device-hook) and eliminate warnings. ---------- make byte-recompile-directory work in the --------- core `lisp' dir, even in the absence of a Mule XEmacs (i.e. make it skip the Mule files rather than trying to compile them). now you should be able to do `touch *.el' in the `lisp' dir, then M-x byte-recompile-directory, and get no warnings. Avoid trying to compile Mule files in byte-recompile-directory when we're not in a Mule XEmacs, since we're highly likely to get syntax errors. Add a coding-system cookie to all Mule files so that byte-recompile-directory ignores them. Magic cookie function moved to files.el from code-files.el (for use by bytecomp even in a non-coding-system XEmacs), and changed names and semantics for use by bytecomp. NOTE: IMO this is an internal function that we can change as we like (and there is absolutely no code anywhere else using the function). ---------------- GUI improvements: menus, help ------------------- Rearrange order of keymap declarations to be alphabetical. Improve help on help to include all bindings, and group by category. Add bindings for new Info commands. Remove warnings. Use command-hyper-apropos in place of command-apropos. Add a function to do the equivalent of command-apropos. Evals its help-text argument so you can put expressions there. Used now by help-for-help. Add binding to continue text searches. Expand index searches to work over multiple info documents. Add commands to search text/index in User and Lispref. Add new entry, "Uncomment Region" (parallels "Comment Out Region"). Redo Help menu; add bindings for new Info commands to search the index or text of the User and Lispref manuals. Add command for mark-paragraph, activate-region. Make Edit->R accelerator be rectangle, not register (more commonly used), and put rectangle first. Fix the Edit Init File entry to never load the .elc file. Simplify the default-popup-menu. Add Cmds->Tabs menu. Use kp-left not kp_left, etc. ---------------- Miscellaneous bug fixes/cleanup ------------------- byte-compiler-options: Correct doc string. easy-menu-do-define: fix extra quote. fill-paragraph-or-region:Rewrite to be more correct -- use call-interactively so that we always get exactly the same behavior as if the functions were called directly. No need to fiddle with zmacs-region-stays, now that bogus clearing of it (2001-04-28 src/ChangeLog) is removed. Put dialog titles back in -- this time correctly. Fix various other problems with leaks and such. key-sequence-list-description: Clean up fun to always correctly canonicalize. Clean up Kinsoku comments, synch comment-region with FSF 20.7. * simple.el (region-exists-p): * simple.el (region-active-p): Add comment about which one is correct to use in menu specs. * sound.el (load-sound-file): Minor code clean up. * startup.el: * startup.el (command-line-early): * startup.el (initial-scratch-message): Comment changes. Add info about sample.init.el to splash screen. Improve initial-scratch-message and clarify purpose of Scratch buffer. Fix byte-compile warning. ------------------------ Added features ------------------------- Add new variable to control whether etags checks all parent directories for tag files. (On by default.) * hash-table.el: New file, useful utility functions. * dumped-lisp.el (preloaded-file-list): Dump hash-table.el. ------------ notable bug fix: Windows event code -------------- Get critical quit working. ------------ notable bug fix and new feature: regex code -------------- Shy groups were implemented in a horrible, half-assed way that would cause them to screw up regex searching in most cases. Fixed to work correctly. Also extended back-reference syntax past 9. Only is recognized as such if there are at least that many non-shy groups; and optionally will warn about such uses, to catch old code that might be using them differently. (Added variable to control this in search.c -- `warn-about-possibly-incompatible-back- references', on by default for the moment. Declared in lisp.h. ---------------- process/SIGIO improvements ------------------- define USE_GETADDRINFO to replace more complex conditional, and use it. the code conditionalized on this in unix_open_network_stream had *serious* problems handling errors. it's now fixed, and major amounts of duplicate code between the two versions were combined. don't disable SIGIO and other interrupts unless CONNECT_NEEDS_SLOWED_INTERRUPTS is defined -- don't penalize OS's without bugs. similarly for a freebsd bug that was affecting all OS's. * s\ultrix.h: define CONNECT_NEEDS_SLOWED_INTERRUPTS, since that's the OS mentioned as having a kernel bug. * sysdep.c (request_sigio_on_device): * sysdep.c (unrequest_sigio_on_device): fix SIGIO problems on Linux. add check for O_ASYNC in case it's defined and FASYNC isn't. add comment about other ways to do SIGIO on Linux. * callproc.c (Fold_call_process_internal): * process.c (Fstart_process_internal): Deal with the possibility that `default-directory' doesn't have terminating slash. Correct comments about vfork. ---------------- Miscellaneous bug fixes/cleanup ------------------- * callint.c (Finteractive): Add lots of documentation -- exactly what the Lisp equivalents of all the interactive specs are. * console.h (struct console): change type of quit_char to Emchar. * event-msw.c (lstream_type_create_mswindows_selectable): spacing change. Eliminate events-mod.h and combine into events.h. * emacs.c: * emacs.c (make_arg_list_1): * emacs.c (main_1): A couple of char->Extbyte changes, add a comment. * glyphs-msw.c: Correct indentation of function defns to not exceed 80 cols. Try (sort of) to fix some code that sets the colors of the progress gauge. (Commented out) * keymap.c (syms_of_keymap): use DEFSYMBOL. * process.c (read_process_output): No need to fiddle with zmacs_region_stays, now that bogus clearing of it (see below) is removed. * search.c (Freplace_match): warning fix.
author ben
date Fri, 04 May 2001 22:42:35 +0000
parents 74fd4e045ea6
children 183866b06e0b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
1 /* esd.c - play a sound over ESD
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
2
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
3 This file is part of XEmacs.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
4
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
5 XEmacs is free software; you can redistribute it and/or modify it
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
6 under the terms of the GNU General Public License as published by the
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
7 Free Software Foundation; either version 2, or (at your option) any
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
8 later version.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
9
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
10 XEmacs is distributed in the hope that it will be useful, but WITHOUT
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
11 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
12 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
13 for more details.
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
14
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
15 You should have received a copy of the GNU General Public License
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
16 along with XEmacs; see the file COPYING. If not, write to
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
18 Boston, MA 02111-1307, USA. */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
19
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
20 /* Synched up with: Not in FSF. */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
21
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
22 #ifdef HAVE_CONFIG_H
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
23 #include <config.h>
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
24 #endif
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
25
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
26 #include "lisp.h"
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
27 #include "miscplay.h"
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
28
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
29 #include <esd.h>
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
30
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
31 #include <unistd.h>
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
32 #include <fcntl.h>
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
33 #include <stdio.h>
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
34 #include <errno.h>
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
35 #include <string.h>
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
36
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
37 /* the name given to ESD - I think this should identify ourselves */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
38 #define ESD_NAME "xemacs"
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
39
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
40 int esd_play_sound_file(char *file, int vol);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
41 int esd_play_sound_file(char *file, int vol)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
42 { /* #### FIXME: vol is ignored */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
43 return esd_play_file(ESD_NAME, file, 0);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
44 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
45
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
46 int esd_play_sound_data(unsigned char *data, size_t length, int vol);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
47 int esd_play_sound_data(unsigned char *data, size_t length, int vol)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
48 { /* #### FIXME: vol is ignored */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
49 size_t (*parsesndfile)(void **dayta,size_t *sz,void **outbuf);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
50 size_t (*sndcnv)(void **dayta,size_t *sz,void **);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
51 fmtType ffmt;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
52 int fmt,speed,tracks;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
53 unsigned char *pptr,*optr,*cptr,*sptr;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
54 ssize_t wrtn;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
55 size_t crtn;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
56 size_t prtn;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
57 int flags, sock;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
58
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
59 /* analyze_format needs at least this many bytes to work with */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
60 if (length < HEADERSZ)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
61 return 0;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
62
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
63 ffmt = analyze_format(data,&fmt,&speed,&tracks,&parsesndfile);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
64
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
65 if (ffmt != fmtRaw && ffmt != fmtSunAudio && ffmt != fmtWave) {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
66 message(GETTEXT("audio: Unsupported file format (neither RAW, nor Sun/DECAudio, nor WAVE)"));
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
67 return 0;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
68 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
69
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
70 /* convert header information into ESD flags */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
71 flags = ESD_STREAM|ESD_PLAY;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
72 sndcnv = sndcnvnop;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
73 switch (fmt)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
74 {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
75 case AFMT_MU_LAW:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
76 sndcnv = sndcnvULaw_2linear;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
77 flags |= ESD_BITS8;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
78 break;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
79 case AFMT_S8:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
80 sndcnv = sndcnv2unsigned; /* ESD needs unsigned bytes */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
81 case AFMT_U8:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
82 flags |= ESD_BITS8;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
83 break;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
84 case AFMT_S16_BE:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
85 sndcnv = sndcnv16swap; /* ESD wants little endian */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
86 case AFMT_S16_LE:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
87 flags |= ESD_BITS16;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
88 break;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
89 default:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
90 message(GETTEXT("audio: byte format %d unimplemented"), fmt);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
91 return 0;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
92 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
93 switch (tracks)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
94 {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
95 case 1: flags |= ESD_MONO; break;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
96 case 2: flags |= ESD_STEREO; break;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
97 default:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
98 message(GETTEXT("audio: %d channels - only 1 or 2 supported"), tracks);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
99 return 0;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
100 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
101
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
102 sock = esd_play_stream(flags, speed, NULL, "xemacs");
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
103 if (sock < 0)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
104 return 0;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
105
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
106 reset_parsestate();
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
107
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
108 for (pptr = data; (prtn = parsesndfile((void **)&pptr,&length,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
109 (void **)&optr)) > 0; )
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
110 for (cptr = optr; (crtn = sndcnv((void **)&cptr,&prtn,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
111 (void **)&sptr)) > 0; ) {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
112 if ((wrtn = write(sock,sptr,crtn)) < 0) {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
113 message(GETTEXT("audio: write error (%s)"), strerror(errno));
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
114 goto END_OF_PLAY;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
115 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
116 if (wrtn != crtn) {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
117 message(GETTEXT("audio: only wrote %d of %d bytes"), wrtn, crtn);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
118 goto END_OF_PLAY;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
119 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
120 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
121
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
122 if (ffmt == fmtWave)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
123 parse_wave_complete();
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
124
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
125 END_OF_PLAY:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
126 /* Now cleanup all used resources */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
127
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
128 close(sock);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
129 return 1;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
130 }