Mercurial > hg > xemacs-beta

diff 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
line wrap: on
line diff
--- a/src/esd.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/esd.c	Thu May 24 07:51:33 2001 +0000
@@ -19,32 +19,30 @@
 
 /* Synched up with: Not in FSF. */
 
-#ifdef HAVE_CONFIG_H
+/* This file Mule-ized by Ben Wing, 5-15-01. */
+
 #include <config.h>
-#endif
+#include "lisp.h"
 
-#include "lisp.h"
 #include "miscplay.h"
+#include "sound.h"
+
+#include "sysfile.h"
 
 #include <esd.h>
 
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
 
 /* the name given to ESD - I think this should identify ourselves */
 #define ESD_NAME "xemacs"
 
-int esd_play_sound_file(char *file, int vol);
-int esd_play_sound_file(char *file, int vol)
+int esd_play_sound_file (Extbyte *file, int vol);
+int esd_play_sound_file (Extbyte *file, int vol)
 {                              /* #### FIXME: vol is ignored */
   return esd_play_file(ESD_NAME, file, 0);
 }
 
-int esd_play_sound_data(unsigned char *data, size_t length, int vol);
-int esd_play_sound_data(unsigned char *data, size_t length, int vol)
+int esd_play_sound_data (UChar_Binary *data, size_t length, int vol);
+int esd_play_sound_data (UChar_Binary *data, size_t length, int vol)
 {                              /* #### FIXME: vol is ignored */
   size_t         (*parsesndfile)(void **dayta,size_t *sz,void **outbuf);
   size_t         (*sndcnv)(void **dayta,size_t *sz,void **);
@@ -63,7 +61,7 @@
   ffmt = analyze_format(data,&fmt,&speed,&tracks,&parsesndfile);
 
   if (ffmt != fmtRaw && ffmt != fmtSunAudio && ffmt != fmtWave) {
-    message(GETTEXT("audio: Unsupported file format (neither RAW, nor Sun/DECAudio, nor WAVE)"));
+    sound_warn("audio: Unsupported file format (neither RAW, nor Sun/DECAudio, nor WAVE)");
       return 0;
   }
 
@@ -87,7 +85,7 @@
       flags |= ESD_BITS16;
       break;
     default:
-      message(GETTEXT("audio: byte format %d unimplemented"), fmt);
+      sound_warn ("audio: byte format %d unimplemented", fmt);
       return 0;
     }
   switch (tracks)
@@ -95,7 +93,7 @@
     case 1: flags |= ESD_MONO; break;
     case 2: flags |= ESD_STEREO; break;
     default:
-      message(GETTEXT("audio: %d channels - only 1 or 2 supported"), tracks);
+      sound_warn ("audio: %d channels - only 1 or 2 supported", tracks);
       return 0;
     }
 
@@ -110,11 +108,11 @@
     for (cptr = optr; (crtn = sndcnv((void **)&cptr,&prtn,
                                     (void **)&sptr)) > 0; ) {
       if ((wrtn = write(sock,sptr,crtn)) < 0) {
-       message(GETTEXT("audio: write error (%s)"), strerror(errno));
+	sound_perror ("audio: write error");
        goto END_OF_PLAY;
       }
       if (wrtn != crtn) {
-       message(GETTEXT("audio: only wrote %d of %d bytes"), wrtn, crtn);
+	sound_warn ("audio: only wrote %d of %d bytes", wrtn, crtn);
        goto END_OF_PLAY;
       }
     }