Mercurial > hg > xemacs-beta

diff src/esd.c @ 564:001628b7a5b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2001-05-24 09:37:25 by yoshiki] Fix broken build on Linux. * buffer.c (Qtext_conversion_error): Moved from file-coding.c so that --with-file-coding=no will compile corectly. * buffer.c (syms_of_buffer): Define Qtext_conversion_error. Also moved from file-coding.c * file-coding.c (Qtext_conversion_error): Moved to buffer.c * file-coding.c (syms_of_file_coding): Moved Qtext_conversion_error initialization to buffer.c * emodules.c (Qdll_error): New error. * emodules.c (syms_of_module): Declare Qdll_error. * esd.c (esd_play_sound_data): sound_warn accepts only one arg. * miscplay.c (sndcnv8S_2mono): * miscplay.c (sndcnv2monounsigned): * miscplay.c (int2ulaw): * miscplay.c (sndcnv2byteLE): * miscplay.c (sndcnv2byteBE): * miscplay.c (sndcnv2monobyteLE): * miscplay.c (sndcnv2monobyteBE): Replace signed Char_Binary with Char_Binary. There's no type called signed char in C. Also remove audio: from error message. sound_warn and sound_perror prepends them.
author yoshiki
date Thu, 24 May 2001 09:37:30 +0000
parents 183866b06e0b
children 13e3d7ae7155
line wrap: on
line diff
--- a/src/esd.c	Thu May 24 07:51:33 2001 +0000
+++ b/src/esd.c	Thu May 24 09:37:30 2001 +0000
@@ -61,7 +61,7 @@
   ffmt = analyze_format(data,&fmt,&speed,&tracks,&parsesndfile);
 
   if (ffmt != fmtRaw && ffmt != fmtSunAudio && ffmt != fmtWave) {
-    sound_warn("audio: Unsupported file format (neither RAW, nor Sun/DECAudio, nor WAVE)");
+    sound_warn("Unsupported file format (neither RAW, nor Sun/DECAudio, nor WAVE)");
       return 0;
   }
 
@@ -85,16 +85,24 @@
       flags |= ESD_BITS16;
       break;
     default:
-      sound_warn ("audio: byte format %d unimplemented", fmt);
-      return 0;
+      {
+	Extbyte warn_buf[255];
+	sprintf (warn_buf, "byte format %d unimplemented", fmt);
+	sound_warn (warn_buf);
+	return 0;
+      }
     }
   switch (tracks)
     {
     case 1: flags |= ESD_MONO; break;
     case 2: flags |= ESD_STEREO; break;
     default:
-      sound_warn ("audio: %d channels - only 1 or 2 supported", tracks);
-      return 0;
+      {
+	Extbyte warn_buf[255];
+	sprintf (warn_buf, "%d channels - only 1 or 2 supported", tracks);
+	sound_warn (warn_buf);
+	return 0;
+      }
     }
 
   sock = esd_play_stream(flags, speed, NULL, "xemacs");
@@ -108,11 +116,13 @@
     for (cptr = optr; (crtn = sndcnv((void **)&cptr,&prtn,
                                     (void **)&sptr)) > 0; ) {
       if ((wrtn = write(sock,sptr,crtn)) < 0) {
-	sound_perror ("audio: write error");
+	sound_perror ("write error");
        goto END_OF_PLAY;
       }
       if (wrtn != crtn) {
-	sound_warn ("audio: only wrote %d of %d bytes", wrtn, crtn);
+	Extbyte warn_buf[255];
+	sprintf (warn_buf , "only wrote %d of %d bytes", wrtn, crtn);
+	sound_warn (warn_buf);
        goto END_OF_PLAY;
       }
     }