(sound_perror): Unblock SIGIO, turn on atimers.

Display errno only if non-zero.
(sound_warning): New function.
(vox_configure): Don't treat failing to set sample rate as error.
(various places): Improve error messages.

diff --git a/src/sound.c b/src/sound.c
index e5c800596565e159c284f050188b5a2f3cc85f3f..a0c1106b05fe63a928a723e5ef3d78a4acfc075f 100644 (file)
--- a/src/sound.c
+++ b/src/sound.c
@@ -234,6 +234,7 @@ static void vox_choose_format P_ ((struct sound_device *, struct sound *));
 static void vox_init P_ ((struct sound_device *));
 static void vox_write P_ ((struct sound_device *, char *, int));
 static void sound_perror P_ ((char *));
+static void sound_warning P_ ((char *));
 static int parse_sound P_ ((Lisp_Object, Lisp_Object *));
 static void find_sound_type P_ ((struct sound *));
 static u_int32_t le2hl P_ ((u_int32_t));
@@ -260,7 +261,24 @@ static void
 sound_perror (msg)
      char *msg;
 {
-  error ("%s: %s", msg, strerror (errno));
+  turn_on_atimers (1);
+#ifdef SIGIO
+  sigunblock (sigmask (SIGIO));
+#endif
+  if (errno != 0)
+    error ("%s: %s", msg, strerror (errno));
+  else
+    error ("%s", msg);
+}
+
+
+/* Display a warning message.  */
+
+static void
+sound_warning (msg)
+     char *msg;
+{
+  message (msg);
 }
 
 
@@ -416,12 +434,12 @@ a system-dependent default device name is used.")
       s.fd = openp (Fcons (Vdata_directory, Qnil),
                    attrs[SOUND_FILE], "", &file, 0);
       if (s.fd < 0)
-       sound_perror ("Open sound file");
+       sound_perror ("Could not open sound file");
 
       /* Read the first bytes from the file.  */
       s.header_size = emacs_read (s.fd, s.header, MAX_SOUND_HEADER_BYTES);
       if (s.header_size < 0)
-       sound_perror ("Reading sound file header");
+       sound_perror ("Invalid sound file header");
     }
   else
     {
@@ -632,7 +650,7 @@ wav_play (s, sd)
        sd->write (sd, buffer, nbytes);
 
       if (nbytes < 0)
-       sound_perror ("Reading sound file");
+       sound_perror ("Error reading sound file");
     }
 }
 
@@ -722,7 +740,7 @@ au_play (s, sd)
        sd->write (sd, buffer, nbytes);
       
       if (nbytes < 0)
-       sound_perror ("Reading sound file");
+       sound_perror ("Error reading sound file");
     }
 }
 
@@ -778,21 +796,22 @@ vox_configure (sd)
   val = sd->format;
   if (ioctl (sd->fd, SNDCTL_DSP_SETFMT, &sd->format) < 0
       || val != sd->format)
-    sound_perror ("Set sound format");
+    sound_perror ("Could not set sound format");
 
   val = sd->channels != 1;
   if (ioctl (sd->fd, SNDCTL_DSP_STEREO, &val) < 0
       || val != (sd->channels != 1))
-    sound_perror ("Set stereo/mono");
+    sound_perror ("Could not set stereo/mono");
 
   /* I think bps and sampling_rate are the same, but who knows.
      Check this. and use SND_DSP_SPEED for both.  */
   if (sd->sample_rate > 0)
     {
       val = sd->sample_rate;
-      if (ioctl (sd->fd, SNDCTL_DSP_SPEED, &sd->sample_rate) < 0
-         || val != sd->sample_rate)
-       sound_perror ("Set sound speed");
+      if (ioctl (sd->fd, SNDCTL_DSP_SPEED, &sd->sample_rate) < 0)
+       sound_perror ("Could not set sound speed");
+      else if (val != sd->sample_rate)
+       sound_warning ("Could not set sample rate");
     }
 
   if (sd->volume > 0)
@@ -911,7 +930,7 @@ vox_write (sd, buffer, nbytes)
 {
   int nwritten = emacs_write (sd->fd, buffer, nbytes);
   if (nwritten < 0)
-    sound_perror ("Writing to sound device");
+    sound_perror ("Error writing to sound device");
 }