X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Fsound.c;h=ec7e9e3f2ae76861df48e01db13aa9d5e4ba095d;hp=4a8786f885d5cc15b5c600baa02c14f47db46b64;hb=566b3d194e2d5c783808ac39437bd7e1a28b1c5c;hpb=afa9772e3fcbb4e80e3e4cfd1a40b4fccc6d08b8 diff --git a/src/sound.c b/src/sound.c index 4a8786f..ec7e9e3 100644 --- a/src/sound.c +++ b/src/sound.c @@ -37,12 +37,11 @@ Boston, MA 02111-1307, USA. */ #include "redisplay.h" #include "sysdep.h" -#ifdef HAVE_UNISTD_H -#include -#endif +#include "sysfile.h" #ifdef HAVE_NATIVE_SOUND -# include +# include "sysproc.h" +# include "nativesound.h" #endif #ifdef HAVE_ESD_SOUND @@ -51,18 +50,13 @@ 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 -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 Q_volume, Q_pitch, Q_duration, Q_sound; -/* These are defined in the appropriate file (sunplay.c, sgiplay.c, - or hpplay.c). */ - -extern void play_sound_file (char *name, int volume); -extern void play_sound_data (unsigned char *data, int length, int volume); #ifdef HAVE_NAS_SOUND extern int nas_play_sound_file (char *name, int volume); @@ -126,7 +120,7 @@ Windows the sound file must be in WAV format. { char *fileext; - GET_C_STRING_FILENAME_DATA_ALLOCA (file, fileext); + 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; @@ -137,9 +131,15 @@ Windows the sound file must be in WAV format. if (DEVICE_CONNECTED_TO_ESD_P (d)) { char *fileext; + int result; + + LISP_STRING_TO_EXTERNAL (file, fileext, Qfile_name); - GET_C_STRING_FILENAME_DATA_ALLOCA (file, fileext); - if (esd_play_sound_file (fileext, vol)) + /* #### ESD uses alarm(). But why should we also stop SIGIO? */ + stop_interrupts (); + result = esd_play_sound_file (fileext, vol); + start_interrupts (); + if (result) return Qnil; } #endif /* HAVE_ESD_SOUND */ @@ -147,9 +147,9 @@ Windows the sound file must be in WAV format. #ifdef HAVE_NATIVE_SOUND if (NILP (Vnative_sound_only_on_console) || DEVICE_ON_CONSOLE_P (d)) { - CONST char *fileext; + const char *fileext; - GET_C_STRING_FILENAME_DATA_ALLOCA (file, fileext); + LISP_STRING_TO_EXTERNAL (file, fileext, Qfile_name); /* The sound code doesn't like getting SIGIO interrupts. Unix sucks! */ stop_interrupts (); @@ -311,10 +311,12 @@ See the variable `sound-alist'. #ifdef HAVE_NAS_SOUND if (DEVICE_CONNECTED_TO_NAS_P (d) && STRINGP (sound)) { - CONST Extbyte *soundext; + const Extbyte *soundext; Extcount soundextlen; - GET_STRING_BINARY_DATA_ALLOCA (sound, soundext, soundextlen); + TO_EXTERNAL_FORMAT (LISP_STRING, sound, + ALLOCA, (soundext, soundextlen), + Qbinary); if (nas_play_sound_data ((unsigned char*)soundext, soundextlen, vol)) return Qnil; } @@ -325,10 +327,18 @@ See the variable `sound-alist'. { Extbyte *soundext; Extcount soundextlen; + int succes; - GET_STRING_BINARY_DATA_ALLOCA (sound, soundext, soundextlen); - if (esd_play_sound_data (soundext, soundextlen, vol)) - return Qnil; + TO_EXTERNAL_FORMAT (LISP_STRING, sound, ALLOCA, (soundext, soundextlen), + Qbinary); + + /* #### ESD uses alarm(). But why should we also stop SIGIO? */ + stop_interrupts (); + succes = esd_play_sound_data ((unsigned char *) soundext, soundextlen, vol); + start_interrupts (); + QUIT; + if(succes) + return Qnil; } #endif /* HAVE_ESD_SOUND */ @@ -336,16 +346,20 @@ See the variable `sound-alist'. if ((NILP (Vnative_sound_only_on_console) || DEVICE_ON_CONSOLE_P (d)) && STRINGP (sound)) { - CONST Extbyte *soundext; + const Extbyte *soundext; Extcount soundextlen; + int succes; - GET_STRING_BINARY_DATA_ALLOCA (sound, soundext, soundextlen); + TO_EXTERNAL_FORMAT (LISP_STRING, sound, + ALLOCA, (soundext, soundextlen), + Qbinary); /* The sound code doesn't like getting SIGIO interrupts. Unix sucks! */ stop_interrupts (); - play_sound_data ((unsigned char*)soundext, soundextlen, vol); + succes = play_sound_data ((unsigned char*)soundext, soundextlen, vol); start_interrupts (); QUIT; - return Qnil; + if (succes) + return Qnil; } #endif /* HAVE_NATIVE_SOUND */ @@ -379,8 +393,8 @@ device). */ (arg, sound, device)) { - static time_t last_bell_time = (time_t) 0; - static struct device *last_bell_device = (struct device*) 0; + static time_t last_bell_time; + static struct device *last_bell_device; time_t now; struct device *d = decode_device (device); @@ -393,7 +407,7 @@ device). if (d == last_bell_device && now-last_bell_time < bell_inhibit_time) return Qnil; - else if (visible_bell && DEVMETH (d, flash, (d))) + else if (!NILP (Vvisible_bell) && DEVMETH (d, flash, (d))) ; else Fplay_sound (sound, Qnil, device); @@ -436,13 +450,11 @@ Return t if connected to NAS server for sounds on DEVICE. static void init_nas_sound (struct device *d) { - char *error; - #ifdef HAVE_X_WINDOWS if (DEVICE_X_P (d)) { - error = nas_init_play (DEVICE_X_DISPLAY (d)); - DEVICE_CONNECTED_TO_NAS_P (d) = !error; + char *err_message = nas_init_play (DEVICE_X_DISPLAY (d)); + DEVICE_CONNECTED_TO_NAS_P (d) = !err_message; /* Print out the message? */ } #endif /* HAVE_X_WINDOWS */ @@ -455,7 +467,7 @@ init_nas_sound (struct device *d) static void init_native_sound (struct device *d) { - if (DEVICE_TTY_P (d) || DEVICE_STREAM_P (d) || DEVICE_MSWINDOWS_P(d)) + if (!(DEVICE_X_P(d) || DEVICE_GTK_P(d))) DEVICE_ON_CONSOLE_P (d) = 1; #ifdef HAVE_X_WINDOWS else @@ -505,7 +517,7 @@ init_native_sound (struct device *d) DEVICE_ON_CONSOLE_P (d) = 0; else { - char hn [255]; + char *hn = alloca_array (char, strlen (h->h_name) + 1); struct hostent *l; strcpy (hn, h->h_name); l = gethostbyname (localname); @@ -562,6 +574,9 @@ vars_of_sound (void) #ifdef HAVE_NAS_SOUND Fprovide (intern ("nas-sound")); #endif +#ifdef HAVE_ESD_SOUND + Fprovide (intern ("esd-sound")); +#endif DEFVAR_INT ("bell-volume", &bell_volume /* *How loud to be, from 0 to 100. @@ -631,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. -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.