release 1.0.15rc3

Patch-level: Merged
This commit is contained in:
Jaroslav Kysela 2007-09-21 10:40:55 +02:00
parent 67399e35ff
commit 4f70a301ac
2 changed files with 3 additions and 3 deletions

View file

@ -9,7 +9,7 @@ dnl add API = c+1:0:a+1
dnl remove API = c+1:0:0 dnl remove API = c+1:0:0
dnl ************************************************* dnl *************************************************
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(alsa-lib, 1.0.15rc2) AM_INIT_AUTOMAKE(alsa-lib, 1.0.15rc3)
eval LIBTOOL_VERSION_INFO="2:0:0" eval LIBTOOL_VERSION_INFO="2:0:0"
dnl ************************************************* dnl *************************************************
AM_CONDITIONAL(INSTALL_M4, test -n "${ACLOCAL}") AM_CONDITIONAL(INSTALL_M4, test -n "${ACLOCAL}")

View file

@ -1076,10 +1076,10 @@ static int snd_pcm_rate_drain(snd_pcm_t *pcm)
snd_pcm_uframes_t size, ofs, saved_avail_min; snd_pcm_uframes_t size, ofs, saved_avail_min;
snd_pcm_sw_params_t sw_params; snd_pcm_sw_params_t sw_params;
/* temporarily set avail_min to one period */ /* temporarily set avail_min to one */
sw_params = rate->sw_params; sw_params = rate->sw_params;
saved_avail_min = sw_params.avail_min; saved_avail_min = sw_params.avail_min;
sw_params.avail_min = rate->gen.slave->period_size; sw_params.avail_min = 1;
snd_pcm_sw_params(rate->gen.slave, &sw_params); snd_pcm_sw_params(rate->gen.slave, &sw_params);
size = rate->appl_ptr - rate->last_commit_ptr; size = rate->appl_ptr - rate->last_commit_ptr;