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

More cleanups

Browse source
This commit is contained in:
Jaroslav Kysela 2003-03-08 16:32:38 +00:00
parent a261af535f
commit c8fab38b67
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -204,7 +204,7 @@ snd_pcm_jack_process_cb (jack_nframes_t nframes, snd_pcm_t *pcm)
unsigned int channel; unsigned int channel;
#ifdef PCM_JACK_DEBUG #ifdef PCM_JACK_DEBUG
printf("PROCESS %d!\n",jack->state); printf("PROCESS %d! (%u)\n",jack->state, (unsigned)nframes);
#endif #endif
for (channel = 0; channel < jack->channels; channel++) { for (channel = 0; channel < jack->channels; channel++) {
@ -342,7 +342,7 @@ static int snd_pcm_jack_start(snd_pcm_t *pcm)
jack_port_name (jack->ports[i]), jack_port_name (jack->ports[i]),
jack->playback_ports[i])) jack->playback_ports[i]))
{ {
fprintf(stderr, "cannot connect %s to %s", fprintf(stderr, "cannot connect %s to %s\n",
jack_port_name(jack->ports[i]), jack_port_name(jack->ports[i]),
jack->playback_ports[i]); jack->playback_ports[i]);
return -EIO; return -EIO;
@ -363,7 +363,7 @@ static int snd_pcm_jack_start(snd_pcm_t *pcm)
jack->capture_ports[i], jack->capture_ports[i],
jack_port_name (jack->ports[i]))) jack_port_name (jack->ports[i])))
{ {
fprintf(stderr, "cannot connect %s to %s", fprintf(stderr, "cannot connect %s to %s\n",
jack->capture_ports[i], jack->capture_ports[i],
jack_port_name(jack->ports[i])); jack_port_name(jack->ports[i]));
return -EIO; return -EIO;
@ -401,12 +401,15 @@ static int snd_pcm_jack_drop(snd_pcm_t *pcm)
printf("deactivate done\n"); printf("deactivate done\n");
jack->activated = 0; jack->activated = 0;
} }
{
unsigned i;
for (i = 0; i < pcm->channels; i++) { for (i = 0; i < pcm->channels; i++) {
if (jack->ports[i]) { if (jack->ports[i]) {
jack_port_unregister(jack->client, jack->ports[i]); jack_port_unregister(jack->client, jack->ports[i]);
jack->ports[i] = NULL; jack->ports[i] = NULL;
} }
} }
}
#endif #endif
jack->state = SND_PCM_STATE_SETUP; jack->state = SND_PCM_STATE_SETUP;
return 0; return 0;
@ -510,7 +513,7 @@ static int snd_pcm_jack_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params)
(1<<SNDRV_PCM_ACCESS_RW_INTERLEAVED) | (1<<SNDRV_PCM_ACCESS_RW_INTERLEAVED) |
(1<<SNDRV_PCM_ACCESS_RW_NONINTERLEAVED), (1<<SNDRV_PCM_ACCESS_RW_NONINTERLEAVED),
0, 0, 0 } }; 0, 0, 0 } };
static snd_pcm_format_mask_t format_mask = { SND_PCM_FMTBIT_FLOAT }; static snd_pcm_format_mask_t format_mask = { { 1U<<SNDRV_PCM_FORMAT_FLOAT } };
snd_interval_t t; snd_interval_t t;
#ifdef PCM_JACK_DEBUG #ifdef PCM_JACK_DEBUG
@ -710,13 +713,11 @@ int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name,
jack->capture_ports = NULL; jack->capture_ports = NULL;
jack->capture_ports_n = 0; jack->capture_ports_n = 0;
err = parse_ports(playback_conf, err = parse_ports(playback_conf, &jack->playback_ports,&jack->playback_ports_n);
&jack->playback_ports,&jack->playback_ports_n);
if (err) if (err)
goto _free; goto _free;
err = parse_ports(capture_conf, err = parse_ports(capture_conf, &jack->capture_ports,&jack->capture_ports_n);
&jack->capture_ports,&jack->capture_ports_n);
if (err) if (err)
goto _free; goto _free;
@ -729,6 +730,10 @@ int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name,
jack->client = jack_client_new("alsaC"); jack->client = jack_client_new("alsaC");
} }
if (jack->channels == 0) {
SNDERR("define the %s_ports section\n", stream == SND_PCM_STREAM_PLAYBACK ? "playback" : "capture");
goto _free;
}
if (jack->client==0) { if (jack->client==0) {
err = -ENOENT; err = -ENOENT;
@ -765,6 +770,8 @@ int snd_pcm_jack_open(snd_pcm_t **pcmp, const char *name,
_free: _free:
if (jack) { if (jack) {
if (jack->client)
jack_client_close(jack->client);
if (jack->playback_ports) if (jack->playback_ports)
{ {
unsigned int k; unsigned int k;