oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/raop: move code to raop_output_remove()

Browse Source
This commit is contained in:
Max Kellermann
2011-08-30 21:56:57 +02:00
parent 9592c0b466
commit 210b6c38bd
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/output/raop_output_plugin.c
View File

@@ -737,11 +737,13 @@ raop_output_pause(void *data)
return true; return true;
} }
/**
* Remove the output from the session's list. Caller must not lock
* the list_mutex.
*/
static void 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 *iter = raop_session->raop_list;
struct raop_data *prev = NULL; struct raop_data *prev = NULL;
@@ -771,6 +773,15 @@ raop_output_close(void *data)
iter = iter->next; iter = iter->next;
} }
g_mutex_unlock(raop_session->list_mutex); 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); g_mutex_lock(rd->control_mutex);
exec_request(rd->rtspcl, "TEARDOWN", NULL, NULL, 0, exec_request(rd->rtspcl, "TEARDOWN", NULL, NULL, 0,