X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fsound.c;h=170efbd9ebe28c80df5cb56157dfd75be2d1fb4b;hb=6797bde39c52203650064ef8e079af5a9c5f124a;hp=fa52599c858181a4fccd08764a81f8bb88fb1033;hpb=77dcef404dc78635f6ffa8f71a803d2bc7cc8921;p=chise%2Fxemacs-chise.git-

diff --git a/src/sound.c b/src/sound.c
index fa52599..170efbd 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -68,8 +68,9 @@ Lisp_Object Qnas;
 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).
-The sound file must be in the Sun/NeXT U-LAW format except under Linux
-where WAV files are also supported.
+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
+Windows the sound file must be in WAV format.
   DEVICE defaults to the selected device.
 */
      (file, volume, device))
@@ -325,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;