RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo: simplify event_fd handling 

Add the event FD after preinit, remove it before destroy. There's no
need to do it on vo_config, and there's no need to remove the event
FD when vo_config fails.
This commit is contained in:
wm4 2014-04-22 21:06:23 +02:00
parent e156f8b052
commit a45363a28a
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
video/out/vo.c
View File

@ -142,6 +142,13 @@ const struct m_obj_list vo_obj_list = {
.allow_trailer = true, .allow_trailer = true,
}; };
static int event_fd_callback(void *ctx, int fd)
{
struct vo *vo = ctx;
vo_check_events(vo);
return MP_INPUT_NOTHING;
}
static struct vo *vo_create(struct mpv_global *global, static struct vo *vo_create(struct mpv_global *global,
struct input_ctx *input_ctx, struct input_ctx *input_ctx,
struct encode_lavc_context *encode_lavc_ctx, struct encode_lavc_context *encode_lavc_ctx,
@ -163,7 +170,6 @@ static struct vo *vo_create(struct mpv_global *global,
.encode_lavc_ctx = encode_lavc_ctx, .encode_lavc_ctx = encode_lavc_ctx,
.input_ctx = input_ctx, .input_ctx = input_ctx,
.event_fd = -1, .event_fd = -1,
.registered_fd = -1,
.monitor_par = 1, .monitor_par = 1,
.next_pts = MP_NOPTS_VALUE, .next_pts = MP_NOPTS_VALUE,
.next_pts2 = MP_NOPTS_VALUE, .next_pts2 = MP_NOPTS_VALUE,
@ -179,6 +185,10 @@ static struct vo *vo_create(struct mpv_global *global,
vo->priv = config->optstruct; vo->priv = config->optstruct;
if (vo->driver->preinit(vo)) if (vo->driver->preinit(vo))
goto error; goto error;
if (vo->event_fd != -1) {
mp_input_add_fd(vo->input_ctx, vo->event_fd, 1, NULL, event_fd_callback,
NULL, vo);
}
return vo; return vo;
error: error:
talloc_free(vo); talloc_free(vo);
@ -216,8 +226,8 @@ autoprobe:
void vo_destroy(struct vo *vo) void vo_destroy(struct vo *vo)
{ {
if (vo->registered_fd != -1) if (vo->event_fd != -1)
mp_input_rm_key_fd(vo->input_ctx, vo->registered_fd); mp_input_rm_key_fd(vo->input_ctx, vo->event_fd);
mp_image_unrefp(&vo->waiting_mpi); mp_image_unrefp(&vo->waiting_mpi);
vo->driver->uninit(vo); vo->driver->uninit(vo);
talloc_free(vo); talloc_free(vo);
@ -295,13 +305,6 @@ static void determine_window_geometry(struct vo *vo, int d_w, int d_h)
vo->dheight = d_h; vo->dheight = d_h;
} }
static int event_fd_callback(void *ctx, int fd)
{
struct vo *vo = ctx;
vo_check_events(vo);
return MP_INPUT_NOTHING;
}
static void check_vo_caps(struct vo *vo) static void check_vo_caps(struct vo *vo)
{ {
int rot = vo->params->rotate; int rot = vo->params->rotate;
@ -342,11 +345,6 @@ int vo_reconfig(struct vo *vo, struct mp_image_params *params, int flags)
talloc_free(vo->params); talloc_free(vo->params);
vo->params = NULL; vo->params = NULL;
} }
if (vo->registered_fd == -1 && vo->event_fd != -1 && vo->config_ok) {
mp_input_add_fd(vo->input_ctx, vo->event_fd, 1, NULL, event_fd_callback,
NULL, vo);
vo->registered_fd = vo->event_fd;
}
vo->frame_loaded = false; vo->frame_loaded = false;
vo->waiting_mpi = NULL; vo->waiting_mpi = NULL;
vo->redrawing = false; vo->redrawing = false;
@ -451,12 +449,6 @@ void vo_flip_page(struct vo *vo, int64_t pts_us, int duration)
void vo_check_events(struct vo *vo) void vo_check_events(struct vo *vo)
{ {
if (!vo->config_ok) {
if (vo->registered_fd != -1)
mp_input_rm_key_fd(vo->input_ctx, vo->registered_fd);
vo->registered_fd = -1;
return;
}
vo_control(vo, VOCTRL_CHECK_EVENTS, NULL); vo_control(vo, VOCTRL_CHECK_EVENTS, NULL);
} }

1
video/out/vo.h
View File

@ -249,7 +249,6 @@ struct vo {
struct encode_lavc_context *encode_lavc_ctx; struct encode_lavc_context *encode_lavc_ctx;
struct input_ctx *input_ctx; struct input_ctx *input_ctx;
int event_fd; // check_events() should be called when this has input int event_fd; // check_events() should be called when this has input
int registered_fd; // set to event_fd when registered in input system
// requested position/resolution (usually window position/window size) // requested position/resolution (usually window position/window size)
int dx; int dx;