Mercurial > emacs
diff src/sound.c @ 83560:738ce3540ffb
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-660
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-661
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-662
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-663
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-664
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-665
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-666
Fix read-only prompt problem in isearch
* emacs@sv.gnu.org/emacs--devo--0--patch-667
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-668
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-669
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-670
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-671
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-672
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-673
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-206
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-207
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-208
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-600
| author | Karoly Lorentey <karoly@lorentey.hu> |
|---|---|
| date | Sun, 22 Apr 2007 12:12:29 +0000 |
| parents | ebfc3239385f |
| children | 922696f363b0 91bf6e05918b |
line wrap: on
line diff
--- a/src/sound.c Sun Apr 22 11:42:03 2007 +0000 +++ b/src/sound.c Sun Apr 22 12:12:29 2007 +0000 @@ -621,12 +621,18 @@ 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"); @@ -986,7 +992,8 @@ 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 @@ -1209,9 +1216,10 @@ 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)