Mercurial > hg > xemacs-beta
annotate src/esd.c @ 4604:e0a8715fdb1f
Support new IGNORE-INVALID-SEQUENCESP argument, #'query-coding-region.
lisp/ChangeLog addition:
2009-02-07 Aidan Kehoe <kehoea@parhasard.net>
* coding.el (query-coding-clear-highlights):
Rename the BUFFER argument to BUFFER-OR-STRING, describe it as
possibly being a string in its documentation.
(default-query-coding-region):
Add a new IGNORE-INVALID-SEQUENCESP argument, document that this
function does not support it.
Bind case-fold-search to nil, we don't want this to influence what the
function thinks is encodable or not.
(query-coding-region):
Add a new IGNORE-INVALID-SEQUENCESP argument, document what it
does; reflect this new argument in the associated compiler macro.
(query-coding-string):
Add a new IGNORE-INVALID-SEQUENCESP argument, document what it
does. Support the HIGHLIGHT argument correctly.
* unicode.el (unicode-query-coding-region):
Add a new IGNORE-INVALID-SEQUENCESP argument, document what it
does, implement this. Document a potential problem.
Use #'query-coding-clear-highlights instead of reimplementing it
ourselves.
Remove some debugging messages.
* mule/arabic.el (iso-8859-6):
* mule/cyrillic.el (iso-8859-5):
* mule/greek.el (iso-8859-7):
* mule/hebrew.el (iso-8859-8):
* mule/latin.el (iso-8859-2):
* mule/latin.el (iso-8859-3):
* mule/latin.el (iso-8859-4):
* mule/latin.el (iso-8859-14):
* mule/latin.el (iso-8859-15):
* mule/latin.el (iso-8859-16):
* mule/latin.el (iso-8859-9):
* mule/latin.el (windows-1252):
* mule/mule-coding.el (iso-8859-1):
Avoid the assumption that characters not given an explicit mapping
in these coding systems map to the ISO 8859-1 characters
corresponding to the octets on disk; this makes it much more
reasonable to implement the IGNORE-INVALID-SEQUENCESP argument to
query-coding-region.
* mule/mule-cmds.el (set-language-info):
Correct the docstring.
* mule/mule-cmds.el (finish-set-language-environment):
Treat invalid Unicode sequences produced from
invalid-sequence-coding-system and corresponding to control
characters the same as control characters in redisplay.
* mule/mule-cmds.el:
Document that encode-coding-char is available in coding.el
* mule/mule-coding.el (make-8-bit-generate-helper):
Change to return the both the encode-program generated and the
relevant non-ASCII charset; update the docstring to reflect this.
* mule/mule-coding.el
(make-8-bit-generate-encode-program-and-skip-chars-strings):
Rename this function; have it return skip-chars-strings as well as
the encode program. Have these skip-chars-strings use ranges for
charsets, where possible.
* mule/mule-coding.el (make-8-bit-create-decode-encode-tables):
Revise this to allow people to specify explicitly characters that
should be undefined (= corresponding to keys in
unicode-error-default-translation-table), and treating unspecified
octets above #x7f as undefined by default.
* mule/mule-coding.el (8-bit-fixed-query-coding-region):
Add a new IGNORE-INVALID-SEQUENCESP argument, implement support
for it using the 8-bit-fixed-invalid-sequences-skip-chars coding
system property; remove some debugging messages.
* mule/mule-coding.el (make-8-bit-coding-system):
This function is dumped, autoloading it makes no sense.
Document what happens when characters above #x7f are not
specified, implement this.
* mule/vietnamese.el:
Correct spelling.
tests/ChangeLog addition:
2009-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/query-coding-tests.el:
Add FAILING-CASE arguments to the Assert calls, making #'q-c-debug
mostly unnecessary. Remove #'q-c-debug.
Add new tests that use the IGNORE-INVALID-SEQUENCESP argument to
#'query-coding-region; rework the existing ones to respect it.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 07 Feb 2009 17:13:37 +0000 |
| parents | ecf1ebac70d8 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 398 | 1 /* esd.c - play a sound over ESD |
| 2 | |
| 3 This file is part of XEmacs. | |
| 4 | |
| 5 XEmacs is free software; you can redistribute it and/or modify it | |
| 6 under the terms of the GNU General Public License as published by the | |
| 7 Free Software Foundation; either version 2, or (at your option) any | |
| 8 later version. | |
| 9 | |
| 10 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 11 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 12 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 13 for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU General Public License | |
| 16 along with XEmacs; see the file COPYING. If not, write to | |
| 17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 18 Boston, MA 02111-1307, USA. */ | |
| 19 | |
| 20 /* Synched up with: Not in FSF. */ | |
| 21 | |
| 563 | 22 /* This file Mule-ized by Ben Wing, 5-15-01. */ |
| 23 | |
| 398 | 24 #include <config.h> |
| 563 | 25 #include "lisp.h" |
| 398 | 26 |
| 27 #include "miscplay.h" | |
| 563 | 28 #include "sound.h" |
| 29 | |
| 30 #include "sysfile.h" | |
| 398 | 31 |
| 32 #include <esd.h> | |
| 33 | |
| 34 | |
| 35 /* the name given to ESD - I think this should identify ourselves */ | |
| 36 #define ESD_NAME "xemacs" | |
| 37 | |
| 563 | 38 int esd_play_sound_file (Extbyte *file, int vol); |
| 609 | 39 int |
| 2286 | 40 esd_play_sound_file (Extbyte *file, int UNUSED (vol)) |
| 398 | 41 { /* #### FIXME: vol is ignored */ |
| 42 return esd_play_file(ESD_NAME, file, 0); | |
| 43 } | |
| 44 | |
| 2367 | 45 int esd_play_sound_data (Binbyte *data, size_t length, int vol); |
| 609 | 46 int |
| 2367 | 47 esd_play_sound_data (Binbyte *data, size_t length, int UNUSED (vol)) |
| 398 | 48 { /* #### FIXME: vol is ignored */ |
| 49 size_t (*parsesndfile)(void **dayta,size_t *sz,void **outbuf); | |
| 50 size_t (*sndcnv)(void **dayta,size_t *sz,void **); | |
| 51 fmtType ffmt; | |
| 52 int fmt,speed,tracks; | |
| 53 unsigned char *pptr,*optr,*cptr,*sptr; | |
| 1261 | 54 Bytecount wrtn, crtn; |
| 398 | 55 size_t prtn; |
| 56 int flags, sock; | |
| 57 | |
| 58 /* analyze_format needs at least this many bytes to work with */ | |
| 59 if (length < HEADERSZ) | |
| 60 return 0; | |
| 61 | |
| 62 ffmt = analyze_format(data,&fmt,&speed,&tracks,&parsesndfile); | |
| 63 | |
| 64 if (ffmt != fmtRaw && ffmt != fmtSunAudio && ffmt != fmtWave) { | |
| 564 | 65 sound_warn("Unsupported file format (neither RAW, nor Sun/DECAudio, nor WAVE)"); |
| 398 | 66 return 0; |
| 67 } | |
| 68 | |
| 69 /* convert header information into ESD flags */ | |
| 70 flags = ESD_STREAM|ESD_PLAY; | |
| 71 sndcnv = sndcnvnop; | |
| 72 switch (fmt) | |
| 73 { | |
| 74 case AFMT_MU_LAW: | |
| 75 sndcnv = sndcnvULaw_2linear; | |
| 76 flags |= ESD_BITS8; | |
| 77 break; | |
| 78 case AFMT_S8: | |
| 79 sndcnv = sndcnv2unsigned; /* ESD needs unsigned bytes */ | |
| 80 case AFMT_U8: | |
| 81 flags |= ESD_BITS8; | |
| 82 break; | |
| 83 case AFMT_S16_BE: | |
| 84 sndcnv = sndcnv16swap; /* ESD wants little endian */ | |
| 85 case AFMT_S16_LE: | |
| 86 flags |= ESD_BITS16; | |
| 87 break; | |
| 88 default: | |
| 564 | 89 { |
| 90 Extbyte warn_buf[255]; | |
| 91 sprintf (warn_buf, "byte format %d unimplemented", fmt); | |
| 92 sound_warn (warn_buf); | |
| 93 return 0; | |
| 94 } | |
| 398 | 95 } |
| 96 switch (tracks) | |
| 97 { | |
| 98 case 1: flags |= ESD_MONO; break; | |
| 99 case 2: flags |= ESD_STEREO; break; | |
| 100 default: | |
| 564 | 101 { |
| 102 Extbyte warn_buf[255]; | |
| 103 sprintf (warn_buf, "%d channels - only 1 or 2 supported", tracks); | |
| 104 sound_warn (warn_buf); | |
| 105 return 0; | |
| 106 } | |
| 398 | 107 } |
| 108 | |
| 109 sock = esd_play_stream(flags, speed, NULL, "xemacs"); | |
| 110 if (sock < 0) | |
| 111 return 0; | |
| 112 | |
| 113 reset_parsestate(); | |
| 114 | |
| 115 for (pptr = data; (prtn = parsesndfile((void **)&pptr,&length, | |
| 116 (void **)&optr)) > 0; ) | |
| 117 for (cptr = optr; (crtn = sndcnv((void **)&cptr,&prtn, | |
| 1261 | 118 (void **)&sptr)) > 0; ) |
| 119 { | |
| 120 if ((wrtn = write(sock,sptr,crtn)) < 0) | |
| 121 { | |
| 122 sound_perror ("write error"); | |
| 123 goto END_OF_PLAY; | |
| 124 } | |
| 125 if (wrtn != crtn) | |
| 126 { | |
| 127 Extbyte warn_buf[255]; | |
| 128 sprintf (warn_buf, "only wrote %ld of %ld bytes", wrtn, crtn); | |
| 129 sound_warn (warn_buf); | |
| 130 goto END_OF_PLAY; | |
| 131 } | |
| 398 | 132 } |
| 133 | |
| 134 if (ffmt == fmtWave) | |
| 135 parse_wave_complete(); | |
| 136 | |
| 137 END_OF_PLAY: | |
| 138 /* Now cleanup all used resources */ | |
| 139 | |
| 140 close(sock); | |
| 141 return 1; | |
| 142 } |