Mercurial > emacs

changeset 25548:df6548ca33fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Qplay_sound_functions): Replaces Qplay_sound_hook. (Fplay_sound, syms_of_sound): Use it. (parse_sound): Allow float volume values in the range [0, 1]. (Fplay_sound): Ditto.
author Gerd Moellmann <gerd@gnu.org>
date Sun, 05 Sep 1999 21:22:45 +0000
parents 2992a7953ac4
children 63deb587dce1
files src/sound.c
diffstat 1 files changed, 21 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/sound.c	Sun Sep 05 19:44:45 1999 +0000
+++ b/src/sound.c	Sun Sep 05 21:22:45 1999 +0000
@@ -198,7 +198,7 @@
 extern Lisp_Object QCfile;
 Lisp_Object QCvolume, QCdevice;
 Lisp_Object Qsound;
-Lisp_Object Qplay_sound_hook;
+Lisp_Object Qplay_sound_functions;
 
 /* These are set during `play-sound' so that sound_cleanup has
    access to them.  */
@@ -260,7 +260,8 @@
 
    - `:volume VOL'
 
-   VOL must be an integer in the range 0..100.  */
+   VOL must be an integer in the range [0, 100], or a float in the
+   range [0, 1].  */
 
 static int
 parse_sound (sound, attrs)
@@ -283,10 +284,19 @@
   /* Volume must be in the range 0..100 or unspecified.  */
   if (!NILP (attrs[SOUND_VOLUME]))
     {
-      if (!INTEGERP (attrs[SOUND_VOLUME]))
-	return 0;
-      if (XINT (attrs[SOUND_VOLUME]) < 0
-	  || XINT (attrs[SOUND_VOLUME]) > 100)
+      if (INTEGERP (attrs[SOUND_VOLUME]))
+	{
+	  if (XINT (attrs[SOUND_VOLUME]) < 0
+	      || XINT (attrs[SOUND_VOLUME]) > 100)
+	    return 0;
+	}
+      else if (FLOATP (attrs[SOUND_VOLUME]))
+	{
+	  if (XFLOAT_DATA (attrs[SOUND_VOLUME]) < 0
+	      || XFLOAT_DATA (attrs[SOUND_VOLUME]) > 1)
+	    return 0;
+	}
+      else
 	return 0;
     }
 
@@ -383,8 +393,10 @@
     }
   if (INTEGERP (attrs[SOUND_VOLUME]))
     sd.volume = XFASTINT (attrs[SOUND_VOLUME]);
+  else if (FLOATP (attrs[SOUND_VOLUME]))
+    sd.volume = XFLOAT_DATA (attrs[SOUND_VOLUME]) * 100;
 
-  args[0] = Qplay_sound_hook;
+  args[0] = Qplay_sound_functions;
   args[1] = sound;
   Frun_hook_with_args (make_number (2), args);
 
@@ -809,8 +821,8 @@
   staticpro (&QCvolume);
   Qsound = intern ("sound");
   staticpro (&Qsound);
-  Qplay_sound_hook = intern ("play-sound-hook");
-  staticpro (&Qplay_sound_hook);
+  Qplay_sound_functions = intern ("play-sound-functions");
+  staticpro (&Qplay_sound_functions);
 
   defsubr (&Splay_sound);
 }