/* sound.c -- sound support.
Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004,
- 2005, 2006 Free Software Foundation, Inc.
+ 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This file is part of GNU Emacs.
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Written by Gerd Moellmann <gerd@gnu.org>. Tested with Luigi's
driver on FreeBSD 2.2.7 with a SoundBlaster 16. */
#endif /* WINDOWSNT */
/* BEGIN: Common Definitions */
-#define abs(X) ((X) < 0 ? -(X) : (X))
/* Symbols. */
char *buffer;
int nbytes;
int blksize = sd->period_size ? sd->period_size (sd) : 2048;
+ int data_left = header->data_length;
buffer = (char *) alloca (blksize);
lseek (s->fd, sizeof *header, SEEK_SET);
-
- while ((nbytes = emacs_read (s->fd, buffer, blksize)) > 0)
- sd->write (sd, buffer, nbytes);
+ while (data_left > 0
+ && (nbytes = emacs_read (s->fd, buffer, blksize)) > 0)
+ {
+ /* Don't play possible garbage at the end of file */
+ if (data_left < nbytes) nbytes = data_left;
+ data_left -= nbytes;
+ sd->write (sd, buffer, nbytes);
+ }
if (nbytes < 0)
sound_perror ("Error reading sound file");
struct sound_device *sd;
{
struct alsa_params *p = (struct alsa_params *) sd->data;
- return p->period_size;
+ int fact = snd_pcm_format_size (sd->format, 1) * sd->channels;
+ return p->period_size * (fact > 0 ? fact : 1);
}
static void
{
if (snd_mixer_selem_has_playback_volume (e))
{
- long pmin, pmax;
+ long pmin, pmax, vol;
snd_mixer_selem_get_playback_volume_range (e, &pmin, &pmax);
- long vol = pmin + (sd->volume * (pmax - pmin)) / 100;
+ vol = pmin + (sd->volume * (pmax - pmin)) / 100;
for (chn = 0; chn <= SND_MIXER_SCHN_LAST; chn++)
snd_mixer_selem_set_playback_volume (e, chn, vol);
while (nwritten < nbytes)
{
- err = snd_pcm_writei (p->handle,
- buffer + nwritten,
- (nbytes - nwritten)/fact);
+ snd_pcm_uframes_t frames = (nbytes - nwritten)/fact;
+ if (frames == 0) break;
+
+ err = snd_pcm_writei (p->handle, buffer + nwritten, frames);
if (err < 0)
{
if (err == -EPIPE)