mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-02 09:01:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pcm_plugin: unify the snd_pcm_mmap_begin result value checking

Browse source
This commit is contained in:
Jaroslav Kysela 2017-02-27 09:25:24 +01:00
parent 3bad0a21b4
commit b0e4652881
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/pcm/pcm_plugin.c
View file

@ -251,8 +251,12 @@ static snd_pcm_sframes_t snd_pcm_plugin_write_areas(snd_pcm_t *pcm,
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;
err = snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames); result = snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames);
if (err < 0 || slave_frames == 0) if (result < 0) {
err = result;
goto error;
}
if (slave_frames == 0)
break; 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);
@ -304,7 +308,11 @@ static snd_pcm_sframes_t snd_pcm_plugin_read_areas(snd_pcm_t *pcm,
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); result = snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames);
if (result < 0) {
err = result;
goto error;
}
if (slave_frames == 0) if (slave_frames == 0)
break; break;
frames = (plugin->read)(pcm, areas, offset, frames, frames = (plugin->read)(pcm, areas, offset, frames,
@ -409,9 +417,11 @@ snd_pcm_plugin_mmap_commit(snd_pcm_t *pcm,
snd_pcm_uframes_t slave_frames = ULONG_MAX; snd_pcm_uframes_t slave_frames = ULONG_MAX;
snd_pcm_sframes_t result; snd_pcm_sframes_t result;
err = snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames); result = snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames);
if (err < 0) if (result < 0) {
err = result;
goto error; goto error;
}
if (frames > cont) if (frames > cont)
frames = cont; frames = cont;
frames = plugin->write(pcm, areas, appl_offset, frames, frames = plugin->write(pcm, areas, appl_offset, frames,
@ -481,9 +491,11 @@ static snd_pcm_sframes_t snd_pcm_plugin_avail_update(snd_pcm_t *pcm)
snd_pcm_uframes_t slave_frames = ULONG_MAX; snd_pcm_uframes_t slave_frames = ULONG_MAX;
snd_pcm_sframes_t result; snd_pcm_sframes_t result;
err = snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames); result = snd_pcm_mmap_begin(slave, &slave_areas, &slave_offset, &slave_frames);
if (err < 0) if (result < 0) {
err = result;
goto error; goto error;
}
if (frames > cont) if (frames > cont)
frames = cont; frames = cont;
frames = (plugin->read)(pcm, areas, hw_offset, frames, frames = (plugin->read)(pcm, areas, hw_offset, frames,