snd_pcm_sw_params_t *swparams;
snd_pcm_uframes_t start_threshold, stop_threshold;
snd_pcm_uframes_t period_size;
+ snd_output_t *log;
int err;
PARA_INFO_LOG("opening %s\n", conf->device_arg);
&pad->buffer_time, NULL);
if (err < 0 || !pad->buffer_time)
return -E_GET_BUFFER_TIME;
- PARA_INFO_LOG("buffer time: %d\n", pad->buffer_time);
if (snd_pcm_hw_params_set_buffer_time_near(pad->handle, hwparams,
&pad->buffer_time, NULL) < 0)
return -E_SET_BUFFER_TIME;
return -E_HW_PARAMS;
snd_pcm_hw_params_get_period_size(hwparams, &period_size, NULL);
snd_pcm_hw_params_get_buffer_size(hwparams, &pad->buffer_frames);
- PARA_INFO_LOG("buffer size: %lu, period_size: %lu\n", pad->buffer_frames,
- period_size);
if (period_size == pad->buffer_frames)
return -E_BAD_PERIOD;
snd_pcm_sw_params_current(pad->handle, swparams);
* pad->channels / 8;
if (pad->bytes_per_frame <= 0)
return -E_PHYSICAL_WIDTH;
- PARA_INFO_LOG("bytes per frame: %d\n", pad->bytes_per_frame);
if (snd_pcm_nonblock(pad->handle, 1))
PARA_ERROR_LOG("failed to set nonblock mode\n");
+ err = snd_output_buffer_open(&log);
+ if (err == 0) {
+ char *buf;
+ PARA_INFO_LOG("dumping alsa configuration\n");
+ snd_pcm_dump(pad->handle, log);
+ snd_output_buffer_string(log, &buf);
+ for (;;) {
+ char *p = strchr(buf, '\n');
+ if (!p) /* omit last output line, it's empty */
+ break;
+ *p = '\0';
+ PARA_INFO_LOG("%s\n", buf);
+ buf = p + 1;
+ }
+ snd_output_close(log);
+ }
return 1;
}
wn->min_iqs = pad->bytes_per_frame;
goto again;
}
- if (pad->poll_fd >= 0 && !FD_ISSET(pad->poll_fd, &s->rfds))
+ if (pad->poll_fd < 0 || !FD_ISSET(pad->poll_fd, &s->rfds))
return;
frames = bytes / pad->bytes_per_frame;
frames = snd_pcm_writei(pad->handle, data, frames);
- if (frames == 0 || frames == -EAGAIN)
+ if (frames == 0 || frames == -EAGAIN) {
+ /*
+ * The alsa poll fd was ready for IO but we failed to write to
+ * the alsa handle. This means another event is pending. We
+ * don't care about that but we have to dispatch the event in
+ * order to avoid a busy loop. So we simply read from the poll
+ * fd.
+ */
+ char buf[100];
+ if (read(pad->poll_fd, buf, 100))
+ do_nothing;
return;
+ }
if (frames > 0) {
btr_consume(btrn, frames * pad->bytes_per_frame);
goto again;