diff src/sound.c @ 70:131b0175ea99 r20-0b30

Import from CVS: tag r20-0b30
author cvs
date Mon, 13 Aug 2007 09:02:59 +0200
parents 8d2a9b52c682
children 9f59509498e1
line wrap: on
line diff
--- a/src/sound.c	Mon Aug 13 09:00:04 2007 +0200
+++ b/src/sound.c	Mon Aug 13 09:02:59 2007 +0200
@@ -73,15 +73,13 @@
 where WAV files are also supported.
   DEVICE defaults to the selected device.
 */
-       (file, volume, device))
+     (file, volume, device))
 {
-  /* This function can call lisp */
+  /* This function can GC */
   int vol;
 #if defined (HAVE_NATIVE_SOUND) || defined (HAVE_NAS_SOUND)
   struct device *d = decode_device (device);
 #endif
-  struct gcpro gcpro1;
-
   CHECK_STRING (file);
   if (NILP (volume))
     vol = bell_volume;
@@ -91,14 +89,12 @@
       vol = XINT (volume);
     }
 
-  GCPRO1 (file);
   file = Fexpand_file_name (file, Qnil);
   if (NILP (Ffile_readable_p (file)))
     if (NILP (Ffile_exists_p (file)))
       error ("file does not exist.");
     else
       error ("file is unreadable.");
-  UNGCPRO;
 
 #ifdef HAVE_NAS_SOUND
   if (DEVICE_CONNECTED_TO_NAS_P (d))
@@ -355,6 +351,7 @@
 Wait for all sounds to finish playing on DEVICE.
 */
        (device))
+
 {
 #ifdef HAVE_NAS_SOUND
   struct device *d = decode_device (device);