mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Code

audio/out/push: clean up properly on init error

Browse Source 
Close the wakeup pipes, free the mutex and condition var.
This commit is contained in:
wm4 2014-09-27 04:54:17 +02:00
parent e79de41b97
commit 650af29471
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
audio/out/push.c
View File

@ -364,6 +364,20 @@ static void *playthread(void *arg)
return NULL; return NULL;
} }
static void destroy_no_thread(struct ao *ao)
{
struct ao_push_state *p = ao->api_priv;
ao->driver->uninit(ao);
for (int n = 0; n < 2; n++)
close(p->wakeup_pipe[n]);
pthread_cond_destroy(&p->wakeup);
pthread_cond_destroy(&p->wakeup_drain);
pthread_mutex_destroy(&p->lock);
}
static void uninit(struct ao *ao) static void uninit(struct ao *ao)
{ {
struct ao_push_state *p = ao->api_priv; struct ao_push_state *p = ao->api_priv;
@ -375,14 +389,7 @@ static void uninit(struct ao *ao)
pthread_join(p->thread, NULL); pthread_join(p->thread, NULL);
ao->driver->uninit(ao); destroy_no_thread(ao);
for (int n = 0; n < 2; n++)
close(p->wakeup_pipe[n]);
pthread_cond_destroy(&p->wakeup);
pthread_cond_destroy(&p->wakeup_drain);
pthread_mutex_destroy(&p->lock);
} }
static int init(struct ao *ao) static int init(struct ao *ao)
@ -407,7 +414,7 @@ static int init(struct ao *ao)
goto err; goto err;
return 0; return 0;
err: err:
ao->driver->uninit(ao); destroy_no_thread(ao);
return -1; return -1;
} }