#ifdef HAVE_NATIVE_SOUND
if (NILP (Vnative_sound_only_on_console) || DEVICE_ON_CONSOLE_P (d))
{
- CONST char *fileext;
+ const char *fileext;
TO_EXTERNAL_FORMAT (LISP_STRING, file,
C_STRING_ALLOCA, fileext,
#ifdef HAVE_NAS_SOUND
if (DEVICE_CONNECTED_TO_NAS_P (d) && STRINGP (sound))
{
- CONST Extbyte *soundext;
+ const Extbyte *soundext;
Extcount soundextlen;
TO_EXTERNAL_FORMAT (LISP_STRING, sound,
if ((NILP (Vnative_sound_only_on_console) || DEVICE_ON_CONSOLE_P (d))
&& STRINGP (sound))
{
- CONST Extbyte *soundext;
+ const Extbyte *soundext;
Extcount soundextlen;
TO_EXTERNAL_FORMAT (LISP_STRING, sound,
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);
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 */