Mercurial > hg > xemacs-beta

comparison src/sound.c @ 404:2f8bb876ab1d r21-2-32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-32
author cvs
date Mon, 13 Aug 2007 11:16:07 +0200
parents 74fd4e045ea6
children b8cc9ab3f761
comparison
equal deleted inserted replaced
403:9f011ab08d48 404:2f8bb876ab1d
402 /* Stop executing a keyboard macro. */ 402 /* Stop executing a keyboard macro. */
403 error ("Keyboard macro terminated by a command ringing the bell"); 403 error ("Keyboard macro terminated by a command ringing the bell");
404 404
405 if (d == last_bell_device && now-last_bell_time < bell_inhibit_time) 405 if (d == last_bell_device && now-last_bell_time < bell_inhibit_time)
406 return Qnil; 406 return Qnil;
407 else if (visible_bell && DEVMETH (d, flash, (d))) 407 else if (!NILP (Vvisible_bell) && DEVMETH (d, flash, (d)))
408 ; 408 ;
409 else 409 else
410 Fplay_sound (sound, Qnil, device); 410 Fplay_sound (sound, Qnil, device);
411 411
412 last_bell_time = now; 412 last_bell_time = now;
445 #ifdef HAVE_NAS_SOUND 445 #ifdef HAVE_NAS_SOUND
446 446
447 static void 447 static void
448 init_nas_sound (struct device *d) 448 init_nas_sound (struct device *d)
449 { 449 {
450 char *error;
451
452 #ifdef HAVE_X_WINDOWS 450 #ifdef HAVE_X_WINDOWS
453 if (DEVICE_X_P (d)) 451 if (DEVICE_X_P (d))
454 { 452 {
455 error = nas_init_play (DEVICE_X_DISPLAY (d)); 453 char *err_message = nas_init_play (DEVICE_X_DISPLAY (d));
456 DEVICE_CONNECTED_TO_NAS_P (d) = !error; 454 DEVICE_CONNECTED_TO_NAS_P (d) = !err_message;
457 /* Print out the message? */ 455 /* Print out the message? */
458 } 456 }
459 #endif /* HAVE_X_WINDOWS */ 457 #endif /* HAVE_X_WINDOWS */
460 } 458 }
461 459