(vox_configure): Set volume for left and right channel.

(sound_cleanup): Return nil.

diff --git a/src/ChangeLog b/src/ChangeLog
index 1d6b3cec057c9af84f47bc1b7baf036a6b41e803..1278056121e913894db31dfa7a9c0e42fb0e59f1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-12-06  Gerd Moellmann  <gerd@gnu.org>
 
+       * sound.c (vox_configure): Set volume for left and right channel.
+       (sound_cleanup): Return nil.
+
        * xdisp.c (move_it_by_lines): Fix paren typo.
 
        * xterm.c (x_load_font): Don't use the font's max_bounds for

diff --git a/src/sound.c b/src/sound.c
index 521f1fdce68832fe912760db5c77e2ed23bdd2b3..fc3adbdba6b3b29c58c9eb83fad19fc4b0b2e593 100644 (file)
--- a/src/sound.c
+++ b/src/sound.c
@@ -360,6 +360,8 @@ sound_cleanup (arg)
       if (current_sound->fd > 0)
        emacs_close (current_sound->fd);
     }
+
+  return Qnil;
 }
 
 
@@ -787,9 +789,13 @@ vox_configure (sd)
       && ioctl (sd->fd, SNDCTL_DSP_STEREO, &sd->channels) < 0)
     sound_perror ("Setting channels");
 
-  if (sd->volume > 0
-      && ioctl (sd->fd, SOUND_MIXER_WRITE_PCM, &sd->volume) < 0)
-    sound_perror ("Setting volume");
+  if (sd->volume > 0)
+    {
+      int volume = sd->volume & 0xff;
+      volume |= volume << 8;
+      if (ioctl (sd->fd, SOUND_MIXER_WRITE_PCM, &volume) < 0)
+       sound_perror ("Setting volume");
+    }
 }