From 293836494de519769af8d672becd2e4e6f8fb0ef Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 30 Aug 2011 22:28:15 +0200 Subject: output_control: move code to audio_output_destruct() .. and destruct the output object properly in test/run_output. --- src/output_control.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'src/output_control.c') diff --git a/src/output_control.c b/src/output_control.c index 8efe08f0..22c63b82 100644 --- a/src/output_control.c +++ b/src/output_control.c @@ -312,23 +312,8 @@ void audio_output_finish(struct audio_output *ao) if (ao->thread != NULL) { ao_lock_command(ao, AO_COMMAND_KILL); g_thread_join(ao->thread); + 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); + audio_output_destruct(ao); } -- cgit v1.2.3