X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/678fb7066698ebfe3aecba722294025ed26da01b..9d596af370080cba1e67978018d72a836dba008a:/src/sound.c diff --git a/src/sound.c b/src/sound.c index 5fd5bd5c0d..3773047827 100644 --- a/src/sound.c +++ b/src/sound.c @@ -1,5 +1,6 @@ /* sound.c -- sound support. - Copyright (C) 1998-1999, 2001-2012 Free Software Foundation, Inc. + +Copyright (C) 1998-1999, 2001-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -109,26 +110,11 @@ enum sound_attr SOUND_ATTR_SENTINEL }; -#ifdef HAVE_ALSA -static void alsa_sound_perror (const char *, int) NO_RETURN; -#endif -static void sound_perror (const char *) NO_RETURN; -static void sound_warning (const char *); -static int parse_sound (Lisp_Object, Lisp_Object *); - /* END: Common Definitions */ /* BEGIN: Non Windows Definitions */ #ifndef WINDOWSNT -#ifndef DEFAULT_SOUND_DEVICE -#define DEFAULT_SOUND_DEVICE "/dev/dsp" -#endif -#ifndef DEFAULT_ALSA_SOUND_DEVICE -#define DEFAULT_ALSA_SOUND_DEVICE "default" -#endif - - /* Structure forward declarations. */ struct sound; @@ -235,11 +221,11 @@ struct sound_device /* Return a preferred data size in bytes to be sent to write (below) each time. 2048 is used if this is NULL. */ - EMACS_INT (* period_size) (struct sound_device *sd); + ptrdiff_t (* period_size) (struct sound_device *sd); /* Write NYBTES bytes from BUFFER to device SD. */ void (* write) (struct sound_device *sd, const char *buffer, - EMACS_INT nbytes); + ptrdiff_t nbytes); /* A place for devices to store additional data. */ void *data; @@ -291,7 +277,7 @@ static void vox_configure (struct sound_device *); static void vox_close (struct sound_device *sd); static void vox_choose_format (struct sound_device *, struct sound *); static int vox_init (struct sound_device *); -static void vox_write (struct sound_device *, const char *, EMACS_INT); +static void vox_write (struct sound_device *, const char *, ptrdiff_t); static void find_sound_type (struct sound *); static u_int32_t le2hl (u_int32_t); static u_int16_t le2hs (u_int16_t); @@ -323,7 +309,7 @@ static int do_play_sound (const char *, unsigned long); /* Like perror, but signals an error. */ -static void +static _Noreturn void sound_perror (const char *msg) { int saved_errno = errno; @@ -600,11 +586,11 @@ wav_play (struct sound *s, struct sound_device *sd) else { char *buffer; - EMACS_INT nbytes = 0; - EMACS_INT blksize = sd->period_size ? sd->period_size (sd) : 2048; - EMACS_INT data_left = header->data_length; + ptrdiff_t nbytes = 0; + ptrdiff_t blksize = sd->period_size ? sd->period_size (sd) : 2048; + ptrdiff_t data_left = header->data_length; - buffer = (char *) alloca (blksize); + buffer = alloca (blksize); lseek (s->fd, sizeof *header, SEEK_SET); while (data_left > 0 && (nbytes = emacs_read (s->fd, buffer, blksize)) > 0) @@ -690,15 +676,15 @@ au_play (struct sound *s, struct sound_device *sd) SBYTES (s->data) - header->data_offset); else { - EMACS_INT blksize = sd->period_size ? sd->period_size (sd) : 2048; + ptrdiff_t blksize = sd->period_size ? sd->period_size (sd) : 2048; char *buffer; - EMACS_INT nbytes; + ptrdiff_t nbytes; /* Seek */ lseek (s->fd, header->data_offset, SEEK_SET); /* Copy sound data to the device. */ - buffer = (char *) alloca (blksize); + buffer = alloca (blksize); while ((nbytes = emacs_read (s->fd, buffer, blksize)) > 0) sd->write (sd, buffer, nbytes); @@ -724,7 +710,7 @@ vox_open (struct sound_device *sd) { const char *file; - /* Open the sound device. Default is /dev/dsp. */ + /* Open the sound device (eg /dev/dsp). */ if (sd->file) file = sd->file; else @@ -743,7 +729,7 @@ vox_configure (struct sound_device *sd) { int val; - xassert (sd->fd >= 0); + eassert (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 @@ -870,7 +856,7 @@ vox_init (struct sound_device *sd) const char *file; int fd; - /* Open the sound device. Default is /dev/dsp. */ + /* Open the sound device (eg /dev/dsp). */ if (sd->file) file = sd->file; else @@ -895,7 +881,7 @@ vox_init (struct sound_device *sd) /* Write NBYTES bytes from BUFFER to device SD. */ static void -vox_write (struct sound_device *sd, const char *buffer, EMACS_INT nbytes) +vox_write (struct sound_device *sd, const char *buffer, ptrdiff_t nbytes) { if (emacs_write (sd->fd, buffer, nbytes) != nbytes) sound_perror ("Error writing to sound device"); @@ -908,7 +894,11 @@ vox_write (struct sound_device *sd, const char *buffer, EMACS_INT nbytes) /* This driver is available on GNU/Linux. */ -static void +#ifndef DEFAULT_ALSA_SOUND_DEVICE +#define DEFAULT_ALSA_SOUND_DEVICE "default" +#endif + +static _Noreturn void alsa_sound_perror (const char *msg, int err) { error ("%s: %s", msg, snd_strerror (err)); @@ -938,7 +928,7 @@ alsa_open (struct sound_device *sd) else file = DEFAULT_ALSA_SOUND_DEVICE; - p = xmalloc (sizeof (*p)); + p = xmalloc (sizeof *p); p->handle = NULL; p->hwparams = NULL; p->swparams = NULL; @@ -952,7 +942,7 @@ alsa_open (struct sound_device *sd) alsa_sound_perror (file, err); } -static EMACS_INT +static ptrdiff_t alsa_period_size (struct sound_device *sd) { struct alsa_params *p = (struct alsa_params *) sd->data; @@ -968,7 +958,7 @@ alsa_configure (struct sound_device *sd) struct alsa_params *p = (struct alsa_params *) sd->data; snd_pcm_uframes_t buffer_size; - xassert (p->handle != 0); + eassert (p->handle != 0); err = snd_pcm_hw_params_malloc (&p->hwparams); if (err < 0) @@ -1155,13 +1145,13 @@ alsa_choose_format (struct sound_device *sd, struct sound *s) /* Write NBYTES bytes from BUFFER to device SD. */ static void -alsa_write (struct sound_device *sd, const char *buffer, EMACS_INT nbytes) +alsa_write (struct sound_device *sd, const char *buffer, ptrdiff_t nbytes) { struct alsa_params *p = (struct alsa_params *) sd->data; /* The the third parameter to snd_pcm_writei is frames, not bytes. */ int fact = snd_pcm_format_size (sd->format, 1) * sd->channels; - EMACS_INT nwritten = 0; + ptrdiff_t nwritten = 0; int err; while (nwritten < nbytes) @@ -1348,7 +1338,7 @@ Internal use only, use `play-sound' instead. */) (Lisp_Object sound) { Lisp_Object attrs[SOUND_ATTR_SENTINEL]; - int count = SPECPDL_INDEX (); + ptrdiff_t count = SPECPDL_INDEX (); #ifndef WINDOWSNT Lisp_Object file; @@ -1370,12 +1360,10 @@ Internal use only, use `play-sound' instead. */) #ifndef WINDOWSNT file = Qnil; GCPRO2 (sound, file); - current_sound_device = (struct sound_device *) xmalloc (sizeof (struct sound_device)); - memset (current_sound_device, 0, sizeof (struct sound_device)); - current_sound = (struct sound *) xmalloc (sizeof (struct sound)); - memset (current_sound, 0, sizeof (struct sound)); + current_sound_device = xzalloc (sizeof *current_sound_device); + current_sound = xzalloc (sizeof *current_sound); record_unwind_protect (sound_cleanup, Qnil); - current_sound->header = (char *) alloca (MAX_SOUND_HEADER_BYTES); + current_sound->header = alloca (MAX_SOUND_HEADER_BYTES); if (STRINGP (attrs[SOUND_FILE])) { @@ -1407,7 +1395,7 @@ Internal use only, use `play-sound' instead. */) if (STRINGP (attrs[SOUND_DEVICE])) { int len = SCHARS (attrs[SOUND_DEVICE]); - current_sound_device->file = (char *) alloca (len + 1); + current_sound_device->file = alloca (len + 1); strcpy (current_sound_device->file, SSDATA (attrs[SOUND_DEVICE])); } @@ -1439,7 +1427,7 @@ Internal use only, use `play-sound' instead. */) lo_file = Fexpand_file_name (attrs[SOUND_FILE], Qnil); len = XSTRING (lo_file)->size; - psz_file = (char *) alloca (len + 1); + psz_file = alloca (len + 1); strcpy (psz_file, XSTRING (lo_file)->data); if (INTEGERP (attrs[SOUND_VOLUME])) {