diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | src/output_control.c | 19 | ||||
| -rw-r--r-- | src/output_finish.c | 52 | ||||
| -rw-r--r-- | src/output_internal.h | 3 | ||||
| -rw-r--r-- | test/run_output.c | 3 |
5 files changed, 60 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am index dae71c209..5baffd018 100644 --- a/Makefile.am +++ b/Makefile.am @@ -713,6 +713,7 @@ OUTPUT_API_SRC = \ src/output_state.c \ src/output_print.c \ src/output_command.c \ + src/output_finish.c \ src/output_init.c OUTPUT_SRC = \ @@ -1133,7 +1134,7 @@ test_run_output_SOURCES = test/run_output.c \ src/fifo_buffer.c \ src/page.c \ src/socket_util.c \ - src/output_init.c src/output_list.c \ + src/output_init.c src/output_finish.c src/output_list.c \ $(ENCODER_SRC) \ src/mixer_api.c \ src/mixer_control.c \ diff --git a/src/output_control.c b/src/output_control.c index 8efe08f05..22c63b822 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); } 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); +} diff --git a/src/output_internal.h b/src/output_internal.h index 384b8791f..873ec8532 100644 --- a/src/output_internal.h +++ b/src/output_internal.h @@ -245,4 +245,7 @@ audio_output_command_is_finished(const struct audio_output *ao) return ao->command == AO_COMMAND_NONE; } +void +audio_output_destruct(struct audio_output *ao); + #endif diff --git a/test/run_output.c b/test/run_output.c index 59a14fae3..c1d7a8120 100644 --- a/test/run_output.c +++ b/test/run_output.c @@ -233,8 +233,7 @@ int main(int argc, char **argv) /* cleanup and exit */ - ao_plugin_finish(ao.plugin, ao.data); - g_mutex_free(ao.mutex); + audio_output_destruct(&ao); io_thread_deinit(); |