diff options
| author | Pavel Janík | 2002-04-05 05:49:20 +0000 |
|---|---|---|
| committer | Pavel Janík | 2002-04-05 05:49:20 +0000 |
| commit | 14e415e7eea3e8c6b39f1126f6dce2ee8f91b28f (patch) | |
| tree | 822c11fa9648cd731a3e8641ba1283c539b2ceab | |
| parent | ec4ba9e3bcde66ce8583c8cf531371127fa80a37 (diff) | |
| download | emacs-14e415e7eea3e8c6b39f1126f6dce2ee8f91b28f.tar.gz emacs-14e415e7eea3e8c6b39f1126f6dce2ee8f91b28f.zip | |
(Fplay_sound_internal): Renamed from Fplay_sound.
Doc fix to reflect it.
| -rw-r--r-- | src/sound.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/src/sound.c b/src/sound.c index eaa70204daf..aa2e27dbfcc 100644 --- a/src/sound.c +++ b/src/sound.c | |||
| @@ -220,7 +220,7 @@ Lisp_Object QCvolume, QCdevice; | |||
| 220 | Lisp_Object Qsound; | 220 | Lisp_Object Qsound; |
| 221 | Lisp_Object Qplay_sound_functions; | 221 | Lisp_Object Qplay_sound_functions; |
| 222 | 222 | ||
| 223 | /* These are set during `play-sound' so that sound_cleanup has | 223 | /* These are set during `play-sound-internal' so that sound_cleanup has |
| 224 | access to them. */ | 224 | access to them. */ |
| 225 | 225 | ||
| 226 | struct sound_device *current_sound_device; | 226 | struct sound_device *current_sound_device; |
| @@ -371,7 +371,7 @@ find_sound_type (s) | |||
| 371 | } | 371 | } |
| 372 | 372 | ||
| 373 | 373 | ||
| 374 | /* Function installed by play-sound with record_unwind_protect. */ | 374 | /* Function installed by play-sound-internal with record_unwind_protect. */ |
| 375 | 375 | ||
| 376 | static Lisp_Object | 376 | static Lisp_Object |
| 377 | sound_cleanup (arg) | 377 | sound_cleanup (arg) |
| @@ -389,24 +389,10 @@ sound_cleanup (arg) | |||
| 389 | } | 389 | } |
| 390 | 390 | ||
| 391 | 391 | ||
| 392 | DEFUN ("play-sound", Fplay_sound, Splay_sound, 1, 1, 0, | 392 | DEFUN ("play-sound-internal", Fplay_sound_internal, Splay_sound_internal, 1, 1, 0, |
| 393 | doc: /* Play sound SOUND. | 393 | doc: /* Play sound SOUND. |
| 394 | SOUND is a list of the form `(sound KEYWORD VALUE...)'. | ||
| 395 | The following keywords are recognized: | ||
| 396 | 394 | ||
| 397 | :file FILE - read sound data from FILE. If FILE isn't an | 395 | Internal use only, use `play-sound' instead. */) |
| 398 | absolute file name, it is searched in `data-directory'. | ||
| 399 | |||
| 400 | :data DATA - read sound data from string DATA. | ||
| 401 | |||
| 402 | Exactly one of :file or :data must be present. | ||
| 403 | |||
| 404 | :volume VOL - set volume to VOL. VOL must an integer in the | ||
| 405 | range 0..100 or a float in the range 0..1.0. If not specified, | ||
| 406 | don't change the volume setting of the sound device. | ||
| 407 | |||
| 408 | :device DEVICE - play sound on DEVICE. If not specified, | ||
| 409 | a system-dependent default device name is used. */) | ||
| 410 | (sound) | 396 | (sound) |
| 411 | Lisp_Object sound; | 397 | Lisp_Object sound; |
| 412 | { | 398 | { |
| @@ -954,7 +940,7 @@ syms_of_sound () | |||
| 954 | Qplay_sound_functions = intern ("play-sound-functions"); | 940 | Qplay_sound_functions = intern ("play-sound-functions"); |
| 955 | staticpro (&Qplay_sound_functions); | 941 | staticpro (&Qplay_sound_functions); |
| 956 | 942 | ||
| 957 | defsubr (&Splay_sound); | 943 | defsubr (&Splay_sound_internal); |
| 958 | } | 944 | } |
| 959 | 945 | ||
| 960 | 946 | ||