[Emacs-diffs] Changes to emacs/src/sound.c

[Pavel Janík]

Index: emacs/src/sound.c
diff -c emacs/src/sound.c:1.23 emacs/src/sound.c:1.24
*** emacs/src/sound.c:1.23      Mon Jan 14 09:37:17 2002
--- emacs/src/sound.c   Fri Apr  5 00:49:20 2002
***************
*** 220,226 ****
  Lisp_Object Qsound;
  Lisp_Object Qplay_sound_functions;
  
! /* These are set during `play-sound' so that sound_cleanup has
     access to them.  */
  
  struct sound_device *current_sound_device;
--- 220,226 ----
  Lisp_Object Qsound;
  Lisp_Object Qplay_sound_functions;
  
! /* These are set during `play-sound-internal' so that sound_cleanup has
     access to them.  */
  
  struct sound_device *current_sound_device;
***************
*** 371,377 ****
  }
  
  
! /* Function installed by play-sound with record_unwind_protect.  */
  
  static Lisp_Object
  sound_cleanup (arg)
--- 371,377 ----
  }
  
  
! /* Function installed by play-sound-internal with record_unwind_protect.  */
  
  static Lisp_Object
  sound_cleanup (arg)
***************
*** 389,412 ****
  }
  
  
! DEFUN ("play-sound", Fplay_sound, Splay_sound, 1, 1, 0,
         doc: /* Play sound SOUND.
- SOUND is a list of the form `(sound KEYWORD VALUE...)'.
- The following keywords are recognized:
  
!   :file FILE - read sound data from FILE.  If FILE isn't an
! absolute file name, it is searched in `data-directory'.
! 
!   :data DATA - read sound data from string DATA.
! 
! Exactly one of :file or :data must be present.
! 
!   :volume VOL - set volume to VOL.  VOL must an integer in the
! range 0..100 or a float in the range 0..1.0.  If not specified,
! don't change the volume setting of the sound device.
! 
!   :device DEVICE - play sound on DEVICE.  If not specified,
! a system-dependent default device name is used.  */)
       (sound)
       Lisp_Object sound;
  {
--- 389,398 ----
  }
  
  
! DEFUN ("play-sound-internal", Fplay_sound_internal, Splay_sound_internal, 1, 
1, 0,
         doc: /* Play sound SOUND.
  
! Internal use only, use `play-sound' instead.  */)
       (sound)
       Lisp_Object sound;
  {
***************
*** 954,960 ****
    Qplay_sound_functions = intern ("play-sound-functions");
    staticpro (&Qplay_sound_functions);
  
!   defsubr (&Splay_sound);
  }
  
  
--- 940,946 ----
    Qplay_sound_functions = intern ("play-sound-functions");
    staticpro (&Qplay_sound_functions);
  
!   defsubr (&Splay_sound_internal);
  }