Mercurial > hg > xemacs-beta

comparison src/esd.c @ 563:183866b06e0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2001-05-24 07:50:48 by ben] Makefile.in.in, abbrev.c, alloc.c, buffer.c, bytecode.c, callint.c, callproc.c, casetab.c, chartab.c, cmdloop.c, cmds.c, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console.c, data.c, database.c, debug.c, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, dired.c, doc.c, doprnt.c, dragdrop.c, editfns.c, eldap.c, eldap.h, elhash.c, emacs-widget-accessors.c, emacs.c, emodules.c, esd.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, filelock.c, floatfns.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, general-slots.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-gtk.c, gui-x.c, gui.c, gutter.c, hpplay.c, indent.c, input-method-xlib.c, insdel.c, intl.c, keymap.c, libsst.c, libsst.h, linuxplay.c, lisp.h, lread.c, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, miscplay.c, miscplay.h, mule-ccl.c, mule-charset.c, mule-wnnfns.c, mule.c, nas.c, ntplay.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay.c, scrollbar.c, search.c, select-gtk.c, select-x.c, select.c, sgiplay.c, sheap.c, sound.c, specifier.c, sunplay.c, symbols.c, symeval.h, symsinit.h, syntax.c, sysdep.c, toolbar-msw.c, toolbar.c, tooltalk.c, ui-byhand.c, ui-gtk.c, undo.c, unexaix.c, unexapollo.c, unexconvex.c, unexec.c, widget.c, win32.c, window.c: -- defsymbol -> DEFSYMBOL. -- add an error type to all errors. -- eliminate the error functions in eval.c that let you just use Qerror as the type. -- redo the error API to be more consistent, sensibly named, and easier to use. -- redo the error hierarchy somewhat. create new errors: structure-formation-error, gui-error, invalid-constant, stack-overflow, out-of-memory, process-error, network-error, sound-error, printing-unreadable-object, base64-conversion- error; coding-system-error renamed to text-conversion error; some others. -- fix Mule problems in error strings in emodules.c, tooltalk.c. -- fix error handling in mswin open-network-stream. -- Mule-ize all sound files and clean up the headers. -- nativesound.h -> sound.h and used for all sound files. -- move some shared stuff into glyphs-shared.c: first attempt at eliminating some of the massive GTK code duplication. xemacs.mak: add glyphs-shared.c. xemacs-faq.texi: document how to debug X errors subr.el: fix doc string to reflect reality
author ben
date Thu, 24 May 2001 07:51:33 +0000
parents 74fd4e045ea6
children 001628b7a5b3
comparison
equal deleted inserted replaced
562:c775bd016b32 563:183866b06e0b
17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
18 Boston, MA 02111-1307, USA. */ 18 Boston, MA 02111-1307, USA. */
19 19
20 /* Synched up with: Not in FSF. */ 20 /* Synched up with: Not in FSF. */
21 21
22 #ifdef HAVE_CONFIG_H 22 /* This file Mule-ized by Ben Wing, 5-15-01. */
23
23 #include <config.h> 24 #include <config.h>
24 #endif 25 #include "lisp.h"
25 26
26 #include "lisp.h"
27 #include "miscplay.h" 27 #include "miscplay.h"
28 #include "sound.h"
29
30 #include "sysfile.h"
28 31
29 #include <esd.h> 32 #include <esd.h>
30 33
31 #include <unistd.h>
32 #include <fcntl.h>
33 #include <stdio.h>
34 #include <errno.h>
35 #include <string.h>
36 34
37 /* the name given to ESD - I think this should identify ourselves */ 35 /* the name given to ESD - I think this should identify ourselves */
38 #define ESD_NAME "xemacs" 36 #define ESD_NAME "xemacs"
39 37
40 int esd_play_sound_file(char *file, int vol); 38 int esd_play_sound_file (Extbyte *file, int vol);
41 int esd_play_sound_file(char *file, int vol) 39 int esd_play_sound_file (Extbyte *file, int vol)
42 { /* #### FIXME: vol is ignored */ 40 { /* #### FIXME: vol is ignored */
43 return esd_play_file(ESD_NAME, file, 0); 41 return esd_play_file(ESD_NAME, file, 0);
44 } 42 }
45 43
46 int esd_play_sound_data(unsigned char *data, size_t length, int vol); 44 int esd_play_sound_data (UChar_Binary *data, size_t length, int vol);
47 int esd_play_sound_data(unsigned char *data, size_t length, int vol) 45 int esd_play_sound_data (UChar_Binary *data, size_t length, int vol)
48 { /* #### FIXME: vol is ignored */ 46 { /* #### FIXME: vol is ignored */
49 size_t (*parsesndfile)(void **dayta,size_t *sz,void **outbuf); 47 size_t (*parsesndfile)(void **dayta,size_t *sz,void **outbuf);
50 size_t (*sndcnv)(void **dayta,size_t *sz,void **); 48 size_t (*sndcnv)(void **dayta,size_t *sz,void **);
51 fmtType ffmt; 49 fmtType ffmt;
52 int fmt,speed,tracks; 50 int fmt,speed,tracks;
61 return 0; 59 return 0;
62 60
63 ffmt = analyze_format(data,&fmt,&speed,&tracks,&parsesndfile); 61 ffmt = analyze_format(data,&fmt,&speed,&tracks,&parsesndfile);
64 62
65 if (ffmt != fmtRaw && ffmt != fmtSunAudio && ffmt != fmtWave) { 63 if (ffmt != fmtRaw && ffmt != fmtSunAudio && ffmt != fmtWave) {
66 message(GETTEXT("audio: Unsupported file format (neither RAW, nor Sun/DECAudio, nor WAVE)")); 64 sound_warn("audio: Unsupported file format (neither RAW, nor Sun/DECAudio, nor WAVE)");
67 return 0; 65 return 0;
68 } 66 }
69 67
70 /* convert header information into ESD flags */ 68 /* convert header information into ESD flags */
71 flags = ESD_STREAM|ESD_PLAY; 69 flags = ESD_STREAM|ESD_PLAY;
85 sndcnv = sndcnv16swap; /* ESD wants little endian */ 83 sndcnv = sndcnv16swap; /* ESD wants little endian */
86 case AFMT_S16_LE: 84 case AFMT_S16_LE:
87 flags |= ESD_BITS16; 85 flags |= ESD_BITS16;
88 break; 86 break;
89 default: 87 default:
90 message(GETTEXT("audio: byte format %d unimplemented"), fmt); 88 sound_warn ("audio: byte format %d unimplemented", fmt);
91 return 0; 89 return 0;
92 } 90 }
93 switch (tracks) 91 switch (tracks)
94 { 92 {
95 case 1: flags |= ESD_MONO; break; 93 case 1: flags |= ESD_MONO; break;
96 case 2: flags |= ESD_STEREO; break; 94 case 2: flags |= ESD_STEREO; break;
97 default: 95 default:
98 message(GETTEXT("audio: %d channels - only 1 or 2 supported"), tracks); 96 sound_warn ("audio: %d channels - only 1 or 2 supported", tracks);
99 return 0; 97 return 0;
100 } 98 }
101 99
102 sock = esd_play_stream(flags, speed, NULL, "xemacs"); 100 sock = esd_play_stream(flags, speed, NULL, "xemacs");
103 if (sock < 0) 101 if (sock < 0)
108 for (pptr = data; (prtn = parsesndfile((void **)&pptr,&length, 106 for (pptr = data; (prtn = parsesndfile((void **)&pptr,&length,
109 (void **)&optr)) > 0; ) 107 (void **)&optr)) > 0; )
110 for (cptr = optr; (crtn = sndcnv((void **)&cptr,&prtn, 108 for (cptr = optr; (crtn = sndcnv((void **)&cptr,&prtn,
111 (void **)&sptr)) > 0; ) { 109 (void **)&sptr)) > 0; ) {
112 if ((wrtn = write(sock,sptr,crtn)) < 0) { 110 if ((wrtn = write(sock,sptr,crtn)) < 0) {
113 message(GETTEXT("audio: write error (%s)"), strerror(errno)); 111 sound_perror ("audio: write error");
114 goto END_OF_PLAY; 112 goto END_OF_PLAY;
115 } 113 }
116 if (wrtn != crtn) { 114 if (wrtn != crtn) {
117 message(GETTEXT("audio: only wrote %d of %d bytes"), wrtn, crtn); 115 sound_warn ("audio: only wrote %d of %d bytes", wrtn, crtn);
118 goto END_OF_PLAY; 116 goto END_OF_PLAY;
119 } 117 }
120 } 118 }
121 119
122 if (ffmt == fmtWave) 120 if (ffmt == fmtWave)