/* sound.c -- sound support.
Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007 Free Software Foundation, Inc.
+ 2005, 2006, 2007, 2008, 2009 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. */
#include <unistd.h>
#include <sys/types.h>
#include <errno.h>
+#include <setjmp.h>
#include "lisp.h"
#include "dispextern.h"
#include "atimer.h"
#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 (err < 0)
alsa_sound_perror ("Unable to set avail min for playback", err);
- /* Align all transfers to 1 period */
- err = snd_pcm_sw_params_set_xfer_align (p->handle, p->swparams,
- p->period_size);
- if (err < 0)
- alsa_sound_perror ("Unable to set transfer align for playback", err);
-
err = snd_pcm_sw_params (p->handle, p->swparams);
if (err < 0)
alsa_sound_perror ("Unable to set sw params for playback\n", err);
{
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)
/* BEGIN: Windows specific functions */
+#define SOUND_WARNING(fun, error, text) \
+ { \
+ char buf[1024]; \
+ char err_string[MAXERRORLENGTH]; \
+ fun (error, err_string, sizeof (err_string)); \
+ _snprintf (buf, sizeof (buf), "%s\nError: %s", \
+ text, err_string); \
+ sound_warning (buf); \
+ }
+
static int
do_play_sound (psz_file, ui_volume)
const char *psz_file;
unsigned long ui_volume_org = 0;
BOOL b_reset_volume = FALSE;
- memset (sz_cmd_buf, 0, sizeof(sz_cmd_buf));
- memset (sz_ret_buf, 0, sizeof(sz_ret_buf));
+ memset (sz_cmd_buf, 0, sizeof (sz_cmd_buf));
+ memset (sz_ret_buf, 0, sizeof (sz_ret_buf));
sprintf (sz_cmd_buf,
"open \"%s\" alias GNUEmacs_PlaySound_Device wait",
psz_file);
- mci_error = mciSendString (sz_cmd_buf, sz_ret_buf, 520, NULL);
+ mci_error = mciSendString (sz_cmd_buf, sz_ret_buf, sizeof (sz_ret_buf), NULL);
if (mci_error != 0)
{
- sound_warning ("The open mciSendString command failed to open\n"
- "the specified sound file");
+ SOUND_WARNING (mciGetErrorString, mci_error,
+ "The open mciSendString command failed to open "
+ "the specified sound file.");
i_result = (int) mci_error;
return i_result;
}
{
b_reset_volume = TRUE;
mm_result = waveOutSetVolume ((HWAVEOUT) WAVE_MAPPER, ui_volume);
- if ( mm_result != MMSYSERR_NOERROR)
+ if (mm_result != MMSYSERR_NOERROR)
{
- sound_warning ("waveOutSetVolume failed to set the volume level\n"
- "of the WAVE_MAPPER device.\n"
- "As a result, the user selected volume level will\n"
- "not be used.");
+ SOUND_WARNING (waveOutGetErrorText, mm_result,
+ "waveOutSetVolume failed to set the volume level "
+ "of the WAVE_MAPPER device.\n"
+ "As a result, the user selected volume level will "
+ "not be used.");
}
}
else
{
- sound_warning ("waveOutGetVolume failed to obtain the original\n"
+ SOUND_WARNING (waveOutGetErrorText, mm_result,
+ "waveOutGetVolume failed to obtain the original "
"volume level of the WAVE_MAPPER device.\n"
- "As a result, the user selected volume level will\n"
+ "As a result, the user selected volume level will "
"not be used.");
}
}
- memset (sz_cmd_buf, 0, sizeof(sz_cmd_buf));
- memset (sz_ret_buf, 0, sizeof(sz_ret_buf));
+ memset (sz_cmd_buf, 0, sizeof (sz_cmd_buf));
+ memset (sz_ret_buf, 0, sizeof (sz_ret_buf));
strcpy (sz_cmd_buf, "play GNUEmacs_PlaySound_Device wait");
- mci_error = mciSendString (sz_cmd_buf, sz_ret_buf, 520, NULL);
+ mci_error = mciSendString (sz_cmd_buf, sz_ret_buf, sizeof (sz_ret_buf), NULL);
if (mci_error != 0)
{
- sound_warning ("The play mciSendString command failed to play the\n"
- "opened sound file.");
+ SOUND_WARNING (mciGetErrorString, mci_error,
+ "The play mciSendString command failed to play the "
+ "opened sound file.");
i_result = (int) mci_error;
}
- memset (sz_cmd_buf, 0, sizeof(sz_cmd_buf));
- memset (sz_ret_buf, 0, sizeof(sz_ret_buf));
+ memset (sz_cmd_buf, 0, sizeof (sz_cmd_buf));
+ memset (sz_ret_buf, 0, sizeof (sz_ret_buf));
strcpy (sz_cmd_buf, "close GNUEmacs_PlaySound_Device wait");
- mci_error = mciSendString (sz_cmd_buf, sz_ret_buf, 520, NULL);
+ mci_error = mciSendString (sz_cmd_buf, sz_ret_buf, sizeof (sz_ret_buf), NULL);
if (b_reset_volume == TRUE)
{
- mm_result=waveOutSetVolume ((HWAVEOUT) WAVE_MAPPER, ui_volume_org);
+ mm_result = waveOutSetVolume ((HWAVEOUT) WAVE_MAPPER, ui_volume_org);
if (mm_result != MMSYSERR_NOERROR)
{
- sound_warning ("waveOutSetVolume failed to reset the original volume\n"
+ SOUND_WARNING (waveOutGetErrorText, mm_result,
+ "waveOutSetVolume failed to reset the original volume "
"level of the WAVE_MAPPER device.");
}
}
void
syms_of_sound ()
{
- QCdevice = intern (":device");
+ QCdevice = intern_c_string(":device");
staticpro (&QCdevice);
- QCvolume = intern (":volume");
+ QCvolume = intern_c_string (":volume");
staticpro (&QCvolume);
- Qsound = intern ("sound");
+ Qsound = intern_c_string ("sound");
staticpro (&Qsound);
- Qplay_sound_functions = intern ("play-sound-functions");
+ Qplay_sound_functions = intern_c_string ("play-sound-functions");
staticpro (&Qplay_sound_functions);
defsubr (&Splay_sound_internal);