diff options
Diffstat (limited to 'src/sound.c')
| -rw-r--r-- | src/sound.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sound.c b/src/sound.c index 07c7dab0ada..5fd5bd5c0de 100644 --- a/src/sound.c +++ b/src/sound.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* sound.c -- sound support. | 1 | /* sound.c -- sound support. |
| 2 | Copyright (C) 1998-1999, 2001-2011 Free Software Foundation, Inc. | 2 | Copyright (C) 1998-1999, 2001-2012 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | This file is part of GNU Emacs. | 4 | This file is part of GNU Emacs. |
| 5 | 5 | ||
| @@ -226,7 +226,7 @@ struct sound_device | |||
| 226 | /* Close device SD. */ | 226 | /* Close device SD. */ |
| 227 | void (* close) (struct sound_device *sd); | 227 | void (* close) (struct sound_device *sd); |
| 228 | 228 | ||
| 229 | /* Configure SD accoring to device-dependent parameters. */ | 229 | /* Configure SD according to device-dependent parameters. */ |
| 230 | void (* configure) (struct sound_device *device); | 230 | void (* configure) (struct sound_device *device); |
| 231 | 231 | ||
| 232 | /* Choose a device-dependent format for outputting sound S. */ | 232 | /* Choose a device-dependent format for outputting sound S. */ |
| @@ -267,7 +267,7 @@ struct sound | |||
| 267 | read from the start of a sound file. */ | 267 | read from the start of a sound file. */ |
| 268 | char *header; | 268 | char *header; |
| 269 | 269 | ||
| 270 | /* Number of bytes raed from sound file. This is always <= | 270 | /* Number of bytes read from sound file. This is always <= |
| 271 | MAX_SOUND_HEADER_BYTES. */ | 271 | MAX_SOUND_HEADER_BYTES. */ |
| 272 | int header_size; | 272 | int header_size; |
| 273 | 273 | ||
| @@ -1013,7 +1013,7 @@ alsa_configure (struct sound_device *sd) | |||
| 1013 | 1013 | ||
| 1014 | err = snd_pcm_hw_params_get_buffer_size (p->hwparams, &buffer_size); | 1014 | err = snd_pcm_hw_params_get_buffer_size (p->hwparams, &buffer_size); |
| 1015 | if (err < 0) | 1015 | if (err < 0) |
| 1016 | alsa_sound_perror("Unable to get buffer size for playback", err); | 1016 | alsa_sound_perror ("Unable to get buffer size for playback", err); |
| 1017 | 1017 | ||
| 1018 | err = snd_pcm_sw_params_current (p->handle, p->swparams); | 1018 | err = snd_pcm_sw_params_current (p->handle, p->swparams); |
| 1019 | if (err < 0) | 1019 | if (err < 0) |
| @@ -1071,7 +1071,7 @@ alsa_configure (struct sound_device *sd) | |||
| 1071 | snd_mixer_selem_set_playback_volume (e, chn, vol); | 1071 | snd_mixer_selem_set_playback_volume (e, chn, vol); |
| 1072 | } | 1072 | } |
| 1073 | } | 1073 | } |
| 1074 | snd_mixer_close(handle); | 1074 | snd_mixer_close (handle); |
| 1075 | } | 1075 | } |
| 1076 | } | 1076 | } |
| 1077 | } | 1077 | } |
| @@ -1182,7 +1182,7 @@ alsa_write (struct sound_device *sd, const char *buffer, EMACS_INT nbytes) | |||
| 1182 | else if (err == -ESTRPIPE) | 1182 | else if (err == -ESTRPIPE) |
| 1183 | { | 1183 | { |
| 1184 | while ((err = snd_pcm_resume (p->handle)) == -EAGAIN) | 1184 | while ((err = snd_pcm_resume (p->handle)) == -EAGAIN) |
| 1185 | sleep(1); /* wait until the suspend flag is released */ | 1185 | sleep (1); /* wait until the suspend flag is released */ |
| 1186 | if (err < 0) | 1186 | if (err < 0) |
| 1187 | { | 1187 | { |
| 1188 | err = snd_pcm_prepare (p->handle); | 1188 | err = snd_pcm_prepare (p->handle); |