From b9d2cfbf8415ecacfe57b8cb94d97b662d3a3352 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Fri, 29 Jul 2011 23:46:28 +0200 Subject: [PATCH] alsa: Make two variables local to alsa_init(). The two members buffer_frames and buffer_time of struct private_alsa_data are only needed in alsa_init(), so make them local. Rename buffer_frames to buffer_size since this is the value returned by snd_pcm_hw_params_get_buffer_size(). --- alsa_write.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/alsa_write.c b/alsa_write.c index a7539ba4..2dab8fe1 100644 --- a/alsa_write.c +++ b/alsa_write.c @@ -36,10 +36,6 @@ struct private_alsa_write_data { snd_pcm_t *handle; /** Determined and set by alsa_init(). */ int bytes_per_frame; - /** The approximate maximum buffer duration in us. */ - unsigned buffer_time; - /* Number of frames that fit into the buffer. */ - snd_pcm_uframes_t buffer_frames; /** * The sample rate given by command line option or the decoder * of the writer node group. @@ -76,8 +72,9 @@ static int alsa_init(struct private_alsa_write_data *pad, snd_pcm_hw_params_t *hwparams; snd_pcm_sw_params_t *swparams; snd_pcm_uframes_t start_threshold, stop_threshold; - snd_pcm_uframes_t period_size; + snd_pcm_uframes_t buffer_size, period_size; snd_output_t *log; + unsigned buffer_time; int err; PARA_INFO_LOG("opening %s\n", conf->device_arg); @@ -103,29 +100,30 @@ static int alsa_init(struct private_alsa_write_data *pad, &pad->sample_rate, NULL) < 0) return -E_SET_RATE; err = snd_pcm_hw_params_get_buffer_time_max(hwparams, - &pad->buffer_time, NULL); - if (err < 0 || !pad->buffer_time) + &buffer_time, NULL); + if (err < 0 || buffer_time == 0) return -E_GET_BUFFER_TIME; if (snd_pcm_hw_params_set_buffer_time_near(pad->handle, hwparams, - &pad->buffer_time, NULL) < 0) + &buffer_time, NULL) < 0) return -E_SET_BUFFER_TIME; if (snd_pcm_hw_params(pad->handle, hwparams) < 0) 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); - if (period_size == pad->buffer_frames) + snd_pcm_hw_params_get_buffer_size(hwparams, &buffer_size); + if (period_size == buffer_size) return -E_BAD_PERIOD; + /* software parameter setup */ snd_pcm_sw_params_current(pad->handle, swparams); snd_pcm_sw_params_set_avail_min(pad->handle, swparams, period_size); - if (pad->buffer_frames < 1) + if (buffer_size < 1) start_threshold = 1; else - start_threshold = PARA_MIN(pad->buffer_frames, + start_threshold = PARA_MIN(buffer_size, (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; - stop_threshold = pad->buffer_frames; + stop_threshold = buffer_size; if (snd_pcm_sw_params_set_stop_threshold(pad->handle, swparams, stop_threshold) < 0) return -E_STOP_THRESHOLD; -- 2.39.2