(w32_init_fringe, mac_init_fringe): Add rif argument.

[gnu-emacs] / src / sound.c

diff --git a/src/sound.c b/src/sound.c
index b6f5ff513eeba9a9e7b0b1033f069e58681fac59..8b1bda8d6eff4056c25adad0acbdaddb0d9fded0 100644 (file)
--- a/src/sound.c
+++ b/src/sound.c
@@ -1,12 +1,12 @@
 /* sound.c -- sound support.
    Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004,
 /* sound.c -- sound support.
    Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004,

-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.

 
 This file is part of GNU Emacs.
 
 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
 
 This file is part of GNU Emacs.
 
 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)
+the Free Software Foundation; either version 3, or (at your option)

 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -621,12 +621,18 @@ wav_play (s, sd)
       char *buffer;
       int nbytes;
       int blksize = sd->period_size ? sd->period_size (sd) : 2048;
       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);
 
       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");
 
       if (nbytes < 0)
        sound_perror ("Error reading sound file");


@@ -986,7 +992,8 @@ alsa_period_size (sd)
        struct sound_device *sd;
 {
   struct alsa_params *p = (struct alsa_params *) sd->data;
        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
 }
 
 static void


@@ -1209,9 +1216,10 @@ alsa_write (sd, buffer, nbytes)
 
   while (nwritten < nbytes)
     {
 
   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)
       if (err < 0)
         {
           if (err == -EPIPE)