asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-12 23:45:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Updated for last changes

Browse source
This commit is contained in:
Jaroslav Kysela 2002-09-17 13:02:17 +00:00
parent ec9ecfc6fa
commit 7dbfb61047
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
aplay/aplay.c
View file

@ -77,9 +77,9 @@ static int mmap_flag = 0;
static int interleaved = 1; static int interleaved = 1;
static int nonblock = 0; static int nonblock = 0;
static char *audiobuf = NULL; static char *audiobuf = NULL;
static int chunk_size = -1; static snd_pcm_uframes_t chunk_size = 0;
static int period_time = -1; static unsigned period_time = 0;
static int buffer_time = -1; static unsigned buffer_time = 0;
static int avail_min = -1; static int avail_min = -1;
static int start_delay = 0; static int start_delay = 0;
static int stop_delay = 0; static int stop_delay = 0;
@ -749,7 +749,7 @@ static void set_params(void)
{ {
snd_pcm_hw_params_t *params; snd_pcm_hw_params_t *params;
snd_pcm_sw_params_t *swparams; snd_pcm_sw_params_t *swparams;
size_t buffer_size; snd_pcm_uframes_t buffer_size;
int err; int err;
size_t n; size_t n;
size_t xfer_align; size_t xfer_align;
@ -794,29 +794,29 @@ static void set_params(void)
err = snd_pcm_hw_params_set_periods_min(handle, params, 2); err = snd_pcm_hw_params_set_periods_min(handle, params, 2);
assert(err >= 0); assert(err >= 0);
#endif #endif
err = snd_pcm_hw_params_set_rate_near(handle, params, hwparams.rate, 0); err = snd_pcm_hw_params_set_rate_near(handle, params, &hwparams.rate, 0);
assert(err >= 0); assert(err >= 0);
rate = err; rate = err;
if (buffer_time < 0) if (buffer_time == 0)
buffer_time = 500000; buffer_time = 500000;
buffer_time = snd_pcm_hw_params_set_buffer_time_near(handle, params, err = snd_pcm_hw_params_set_buffer_time_near(handle, params,
buffer_time, 0); &buffer_time, 0);
assert(buffer_time >= 0); assert(err >= 0);
if (period_time < 0) if (period_time == 0)
period_time = buffer_time / 4; period_time = buffer_time / 4;
period_time = snd_pcm_hw_params_set_period_time_near(handle, params, err = snd_pcm_hw_params_set_period_time_near(handle, params,
period_time, 0); &period_time, 0);
assert(period_time >= 0); assert(err >= 0);
err = snd_pcm_hw_params(handle, params); err = snd_pcm_hw_params(handle, params);
if (err < 0) { if (err < 0) {
error("Unable to install hw params:"); error("Unable to install hw params:");
snd_pcm_hw_params_dump(params, log); snd_pcm_hw_params_dump(params, log);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
chunk_size = snd_pcm_hw_params_get_period_size(params, 0); snd_pcm_hw_params_get_period_size(params, &chunk_size, 0);
buffer_size = snd_pcm_hw_params_get_buffer_size(params); snd_pcm_hw_params_get_buffer_size(params, &buffer_size);
if (chunk_size == buffer_size) { if (chunk_size == buffer_size) {
error("Can't use period equal to buffer size (%u == %lu)", chunk_size, (long)buffer_size); error("Can't use period equal to buffer size (%lu == %lu)", chunk_size, buffer_size);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
snd_pcm_sw_params_current(handle, swparams); snd_pcm_sw_params_current(handle, swparams);