comparison src/sound.c @ 38215:b9fdde642b13

(vox_configure, vox_close): Turn off atimers around ioctls.

38214:a4de79556592

#include <fcntl.h>
#include <unistd.h>
#include <sys/types.h>
#include <dispextern.h>
#include <errno.h>

/* FreeBSD has machine/soundcard.h.  Voxware sound driver docs mention
   sys/soundcard.h.  So, let's try whatever's there.  */

#ifdef HAVE_MACHINE_SOUNDCARD_H

  if (STRINGP (attrs[SOUND_FILE]))
    {
      /* Open the sound file.  */
      s.fd = openp (Fcons (Vdata_directory, Qnil),
		     attrs[SOUND_FILE], "", &file, 0);
      if (s.fd < 0)
	sound_perror ("Open sound file");

      /* Read the first bytes from the file.  */
      s.header_size = emacs_read (s.fd, s.header, MAX_SOUND_HEADER_BYTES);

{
  int val;
  
  xassert (sd->fd >= 0);

  val = sd->format;
  if (ioctl (sd->fd, SNDCTL_DSP_SETFMT, &sd->format) < 0
      || val != sd->format)
    sound_perror ("Set sound format");

      int volume = sd->volume & 0xff;
      volume |= volume << 8;
      /* This may fail if there is no mixer.  Ignore the failure.  */
      ioctl (sd->fd, SOUND_MIXER_WRITE_PCM, &volume);
    }
}


/* Close device SD if it is open.  */

     struct sound_device *sd;
{
  if (sd->fd >= 0)
    {
      /* Flush sound data, and reset the device.  */
      ioctl (sd->fd, SNDCTL_DSP_SYNC, NULL);

      /* Close the device.  */
      emacs_close (sd->fd);
      sd->fd = -1;
    }

38215:b9fdde642b13

#include <fcntl.h>
#include <unistd.h>
#include <sys/types.h>
#include <dispextern.h>
#include <errno.h>
#include <atimer.h>

/* FreeBSD has machine/soundcard.h.  Voxware sound driver docs mention
   sys/soundcard.h.  So, let's try whatever's there.  */

#ifdef HAVE_MACHINE_SOUNDCARD_H

  if (STRINGP (attrs[SOUND_FILE]))
    {
      /* Open the sound file.  */
      s.fd = openp (Fcons (Vdata_directory, Qnil),
		    attrs[SOUND_FILE], "", &file, 0);
      if (s.fd < 0)
	sound_perror ("Open sound file");

      /* Read the first bytes from the file.  */
      s.header_size = emacs_read (s.fd, s.header, MAX_SOUND_HEADER_BYTES);

{
  int val;
  
  xassert (sd->fd >= 0);

  turn_on_atimers (0);

  val = sd->format;
  if (ioctl (sd->fd, SNDCTL_DSP_SETFMT, &sd->format) < 0
      || val != sd->format)
    sound_perror ("Set sound format");

      int volume = sd->volume & 0xff;
      volume |= volume << 8;
      /* This may fail if there is no mixer.  Ignore the failure.  */
      ioctl (sd->fd, SOUND_MIXER_WRITE_PCM, &volume);
    }
  
  turn_on_atimers (1);
}


/* Close device SD if it is open.  */

     struct sound_device *sd;
{
  if (sd->fd >= 0)
    {
      /* Flush sound data, and reset the device.  */
      turn_on_atimers (0);
      ioctl (sd->fd, SNDCTL_DSP_SYNC, NULL);
      turn_on_atimers (1);

      /* Close the device.  */
      emacs_close (sd->fd);
      sd->fd = -1;
    }