/*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/* Number of frames that fit into the buffer. */
snd_pcm_uframes_t buffer_frames;
/**
- * The samplerate given by command line option or the decoder
+ * The sample rate given by command line option or the decoder
* of the writer node group.
*/
- unsigned samplerate;
+ unsigned sample_rate;
/**
* The number of channels, given by command line option or the
* decoder of the writer node group.
pad->channels) < 0)
return -E_CHANNEL_COUNT;
if (snd_pcm_hw_params_set_rate_near(pad->handle, hwparams,
- &pad->samplerate, NULL) < 0)
+ &pad->sample_rate, NULL) < 0)
return -E_SET_RATE;
err = snd_pcm_hw_params_get_buffer_time_max(hwparams,
&pad->buffer_time, NULL);
start_threshold = 1;
else
start_threshold = PARA_MIN(pad->buffer_frames,
- (snd_pcm_uframes_t)pad->samplerate);
+ (snd_pcm_uframes_t)pad->sample_rate);
if (snd_pcm_sw_params_set_start_threshold(pad->handle, swparams,
start_threshold) < 0)
return -E_START_THRESHOLD;
s->timeout = tv;
}
-static void xrun(snd_pcm_t *handle)
-{
- snd_pcm_status_t *status;
- int ret;
- struct timeval tv, diff;
-
- snd_pcm_status_alloca(&status);
- ret = snd_pcm_status(handle, status);
- if (ret < 0)
- return;
- if (snd_pcm_status_get_state(status) != SND_PCM_STATE_XRUN)
- return;
- snd_pcm_status_get_trigger_tstamp(status, &tv);
- tv_diff(now, &tv, &diff);
- PARA_WARNING_LOG("underrun: %lums\n", tv2ms(&diff));
-}
-
static void alsa_close(struct writer_node *wn)
{
struct private_alsa_write_data *pad = wn->private_data;
return;
}
if (!pad->handle) {
- struct alsa_write_args_info *conf = wn->conf;
+ int32_t val;
if (bytes == 0) /* no data available */
return;
- /* defaults */
- pad->samplerate = conf->samplerate_arg;
- pad->channels = conf->channels_arg;
- if (!conf->samplerate_given) { /* config option trumps btr_exec */
- int32_t rate;
- if (get_btr_samplerate(btrn, &rate) >= 0)
- pad->samplerate = rate;
- }
- if (!conf->channels_given) {
- int32_t ch;
- if (get_btr_channels(btrn, &ch) >= 0)
- pad->channels = ch;
- }
- PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels, pad->samplerate);
+ ret = get_btr_sample_rate(btrn, &val);
+ if (ret < 0)
+ goto err;
+ pad->sample_rate = val;
+ ret = get_btr_channels(btrn, &val);
+ if (ret < 0)
+ goto err;
+ pad->channels = val;
+ PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels,
+ pad->sample_rate);
ret = alsa_init(pad, wn->conf);
if (ret < 0)
goto err;
goto again;
}
if (frames == -EPIPE) {
- xrun(pad->handle);
+ PARA_WARNING_LOG("underrun (tried to write %zu bytes)\n", bytes);
snd_pcm_prepare(pad->handle);
return;
}
*
* \param w Pointer to the writer to initialize.
*
- * \sa \ref struct writer.
+ * \sa struct \ref writer.
*/
void alsa_write_init(struct writer *w)
{