X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Fsound.c;h=170efbd9ebe28c80df5cb56157dfd75be2d1fb4b;hp=764e147de3aa384f597b538c5fb78982693c04cc;hb=33c8db8e2477d62fd8734f65475f2ed516167532;hpb=cb9f6f4eadc44f1becb32cbbd1db26449e347755 diff --git a/src/sound.c b/src/sound.c index 764e147..170efbd 100644 --- a/src/sound.c +++ b/src/sound.c @@ -69,7 +69,7 @@ DEFUN ("play-sound-file", Fplay_sound_file, 1, 3, "fSound file name: ", /* Play the named sound file on DEVICE's speaker at the specified volume \(0-100, default specified by the `bell-volume' variable). On Unix machines the sound file must be in the Sun/NeXT U-LAW format -except under Linux where WAV files are also supported. On Microsoft +except under Linux where WAV files are also supported. On Microsoft Windows the sound file must be in WAV format. DEVICE defaults to the selected device. */ @@ -326,14 +326,12 @@ Return t if DEVICE is able to play sound. Defaults to selected device. */ (device)) { - struct device *d = decode_device(device); - #ifdef HAVE_NAS_SOUND - if (DEVICE_CONNECTED_TO_NAS_P (d)) + if (DEVICE_CONNECTED_TO_NAS_P (decode_device (device))) return Qt; #endif #ifdef HAVE_NATIVE_SOUND - if (DEVICE_ON_CONSOLE_P (d)) + if (DEVICE_ON_CONSOLE_P (decode_device (device))) return Qt; #endif return Qnil;