procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(toplevel): Include <signal.h> and "syssignal.h".

Browse source 
(vox_configure, vox_close) [SIGIO]: Block/unblock SIGIO
around ioctls.
This commit is contained in:
Gerd Moellmann 2001-07-09 17:15:48 +00:00
parent 4033ae9d51
commit bb6e8cee92
2 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2001-07-09 Gerd Moellmann <gerd@gnu.org>
* sound.c (toplevel): Include <signal.h> and "syssignal.h".
(vox_configure, vox_close) [SIGIO]: Block/unblock SIGIO
around ioctls.
2001-07-06 Eli Zaretskii <eliz@is.elta.co.il>
* dosfns.c (syms_of_dosfns): Add \n\ at the end of a line in the

24
src/sound.c
View file

@ -32,6 +32,8 @@ Boston, MA 02111-1307, USA. */
#include "lisp.h"
#include "dispextern.h"
#include "atimer.h"
#include <signal.h>
#include "syssignal.h"
/* FreeBSD has machine/soundcard.h. Voxware sound driver docs mention
sys/soundcard.h. So, let's try whatever's there. */
@ -765,7 +767,13 @@ vox_configure (sd)
xassert (sd->fd >= 0);
/* On GNU/Linux, it seems that the device driver doesn't like to be
interrupted by a signal. Block the ones we know to cause
troubles. */
turn_on_atimers (0);
#ifdef SIGIO
sigblock (sigmask (SIGIO));
#endif
val = sd->format;
if (ioctl (sd->fd, SNDCTL_DSP_SETFMT, &sd->format) < 0
@ -796,6 +804,9 @@ vox_configure (sd)
}
turn_on_atimers (1);
#ifdef SIGIO
sigunblock (sigmask (SIGIO));
#endif
}
@ -807,10 +818,21 @@ vox_close (sd)
{
if (sd->fd >= 0)
{
/* Flush sound data, and reset the device. */
/* On GNU/Linux, it seems that the device driver doesn't like to
be interrupted by a signal. Block the ones we know to cause
troubles. */
#ifdef SIGIO
sigblock (sigmask (SIGIO));
#endif
turn_on_atimers (0);
/* Flush sound data, and reset the device. */
ioctl (sd->fd, SNDCTL_DSP_SYNC, NULL);
turn_on_atimers (1);
#ifdef SIGIO
sigunblock (sigmask (SIGIO));
#endif
/* Close the device. */
emacs_close (sd->fd);