Commit 950772ab authored by Max Kellermann's avatar Max Kellermann

output/roar: reorder methods

parent 0bd0e2a3
...@@ -126,20 +126,6 @@ roar_init(G_GNUC_UNUSED const struct audio_format *audio_format, ...@@ -126,20 +126,6 @@ roar_init(G_GNUC_UNUSED const struct audio_format *audio_format,
} }
static void static void
roar_close(void *data)
{
roar_t * self = data;
g_mutex_lock(self->lock);
self->alive = false;
if (self->vss != NULL)
roar_vs_close(self->vss, ROAR_VS_TRUE, &(self->err));
self->vss = NULL;
roar_disconnect(&(self->con));
g_mutex_unlock(self->lock);
}
static void
roar_finish(void *data) roar_finish(void *data)
{ {
roar_t * self = data; roar_t * self = data;
...@@ -218,6 +204,20 @@ roar_open(void *data, struct audio_format *audio_format, GError **error) ...@@ -218,6 +204,20 @@ roar_open(void *data, struct audio_format *audio_format, GError **error)
} }
static void static void
roar_close(void *data)
{
roar_t * self = data;
g_mutex_lock(self->lock);
self->alive = false;
if (self->vss != NULL)
roar_vs_close(self->vss, ROAR_VS_TRUE, &(self->err));
self->vss = NULL;
roar_disconnect(&(self->con));
g_mutex_unlock(self->lock);
}
static void
roar_cancel(void *data) roar_cancel(void *data)
{ {
roar_t * self = data; roar_t * self = data;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment