From 210b6c38bd945fd2d1a18c9e8f965b6dc6bc5ecb Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 30 Aug 2011 21:56:57 +0200 Subject: output/raop: move code to raop_output_remove() --- src/output/raop_output_plugin.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'src/output/raop_output_plugin.c') diff --git a/src/output/raop_output_plugin.c b/src/output/raop_output_plugin.c index 7ff5b009a..5e4a9b4f7 100644 --- a/src/output/raop_output_plugin.c +++ b/src/output/raop_output_plugin.c @@ -737,11 +737,13 @@ raop_output_pause(void *data) return true; } +/** + * Remove the output from the session's list. Caller must not lock + * the list_mutex. + */ static void -raop_output_close(void *data) +raop_output_remove(struct raop_data *rd) { - //teardown - struct raop_data *rd = data; struct raop_data *iter = raop_session->raop_list; struct raop_data *prev = NULL; @@ -771,6 +773,15 @@ raop_output_close(void *data) iter = iter->next; } g_mutex_unlock(raop_session->list_mutex); +} + +static void +raop_output_close(void *data) +{ + //teardown + struct raop_data *rd = data; + + raop_output_remove(rd); g_mutex_lock(rd->control_mutex); exec_request(rd->rtspcl, "TEARDOWN", NULL, NULL, 0, -- cgit v1.2.3