projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(Vutf_2000_version): New variable [moved from chartab.c].
[chise/xemacs-chise.git-]
/
src
/
sound.c
diff --git
a/src/sound.c
b/src/sound.c
index
550254e
..
acb272b
100644
(file)
--- a/
src/sound.c
+++ b/
src/sound.c
@@
-50,8
+50,8
@@
extern int esd_play_sound_data (unsigned char *data, size_t length, int vol);
# define DEVICE_CONNECTED_TO_ESD_P(x) 1 /* FIXME: better check */
#endif
# define DEVICE_CONNECTED_TO_ESD_P(x) 1 /* FIXME: better check */
#endif
-int bell_volume;
-int bell_inhibit_time;
+Fixnum bell_volume;
+Fixnum bell_inhibit_time;
Lisp_Object Vsound_alist;
Lisp_Object Vsynchronous_sounds;
Lisp_Object Vnative_sound_only_on_console;
Lisp_Object Vsound_alist;
Lisp_Object Vsynchronous_sounds;
Lisp_Object Vnative_sound_only_on_console;
@@
-120,9
+120,7
@@
Windows the sound file must be in WAV format.
{
char *fileext;
{
char *fileext;
- TO_EXTERNAL_FORMAT (LISP_STRING, file,
- C_STRING_ALLOCA, fileext,
- Qfile_name);
+ LISP_STRING_TO_EXTERNAL (file, fileext, Qfile_name);
/* #### NAS code should allow specification of a device. */
if (nas_play_sound_file (fileext, vol))
return Qnil;
/* #### NAS code should allow specification of a device. */
if (nas_play_sound_file (fileext, vol))
return Qnil;
@@
-135,9
+133,7
@@
Windows the sound file must be in WAV format.
char *fileext;
int result;
char *fileext;
int result;
- TO_EXTERNAL_FORMAT (LISP_STRING, file,
- C_STRING_ALLOCA, fileext,
- Qfile_name);
+ LISP_STRING_TO_EXTERNAL (file, fileext, Qfile_name);
/* #### ESD uses alarm(). But why should we also stop SIGIO? */
stop_interrupts ();
/* #### ESD uses alarm(). But why should we also stop SIGIO? */
stop_interrupts ();
@@
-153,9
+149,7
@@
Windows the sound file must be in WAV format.
{
const char *fileext;
{
const char *fileext;
- TO_EXTERNAL_FORMAT (LISP_STRING, file,
- C_STRING_ALLOCA, fileext,
- Qfile_name);
+ LISP_STRING_TO_EXTERNAL (file, fileext, Qfile_name);
/* The sound code doesn't like getting SIGIO interrupts.
Unix sucks! */
stop_interrupts ();
/* The sound code doesn't like getting SIGIO interrupts.
Unix sucks! */
stop_interrupts ();
@@
-340,7
+334,7
@@
See the variable `sound-alist'.
/* #### ESD uses alarm(). But why should we also stop SIGIO? */
stop_interrupts ();
/* #### ESD uses alarm(). But why should we also stop SIGIO? */
stop_interrupts ();
- succes = esd_play_sound_data (soundext, soundextlen, vol);
+ succes = esd_play_sound_data ((unsigned char *) soundext, soundextlen, vol);
start_interrupts ();
QUIT;
if(succes)
start_interrupts ();
QUIT;
if(succes)
@@
-652,7
+646,7
@@
of sounds. Otherwise, sounds are always played synchronously.
DEFVAR_LISP ("native-sound-only-on-console", &Vnative_sound_only_on_console /*
Non-nil value means play sounds only if XEmacs is running
on the system console.
DEFVAR_LISP ("native-sound-only-on-console", &Vnative_sound_only_on_console /*
Non-nil value means play sounds only if XEmacs is running
on the system console.
-Nil means always always play sounds, even if running on a non-console tty
+Nil means always play sounds, even if running on a non-console tty
or a secondary X display.
This variable only applies to native sound support.
or a secondary X display.
This variable only applies to native sound support.