oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

jack: added freeJackClient()

Browse Source 
No need to destroy the JackData object when an error occurs, since
jack_finishDriver() already frees it.  Only deinitialize the jack
library, introduce freeJackClient() for that, and move code from
freeJackData().
This commit is contained in:
Max Kellermann 2008-08-26 08:27:15 +02:00
parent dc989987ab
commit 83215bf9ce
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/audioOutputs/audioOutput_jack.c
View File

@ -63,14 +63,32 @@ static JackData *newJackData(void)
return ret; return ret;
} }
static void freeJackClient(JackData *jd)
{
assert(jd != NULL);
if (jd->client != NULL) {
jack_deactivate(jd->client);
jack_client_close(jd->client);
jd->client = NULL;
}
if (jd->ringbuffer[0] != NULL) {
jack_ringbuffer_free(jd->ringbuffer[0]);
jd->ringbuffer[0] = NULL;
}
if (jd->ringbuffer[1] != NULL) {
jack_ringbuffer_free(jd->ringbuffer[1]);
jd->ringbuffer[1] = NULL;
}
}
static void freeJackData(AudioOutput *audioOutput) static void freeJackData(AudioOutput *audioOutput)
{ {
JackData *jd = audioOutput->data; JackData *jd = audioOutput->data;
if (jd) { if (jd) {
if (jd->ringbuffer[0]) freeJackClient(jd);
jack_ringbuffer_free(jd->ringbuffer[0]);
if (jd->ringbuffer[1])
jack_ringbuffer_free(jd->ringbuffer[1]);
free(jd); free(jd);
audioOutput->data = NULL; audioOutput->data = NULL;
} }
@ -78,13 +96,9 @@ static void freeJackData(AudioOutput *audioOutput)
static void jack_finishDriver(AudioOutput *audioOutput) static void jack_finishDriver(AudioOutput *audioOutput)
{ {
JackData *jd = audioOutput->data;
int i; int i;
if ( jd && jd->client ) { freeJackData(audioOutput);
jack_deactivate(jd->client);
jack_client_close(jd->client);
}
DEBUG("disconnect_jack (pid=%d)\n", getpid ()); DEBUG("disconnect_jack (pid=%d)\n", getpid ());
if ( strcmp(name, "mpd") ) { if ( strcmp(name, "mpd") ) {
@ -98,8 +112,6 @@ static void jack_finishDriver(AudioOutput *audioOutput)
free(output_ports[i]); free(output_ports[i]);
output_ports[i] = NULL; output_ports[i] = NULL;
} }
freeJackData(audioOutput);
} }
static int srate(mpd_unused jack_nframes_t rate, void *data) static int srate(mpd_unused jack_nframes_t rate, void *data)
@ -340,7 +352,7 @@ static int jack_openDevice(AudioOutput *audioOutput)
} }
if (jd->client == NULL && connect_jack(audioOutput) < 0) { if (jd->client == NULL && connect_jack(audioOutput) < 0) {
freeJackData(audioOutput); freeJackClient(jd);
audioOutput->open = 0; audioOutput->open = 0;
return -1; return -1;
} }
@ -378,7 +390,7 @@ static int jack_playAudio(AudioOutput * audioOutput,
if ( jd->shutdown ) { if ( jd->shutdown ) {
ERROR("Refusing to play, because there is no client thread.\n"); ERROR("Refusing to play, because there is no client thread.\n");
freeJackData(audioOutput); freeJackClient(jd);
audioOutput->open = 0; audioOutput->open = 0;
return 0; return 0;
} }