mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added abort when no more frames can be processed

Browse source
This commit is contained in:
Jaroslav Kysela 2002-03-03 09:24:14 +00:00
parent 58f74152f5
commit aeeb396002
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/pcm/pcm_plugin.c
View file

@ -324,7 +324,10 @@ static snd_pcm_sframes_t snd_pcm_plugin_write_areas(snd_pcm_t *pcm,
const snd_pcm_channel_area_t *slave_areas; const snd_pcm_channel_area_t *slave_areas;
snd_pcm_uframes_t slave_offset; snd_pcm_uframes_t slave_offset;
snd_pcm_uframes_t slave_frames = ULONG_MAX; snd_pcm_uframes_t slave_frames = ULONG_MAX;
snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames); snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames);
if (slave_frames == 0)
break;
frames = plugin->write(pcm, areas, offset, frames, frames = plugin->write(pcm, areas, offset, frames,
slave_areas, slave_offset, &slave_frames); slave_areas, slave_offset, &slave_frames);
assert(slave_frames <= snd_pcm_mmap_playback_avail(slave)); assert(slave_frames <= snd_pcm_mmap_playback_avail(slave));
@ -332,7 +335,7 @@ static snd_pcm_sframes_t snd_pcm_plugin_write_areas(snd_pcm_t *pcm,
snd_pcm_mmap_appl_forward(pcm, frames); snd_pcm_mmap_appl_forward(pcm, frames);
result = snd_pcm_mmap_commit(slave, slave_offset, slave_frames); result = snd_pcm_mmap_commit(slave, slave_offset, slave_frames);
snd_atomic_write_end(&plugin->watom); snd_atomic_write_end(&plugin->watom);
if (result < 0) if (result <= 0)
return xfer > 0 ? xfer : result; return xfer > 0 ? xfer : result;
offset += result; offset += result;
xfer += result; xfer += result;
@ -356,7 +359,10 @@ static snd_pcm_sframes_t snd_pcm_plugin_read_areas(snd_pcm_t *pcm,
const snd_pcm_channel_area_t *slave_areas; const snd_pcm_channel_area_t *slave_areas;
snd_pcm_uframes_t slave_offset; snd_pcm_uframes_t slave_offset;
snd_pcm_uframes_t slave_frames = ULONG_MAX; snd_pcm_uframes_t slave_frames = ULONG_MAX;
snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames); snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames);
if (slave_frames == 0)
break;
frames = plugin->read(pcm, areas, offset, frames, frames = plugin->read(pcm, areas, offset, frames,
slave_areas, slave_offset, &slave_frames); slave_areas, slave_offset, &slave_frames);
assert(slave_frames <= snd_pcm_mmap_capture_avail(slave)); assert(slave_frames <= snd_pcm_mmap_capture_avail(slave));
@ -364,7 +370,7 @@ static snd_pcm_sframes_t snd_pcm_plugin_read_areas(snd_pcm_t *pcm,
snd_pcm_mmap_appl_forward(pcm, frames); snd_pcm_mmap_appl_forward(pcm, frames);
result = snd_pcm_mmap_commit(slave, slave_offset, slave_frames); result = snd_pcm_mmap_commit(slave, slave_offset, slave_frames);
snd_atomic_write_end(&plugin->watom); snd_atomic_write_end(&plugin->watom);
if (result < 0) if (result <= 0)
return xfer > 0 ? xfer : result; return xfer > 0 ? xfer : result;
offset += result; offset += result;
xfer += result; xfer += result;