aboutsummaryrefslogtreecommitdiffstats
path: root/src/output
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-09-17 20:10:26 +0200
committerMax Kellermann <max@duempel.org>2011-09-17 20:10:26 +0200
commit950772ab8af782e6597173344746e40593adffa9 (patch)
tree8eadb43a2a868f6e6fd050d3a27b2274ca31c9fd /src/output
parent0bd0e2a3ec3d0534588d7cc9926ad4575cf18b60 (diff)
downloadmpd-950772ab8af782e6597173344746e40593adffa9.tar.gz
mpd-950772ab8af782e6597173344746e40593adffa9.tar.xz
mpd-950772ab8af782e6597173344746e40593adffa9.zip
output/roar: reorder methods
Diffstat (limited to 'src/output')
-rw-r--r--src/output/roar_output_plugin.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/output/roar_output_plugin.c b/src/output/roar_output_plugin.c
index 96e0d34a5..2707d33ec 100644
--- a/src/output/roar_output_plugin.c
+++ b/src/output/roar_output_plugin.c
@@ -126,20 +126,6 @@ roar_init(G_GNUC_UNUSED const struct audio_format *audio_format,
}
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_t * self = data;
@@ -218,6 +204,20 @@ roar_open(void *data, struct audio_format *audio_format, GError **error)
}
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_t * self = data;