mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-02 09:01:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: properly convert return values of snd_strerror() to utf8

Browse source
This commit is contained in:
Lennart Poettering 2009-04-19 19:22:51 +02:00
parent 39a26d8c6b
commit 98a25c506e
5 changed files with 86 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/modules/alsa/alsa-sink.c
View file

@ -281,7 +281,7 @@ static int try_recover(struct userdata *u, const char *call, int err) {
pa_assert(call);
pa_assert(err < 0);
pa_log_debug("%s: %s", call, snd_strerror(err));
pa_log_debug("%s: %s", call, pa_alsa_strerror(err));
pa_assert(err != -EAGAIN);
@ -289,7 +289,7 @@ static int try_recover(struct userdata *u, const char *call, int err) {
pa_log_debug("%s: Buffer underrun!", call);
if ((err = snd_pcm_recover(u->pcm_handle, err, 1)) < 0) {
pa_log("%s: %s", call, snd_strerror(err));
pa_log("%s: %s", call, pa_alsa_strerror(err));
return -1;
}
@ -636,12 +636,12 @@ static void update_smoother(struct userdata *u) {
/* Let's update the time smoother */
if (PA_UNLIKELY((err = pa_alsa_safe_delay(u->pcm_handle, &delay, u->hwbuf_size, &u->sink->sample_spec)) < 0)) {
pa_log_warn("Failed to query DSP status data: %s", snd_strerror(err));
pa_log_warn("Failed to query DSP status data: %s", pa_alsa_strerror(err));
return;
}
if (PA_UNLIKELY((err = snd_pcm_status(u->pcm_handle, status)) < 0))
pa_log_warn("Failed to get timestamp: %s", snd_strerror(err));
pa_log_warn("Failed to get timestamp: %s", pa_alsa_strerror(err));
else {
snd_htimestamp_t htstamp = { 0, 0 };
snd_pcm_status_get_htstamp(status, &htstamp);
@ -764,7 +764,7 @@ static int update_sw_params(struct userdata *u) {
pa_log_debug("setting avail_min=%lu", (unsigned long) avail_min);
if ((err = pa_alsa_set_sw_params(u->pcm_handle, avail_min)) < 0) {
pa_log("Failed to set software parameters: %s", snd_strerror(err));
pa_log("Failed to set software parameters: %s", pa_alsa_strerror(err));
return err;
}
@ -792,7 +792,7 @@ static int unsuspend(struct userdata *u) {
SND_PCM_NO_AUTO_RESAMPLE|
SND_PCM_NO_AUTO_CHANNELS|
SND_PCM_NO_AUTO_FORMAT)) < 0) {
pa_log("Error opening PCM device %s: %s", u->device_name, snd_strerror(err));
pa_log("Error opening PCM device %s: %s", u->device_name, pa_alsa_strerror(err));
goto fail;
}
@ -803,7 +803,7 @@ static int unsuspend(struct userdata *u) {
d = u->use_tsched;
if ((err = pa_alsa_set_hw_params(u->pcm_handle, &ss, &nfrags, &period_size, u->hwbuf_size / u->frame_size, &b, &d, TRUE)) < 0) {
pa_log("Failed to set hardware parameters: %s", snd_strerror(err));
pa_log("Failed to set hardware parameters: %s", pa_alsa_strerror(err));
goto fail;
}
@ -1030,7 +1030,7 @@ static void sink_get_volume_cb(pa_sink *s) {
return;
fail:
pa_log_error("Unable to read volume: %s", snd_strerror(err));
pa_log_error("Unable to read volume: %s", pa_alsa_strerror(err));
}
static void sink_set_volume_cb(pa_sink *s) {
@ -1141,7 +1141,7 @@ static void sink_set_volume_cb(pa_sink *s) {
return;
fail:
pa_log_error("Unable to set volume: %s", snd_strerror(err));
pa_log_error("Unable to set volume: %s", pa_alsa_strerror(err));
}
static void sink_get_mute_cb(pa_sink *s) {
@ -1152,7 +1152,7 @@ static void sink_get_mute_cb(pa_sink *s) {
pa_assert(u->mixer_elem);
if ((err = snd_mixer_selem_get_playback_switch(u->mixer_elem, 0, &sw)) < 0) {
pa_log_error("Unable to get switch: %s", snd_strerror(err));
pa_log_error("Unable to get switch: %s", pa_alsa_strerror(err));
return;
}
@ -1167,7 +1167,7 @@ static void sink_set_mute_cb(pa_sink *s) {
pa_assert(u->mixer_elem);
if ((err = snd_mixer_selem_set_playback_switch_all(u->mixer_elem, !s->muted)) < 0) {
pa_log_error("Unable to set switch: %s", snd_strerror(err));
pa_log_error("Unable to set switch: %s", pa_alsa_strerror(err));
return;
}
}
@ -1206,7 +1206,7 @@ static int process_rewind(struct userdata *u) {
pa_log_debug("Requested to rewind %lu bytes.", (unsigned long) rewind_nbytes);
if (PA_UNLIKELY((unused = pa_alsa_safe_avail(u->pcm_handle, u->hwbuf_size, &u->sink->sample_spec)) < 0)) {
pa_log("snd_pcm_avail() failed: %s", snd_strerror((int) unused));
pa_log("snd_pcm_avail() failed: %s", pa_alsa_strerror((int) unused));
return -1;
}
@ -1228,7 +1228,7 @@ static int process_rewind(struct userdata *u) {
in_frames = (snd_pcm_sframes_t) (rewind_nbytes / u->frame_size);
pa_log_debug("before: %lu", (unsigned long) in_frames);
if ((out_frames = snd_pcm_rewind(u->pcm_handle, (snd_pcm_uframes_t) in_frames)) < 0) {
pa_log("snd_pcm_rewind() failed: %s", snd_strerror((int) out_frames));
pa_log("snd_pcm_rewind() failed: %s", pa_alsa_strerror((int) out_frames));
return -1;
}
pa_log_debug("after: %lu", (unsigned long) out_frames);
@ -1359,7 +1359,7 @@ static void thread_func(void *userdata) {
pollfd = pa_rtpoll_item_get_pollfd(u->alsa_rtpoll_item, &n);
if ((err = snd_pcm_poll_descriptors_revents(u->pcm_handle, pollfd, n, &revents)) < 0) {
pa_log("snd_pcm_poll_descriptors_revents() failed: %s", snd_strerror(err));
pa_log("snd_pcm_poll_descriptors_revents() failed: %s", pa_alsa_strerror(err));
goto fail;
}