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

Fix buffer allocation and mmap with plugins

Browse source 
Fixed the bug producing silent tones with some combinations of plugins.
The internal buffer handling is now better (cleaner) integrated with
snd_pcm_generic_*().
This commit is contained in:
Takashi Iwai 2005-09-02 16:36:40 +00:00
parent e62ecc876a
commit ffdb04c3ea
9 changed files with 48 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/pcm/pcm_generic.c
View file

@ -113,7 +113,16 @@ int snd_pcm_generic_prepare(snd_pcm_t *pcm)
int snd_pcm_generic_channel_info(snd_pcm_t *pcm, snd_pcm_channel_info_t *info)
{
snd_pcm_generic_t *generic = pcm->private_data;
return snd_pcm_channel_info(generic->slave, info);
if (pcm->mmap_shadow) {
/* No own buffer is required - the plugin won't change
* the data on the buffer, or do safely on-the-place
* conversion
*/
return snd_pcm_channel_info(generic->slave, info);
} else {
/* Allocate own buffer */
return snd_pcm_channel_info_shm(generic->slave, info, -1);
}
}
int snd_pcm_generic_status(snd_pcm_t *pcm, snd_pcm_status_t * status)
@ -290,13 +299,26 @@ snd_pcm_sframes_t snd_pcm_generic_avail_update(snd_pcm_t *pcm)
return snd_pcm_avail_update(generic->slave);
}
int snd_pcm_generic_mmap(snd_pcm_t *pcm ATTRIBUTE_UNUSED)
int snd_pcm_generic_mmap(snd_pcm_t *pcm)
{
if (pcm->mmap_shadow) {
/* Copy the slave mmapped buffer data */
snd_pcm_generic_t *generic = pcm->private_data;
pcm->mmap_channels = generic->slave->mmap_channels;
pcm->running_areas = generic->slave->running_areas;
pcm->stopped_areas = generic->slave->stopped_areas;
}
return 0;
}
int snd_pcm_generic_munmap(snd_pcm_t *pcm ATTRIBUTE_UNUSED)
int snd_pcm_generic_munmap(snd_pcm_t *pcm)
{
if (pcm->mmap_shadow) {
/* Clean up */
pcm->mmap_channels = NULL;
pcm->running_areas = NULL;
pcm->stopped_areas = NULL;
}
return 0;
}