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

output/pulse: use _delete_context()

Browse Source 
Eliminate duplicate code.
This commit is contained in:
Max Kellermann 2011-08-31 20:58:36 +02:00
parent 3d12d7de62
commit 042c1abc6e
1 changed files with 15 additions and 16 deletions

31
src/output/pulse_output_plugin.c

@ -224,6 +224,20 @@ pulse_output_connect(struct pulse_output *po, GError **error_r)
return true; return true;
} }
/**
* Frees and clears the context.
*/
static void
pulse_output_delete_context(struct pulse_output *po)
{
assert(po != NULL);
assert(po->context != NULL);
pa_context_disconnect(po->context);
pa_context_unref(po->context);
po->context = NULL;
}
/** /**
* Create, set up and connect a context. * Create, set up and connect a context.
* *
@ -249,28 +263,13 @@ pulse_output_setup_context(struct pulse_output *po, GError **error_r)
pulse_output_subscribe_cb, po); pulse_output_subscribe_cb, po);
if (!pulse_output_connect(po, error_r)) { if (!pulse_output_connect(po, error_r)) {
pa_context_unref(po->context); pulse_output_delete_context(po);
po->context = NULL;
return false; return false;
} }
return true; return true;
} }
/**
* Frees and clears the context.
*/
static void
pulse_output_delete_context(struct pulse_output *po)
{
assert(po != NULL);
assert(po->context != NULL);
pa_context_disconnect(po->context);
pa_context_unref(po->context);
po->context = NULL;
}
static void * static void *
pulse_output_init(G_GNUC_UNUSED const struct audio_format *audio_format, pulse_output_init(G_GNUC_UNUSED const struct audio_format *audio_format,
const struct config_param *param, const struct config_param *param,