mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-02-08 10:06:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

The stream linking problem for pcm_multi.c should be fixed now

Browse source 
- extended link_fd callback
- added snd_pcm_generic_link2()
- added _snd_pcm_link_descriptors()
This commit is contained in:
Jaroslav Kysela 2005-01-20 18:37:13 +00:00
parent 6cac58179b
commit a5831c7300
6 changed files with 124 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/pcm/pcm_generic.c
View file

@ -27,6 +27,7 @@
*/
#include <sys/shm.h>
#include <sys/ioctl.h>
#include <limits.h>
#include "pcm_local.h"
#include "pcm_generic.h"
@ -182,11 +183,11 @@ int snd_pcm_generic_poll_ask(snd_pcm_t *pcm)
return 0;
}
int snd_pcm_generic_link_fd(snd_pcm_t *pcm)
int snd_pcm_generic_link_fd(snd_pcm_t *pcm, int *fds, int count, int (**failed)(snd_pcm_t *, int))
{
snd_pcm_generic_t *generic = pcm->private_data;
if (generic->slave->fast_ops->link_fd)
return generic->slave->fast_ops->link_fd(generic->slave->fast_op_arg);
return generic->slave->fast_ops->link_fd(generic->slave->fast_op_arg, fds, count, failed);
return -ENOSYS;
}
@ -198,6 +199,46 @@ int snd_pcm_generic_link(snd_pcm_t *pcm1, snd_pcm_t *pcm2)
return -ENOSYS;
}
int snd_pcm_generic_link2(snd_pcm_t *pcm1, snd_pcm_t *pcm2)
{
int fds1[16], fds2[16];
int (*failed1)(snd_pcm_t *, int) = NULL;
int (*failed2)(snd_pcm_t *, int) = NULL;
int count1 = _snd_pcm_link_descriptors(pcm1, fds1, 16, &failed1);
int count2 = _snd_pcm_link_descriptors(pcm2, fds2, 16, &failed2);
int i, err = 0;
if (count1 < 0)
return count1;
if (count2 < 0)
return count2;
for (i = 1; i < count1; i++) {
if (fds1[i] < 0)
return 0;
if (ioctl(fds1[0], SNDRV_PCM_IOCTL_LINK, fds1[i]) < 0) {
if (failed1 != NULL) {
err = failed1(pcm2, fds1[i]);
} else {
SYSMSG("SNDRV_PCM_IOCTL_LINK failed");
err = -errno;
}
}
}
for (i = 0; i < count2; i++) {
if (fds2[i] < 0)
return 0;
if (ioctl(fds1[0], SNDRV_PCM_IOCTL_LINK, fds2[i]) < 0) {
if (failed1 != NULL) {
err = failed2(pcm2, fds2[i]);
} else {
SYSMSG("SNDRV_PCM_IOCTL_LINK failed");
err = -errno;
}
}
}
return err;
}
int snd_pcm_generic_unlink(snd_pcm_t *pcm)
{
snd_pcm_generic_t *generic = pcm->private_data;