annotate src/esd.c @ 5307:c096d8051f89

Have NATNUMP give t for positive bignums; check limits appropriately. src/ChangeLog addition: 2010-11-20 Aidan Kehoe <kehoea@parhasard.net> * abbrev.c (Fexpand_abbrev): * alloc.c: * alloc.c (Fmake_list): * alloc.c (Fmake_vector): * alloc.c (Fmake_bit_vector): * alloc.c (Fmake_byte_code): * alloc.c (Fmake_string): * alloc.c (vars_of_alloc): * bytecode.c (UNUSED): * bytecode.c (Fbyte_code): * chartab.c (decode_char_table_range): * cmds.c (Fself_insert_command): * data.c (check_integer_range): * data.c (Fnatnump): * data.c (Fnonnegativep): * data.c (Fstring_to_number): * elhash.c (hash_table_size_validate): * elhash.c (decode_hash_table_size): * eval.c (Fbacktrace_frame): * event-stream.c (lisp_number_to_milliseconds): * event-stream.c (Faccept_process_output): * event-stream.c (Frecent_keys): * event-stream.c (Fdispatch_event): * events.c (Fmake_event): * events.c (Fevent_timestamp): * events.c (Fevent_timestamp_lessp): * events.h: * events.h (struct command_builder): * file-coding.c (gzip_putprop): * fns.c: * fns.c (check_sequence_range): * fns.c (Frandom): * fns.c (Fnthcdr): * fns.c (Flast): * fns.c (Fnbutlast): * fns.c (Fbutlast): * fns.c (Fmember): * fns.c (Ffill): * fns.c (Freduce): * fns.c (replace_string_range_1): * fns.c (Freplace): * font-mgr.c (Ffc_pattern_get): * frame-msw.c (msprinter_set_frame_properties): * glyphs.c (check_valid_xbm_inline): * indent.c (Fmove_to_column): * intl-win32.c (mswindows_multibyte_to_unicode_putprop): * lisp.h: * lisp.h (ARRAY_DIMENSION_LIMIT): * lread.c (decode_mode_1): * mule-ccl.c (ccl_get_compiled_code): * number.h: * process-unix.c (unix_open_multicast_group): * process.c (Fset_process_window_size): * profile.c (Fstart_profiling): * unicode.c (Funicode_to_char): Change NATNUMP to return 1 for positive bignums; changes uses of it and of CHECK_NATNUM appropriately, usually by checking for an integer in an appropriate range. Add array-dimension-limit and use it in #'make-vector, #'make-string. Add array-total-size-limit, array-rank-limit while we're at it, for the sake of any Common Lisp-oriented code that uses these limits. Rename check_int_range to check_integer_range, have it take Lisp_Objects (and thus bignums) instead. Remove bignum_butlast(), just set int_n to an appropriately large integer if N is a bignum. Accept bignums in check_sequence_range(), change the functions that use check_sequence_range() appropriately. Move the definition of NATNUMP() to number.h; document why it's a reasonable name, contradicting an old comment. tests/ChangeLog addition: 2010-11-20 Aidan Kehoe <kehoea@parhasard.net> * automated/lisp-tests.el: * automated/lisp-tests.el (featurep): * automated/lisp-tests.el (wrong-type-argument): * automated/mule-tests.el (featurep): Check for args-out-of-range errors instead of wrong-type-argument errors in various places when code is handed a large bignum instead of a fixnum. Also check for the wrong-type-argument errors when giving the same code a non-integer value.
author Aidan Kehoe <kehoea@parhasard.net>
date Sat, 20 Nov 2010 16:49:11 +0000
parents ecf1ebac70d8
children 308d34e9f07d
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
563
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 398
diff changeset
22 /* This file Mule-ized by Ben Wing, 5-15-01. */
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 398
diff changeset
23
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
24 #include <config.h>
563
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 398
diff changeset
25 #include "lisp.h"
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
26
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
27 #include "miscplay.h"
563
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 398
diff changeset
28 #include "sound.h"
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 398
diff changeset
29
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 398
diff changeset
30 #include "sysfile.h"
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
31
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
32 #include <esd.h>
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
33
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
34
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
35 /* the name given to ESD - I think this should identify ourselves */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
36 #define ESD_NAME "xemacs"
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
37
563
183866b06e0b [xemacs-hg @ 2001-05-24 07:50:48 by ben]
ben
parents: 398
diff changeset
38 int esd_play_sound_file (Extbyte *file, int vol);
609
13e3d7ae7155 [xemacs-hg @ 2001-06-06 12:34:42 by ben]
ben
parents: 564
diff changeset
39 int
2286
04bc9d2f42c7 [xemacs-hg @ 2004-09-20 19:18:55 by james]
james
parents: 1261
diff changeset
40 esd_play_sound_file (Extbyte *file, int UNUSED (vol))
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
41 { /* #### FIXME: vol is ignored */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
42 return esd_play_file(ESD_NAME, file, 0);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
43 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
44
2367
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
45 int esd_play_sound_data (Binbyte *data, size_t length, int vol);
609
13e3d7ae7155 [xemacs-hg @ 2001-06-06 12:34:42 by ben]
ben
parents: 564
diff changeset
46 int
2367
ecf1ebac70d8 [xemacs-hg @ 2004-11-04 23:05:23 by ben]
ben
parents: 2286
diff changeset
47 esd_play_sound_data (Binbyte *data, size_t length, int UNUSED (vol))
398
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;
1261
465bd3c7d932 [xemacs-hg @ 2003-02-06 06:35:47 by ben]
ben
parents: 609
diff changeset
54 Bytecount wrtn, crtn;
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
55 size_t prtn;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
56 int flags, sock;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
57
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
58 /* analyze_format needs at least this many bytes to work with */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
59 if (length < HEADERSZ)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
60 return 0;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
61
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
62 ffmt = analyze_format(data,&fmt,&speed,&tracks,&parsesndfile);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
63
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
64 if (ffmt != fmtRaw && ffmt != fmtSunAudio && ffmt != fmtWave) {
564
001628b7a5b3 [xemacs-hg @ 2001-05-24 09:37:25 by yoshiki]
yoshiki
parents: 563
diff changeset
65 sound_warn("Unsupported file format (neither RAW, nor Sun/DECAudio, nor WAVE)");
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
66 return 0;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
67 }
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 /* convert header information into ESD flags */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
70 flags = ESD_STREAM|ESD_PLAY;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
71 sndcnv = sndcnvnop;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
72 switch (fmt)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
73 {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
74 case AFMT_MU_LAW:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
75 sndcnv = sndcnvULaw_2linear;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
76 flags |= ESD_BITS8;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
77 break;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
78 case AFMT_S8:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
79 sndcnv = sndcnv2unsigned; /* ESD needs unsigned bytes */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
80 case AFMT_U8:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
81 flags |= ESD_BITS8;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
82 break;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
83 case AFMT_S16_BE:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
84 sndcnv = sndcnv16swap; /* ESD wants little endian */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
85 case AFMT_S16_LE:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
86 flags |= ESD_BITS16;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
87 break;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
88 default:
564
001628b7a5b3 [xemacs-hg @ 2001-05-24 09:37:25 by yoshiki]
yoshiki
parents: 563
diff changeset
89 {
001628b7a5b3 [xemacs-hg @ 2001-05-24 09:37:25 by yoshiki]
yoshiki
parents: 563
diff changeset
90 Extbyte warn_buf[255];
001628b7a5b3 [xemacs-hg @ 2001-05-24 09:37:25 by yoshiki]
yoshiki
parents: 563
diff changeset
91 sprintf (warn_buf, "byte format %d unimplemented", fmt);
001628b7a5b3 [xemacs-hg @ 2001-05-24 09:37:25 by yoshiki]
yoshiki
parents: 563
diff changeset
92 sound_warn (warn_buf);
001628b7a5b3 [xemacs-hg @ 2001-05-24 09:37:25 by yoshiki]
yoshiki
parents: 563
diff changeset
93 return 0;
001628b7a5b3 [xemacs-hg @ 2001-05-24 09:37:25 by yoshiki]
yoshiki
parents: 563
diff changeset
94 }
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
95 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
96 switch (tracks)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
97 {
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
98 case 1: flags |= ESD_MONO; break;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
99 case 2: flags |= ESD_STEREO; break;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
100 default:
564
001628b7a5b3 [xemacs-hg @ 2001-05-24 09:37:25 by yoshiki]
yoshiki
parents: 563
diff changeset
101 {
001628b7a5b3 [xemacs-hg @ 2001-05-24 09:37:25 by yoshiki]
yoshiki
parents: 563
diff changeset
102 Extbyte warn_buf[255];
001628b7a5b3 [xemacs-hg @ 2001-05-24 09:37:25 by yoshiki]
yoshiki
parents: 563
diff changeset
103 sprintf (warn_buf, "%d channels - only 1 or 2 supported", tracks);
001628b7a5b3 [xemacs-hg @ 2001-05-24 09:37:25 by yoshiki]
yoshiki
parents: 563
diff changeset
104 sound_warn (warn_buf);
001628b7a5b3 [xemacs-hg @ 2001-05-24 09:37:25 by yoshiki]
yoshiki
parents: 563
diff changeset
105 return 0;
001628b7a5b3 [xemacs-hg @ 2001-05-24 09:37:25 by yoshiki]
yoshiki
parents: 563
diff changeset
106 }
398
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
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
109 sock = esd_play_stream(flags, speed, NULL, "xemacs");
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
110 if (sock < 0)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
111 return 0;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
112
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
113 reset_parsestate();
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
114
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
115 for (pptr = data; (prtn = parsesndfile((void **)&pptr,&length,
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
116 (void **)&optr)) > 0; )
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
117 for (cptr = optr; (crtn = sndcnv((void **)&cptr,&prtn,
1261
465bd3c7d932 [xemacs-hg @ 2003-02-06 06:35:47 by ben]
ben
parents: 609
diff changeset
118 (void **)&sptr)) > 0; )
465bd3c7d932 [xemacs-hg @ 2003-02-06 06:35:47 by ben]
ben
parents: 609
diff changeset
119 {
465bd3c7d932 [xemacs-hg @ 2003-02-06 06:35:47 by ben]
ben
parents: 609
diff changeset
120 if ((wrtn = write(sock,sptr,crtn)) < 0)
465bd3c7d932 [xemacs-hg @ 2003-02-06 06:35:47 by ben]
ben
parents: 609
diff changeset
121 {
465bd3c7d932 [xemacs-hg @ 2003-02-06 06:35:47 by ben]
ben
parents: 609
diff changeset
122 sound_perror ("write error");
465bd3c7d932 [xemacs-hg @ 2003-02-06 06:35:47 by ben]
ben
parents: 609
diff changeset
123 goto END_OF_PLAY;
465bd3c7d932 [xemacs-hg @ 2003-02-06 06:35:47 by ben]
ben
parents: 609
diff changeset
124 }
465bd3c7d932 [xemacs-hg @ 2003-02-06 06:35:47 by ben]
ben
parents: 609
diff changeset
125 if (wrtn != crtn)
465bd3c7d932 [xemacs-hg @ 2003-02-06 06:35:47 by ben]
ben
parents: 609
diff changeset
126 {
465bd3c7d932 [xemacs-hg @ 2003-02-06 06:35:47 by ben]
ben
parents: 609
diff changeset
127 Extbyte warn_buf[255];
465bd3c7d932 [xemacs-hg @ 2003-02-06 06:35:47 by ben]
ben
parents: 609
diff changeset
128 sprintf (warn_buf, "only wrote %ld of %ld bytes", wrtn, crtn);
465bd3c7d932 [xemacs-hg @ 2003-02-06 06:35:47 by ben]
ben
parents: 609
diff changeset
129 sound_warn (warn_buf);
465bd3c7d932 [xemacs-hg @ 2003-02-06 06:35:47 by ben]
ben
parents: 609
diff changeset
130 goto END_OF_PLAY;
465bd3c7d932 [xemacs-hg @ 2003-02-06 06:35:47 by ben]
ben
parents: 609
diff changeset
131 }
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
132 }
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
133
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
134 if (ffmt == fmtWave)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
135 parse_wave_complete();
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
136
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
137 END_OF_PLAY:
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
138 /* Now cleanup all used resources */
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
139
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
140 close(sock);
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
141 return 1;
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents:
diff changeset
142 }