oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

alsa: capitalize "ALSA" consistently in messages

Browse Source 
That's the name of this project.
This commit is contained in:
Eric Wong 2008-09-08 20:42:34 +02:00 committed by Max Kellermann
parent 7bd98c08ce
commit fa246e02be
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/audioOutputs/audioOutput_alsa.c
View File

@ -110,7 +110,7 @@ static int alsa_testDefault(void)
snd_config_update_free_global(); snd_config_update_free_global();
if (ret) { if (ret) {
WARNING("Error opening default alsa device: %s\n", WARNING("Error opening default ALSA device: %s\n",
snd_strerror(-ret)); snd_strerror(-ret));
return -1; return -1;
} else } else
@ -182,7 +182,7 @@ configure_hw:
err = snd_pcm_hw_params_set_access(ad->pcmHandle, hwparams, err = snd_pcm_hw_params_set_access(ad->pcmHandle, hwparams,
SND_PCM_ACCESS_MMAP_INTERLEAVED); SND_PCM_ACCESS_MMAP_INTERLEAVED);
if (err < 0) { if (err < 0) {
ERROR("Cannot set mmap'ed mode on alsa device \"%s\": " ERROR("Cannot set mmap'ed mode on ALSA device \"%s\": "
" %s\n", ad->device, snd_strerror(-err)); " %s\n", ad->device, snd_strerror(-err));
ERROR("Falling back to direct write mode\n"); ERROR("Falling back to direct write mode\n");
ad->useMmap = 0; ad->useMmap = 0;
@ -297,7 +297,7 @@ configure_hw:
audioOutput->open = 1; audioOutput->open = 1;
DEBUG("alsa device \"%s\" will be playing %i bit, %i channel audio at " DEBUG("ALSA device \"%s\" will be playing %i bit, %i channel audio at "
"%i Hz\n", ad->device, (int)audioFormat->bits, "%i Hz\n", ad->device, (int)audioFormat->bits,
channels, sampleRate); channels, sampleRate);
@ -305,10 +305,10 @@ configure_hw:
error: error:
if (cmd) { if (cmd) {
ERROR("Error opening alsa device \"%s\" (%s): %s\n", ERROR("Error opening ALSA device \"%s\" (%s): %s\n",
ad->device, cmd, snd_strerror(-err)); ad->device, cmd, snd_strerror(-err));
} else { } else {
ERROR("Error opening alsa device \"%s\": %s\n", ad->device, ERROR("Error opening ALSA device \"%s\": %s\n", ad->device,
snd_strerror(-err)); snd_strerror(-err));
} }
fail: fail:
@ -322,9 +322,9 @@ fail:
static int alsa_errorRecovery(AlsaData * ad, int err) static int alsa_errorRecovery(AlsaData * ad, int err)
{ {
if (err == -EPIPE) { if (err == -EPIPE) {
DEBUG("Underrun on alsa device \"%s\"\n", ad->device); DEBUG("Underrun on ALSA device \"%s\"\n", ad->device);
} else if (err == -ESTRPIPE) { } else if (err == -ESTRPIPE) {
DEBUG("alsa device \"%s\" was suspended\n", ad->device); DEBUG("ALSA device \"%s\" was suspended\n", ad->device);
} }
switch (snd_pcm_state(ad->pcmHandle)) { switch (snd_pcm_state(ad->pcmHandle)) {
@ -395,7 +395,7 @@ static int alsa_playAudio(struct audio_output *audioOutput,
if (ret < 0) { if (ret < 0) {
if (alsa_errorRecovery(ad, ret) < 0) { if (alsa_errorRecovery(ad, ret) < 0) {
ERROR("closing alsa device \"%s\" due to write " ERROR("closing ALSA device \"%s\" due to write "
"error: %s\n", ad->device, "error: %s\n", ad->device,
snd_strerror(-errno)); snd_strerror(-errno));
alsa_closeDevice(audioOutput); alsa_closeDevice(audioOutput);