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

Michel Daenzer <michel@daenzer.net>:

Browse source 
This patch changes the JACK plugin to use a unique client name, which
allows for multiple ALSA streams to share a JACK server.
This commit is contained in:
Takashi Iwai 2004-02-05 11:48:19 +00:00
parent 2f1a2513dc
commit cf956e032b
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/pcm/ext/pcm_jack.c
View file

@ -483,9 +483,9 @@ static snd_pcm_sframes_t snd_pcm_jack_mmap_commit(snd_pcm_t *pcm,
static snd_pcm_sframes_t snd_pcm_jack_avail_update(snd_pcm_t *pcm)
{
snd_pcm_jack_t *jack = pcm->private_data;
snd_pcm_sframes_t ret = snd_pcm_mmap_avail(pcm);
#ifdef PCM_JACK_DEBUG
snd_pcm_jack_t *jack = pcm->private_data;
printf("snd_pcm_jack_avail_update appl=%d hw=%d ret=%d\n",(int)jack->appl_ptr,(int)jack->hw_ptr,(int)ret); fflush(stdout);
#endif
return ret;
@ -697,6 +697,8 @@ int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name,
snd_pcm_jack_t *jack;
int err;
int fd[2];
static unsigned int num = 0;
char jack_client_name[32];
assert(pcmp);
#ifdef PCM_JACK_DEBUG
@ -723,11 +725,9 @@ int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name,
if (stream == SND_PCM_STREAM_PLAYBACK) {
jack->channels = jack->playback_ports_n;
jack->client = jack_client_new("alsaP");
}
else {
jack->channels = jack->capture_ports_n;
jack->client = jack_client_new("alsaC");
}
if (jack->channels == 0) {
@ -735,6 +735,15 @@ int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name,
goto _free;
}
if (snprintf(jack_client_name, sizeof(jack_client_name), "alsa%s.%d.%d",
stream == SND_PCM_STREAM_PLAYBACK ? "P" : "C", getpid(), num++)
>= (int)sizeof(jack_client_name)) {
fprintf(stderr, "%s: WARNING: JACK client name '%s' truncated to %d characters, might not be unique\n",
__func__, jack_client_name, strlen(jack_client_name));
}
jack->client = jack_client_new(jack_client_name);
if (jack->client==0) {
err = -ENOENT;
goto _free;