aboutsummaryrefslogtreecommitdiffstats
path: root/src/output_finish.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-08-30 22:28:15 +0200
committerMax Kellermann <max@duempel.org>2011-08-30 22:28:15 +0200
commit293836494de519769af8d672becd2e4e6f8fb0ef (patch)
tree52d9ddf419c41dd43d14b907ca0693b2e4dde053 /src/output_finish.c
parentae8bda190ec94b52ac927b40fe88d80dbd0ba530 (diff)
downloadmpd-293836494de519769af8d672becd2e4e6f8fb0ef.tar.gz
mpd-293836494de519769af8d672becd2e4e6f8fb0ef.tar.xz
mpd-293836494de519769af8d672becd2e4e6f8fb0ef.zip
output_control: move code to audio_output_destruct()
.. and destruct the output object properly in test/run_output.
Diffstat (limited to 'src/output_finish.c')
-rw-r--r--src/output_finish.c52
1 files changed, 52 insertions, 0 deletions
diff --git a/src/output_finish.c b/src/output_finish.c
new file mode 100644
index 000000000..ac7f7e0c2
--- /dev/null
+++ b/src/output_finish.c
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "output_internal.h"
+#include "output_plugin.h"
+#include "mixer_control.h"
+#include "filter_plugin.h"
+
+#include <assert.h>
+
+void
+audio_output_destruct(struct audio_output *ao)
+{
+ assert(!ao->open);
+ assert(ao->fail_timer == NULL);
+ assert(ao->thread == NULL);
+
+ if (ao->mixer != NULL)
+ mixer_free(ao->mixer);
+
+ ao_plugin_finish(ao->plugin, ao->data);
+
+ g_cond_free(ao->cond);
+ g_mutex_free(ao->mutex);
+
+ if (ao->replay_gain_filter != NULL)
+ filter_free(ao->replay_gain_filter);
+
+ if (ao->other_replay_gain_filter != NULL)
+ filter_free(ao->other_replay_gain_filter);
+
+ filter_free(ao->filter);
+
+ pcm_buffer_deinit(&ao->cross_fade_buffer);
+}