summaryrefslogtreecommitdiffstats
path: root/video/out/vo.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-12-06 18:39:09 +0100
committerwm4 <wm4@nowhere>2015-12-06 18:41:31 +0100
commit9db50c6760758089a013983f0fbf93ebde53dbc7 (patch)
treeb37322cdb821fdfea5e3efe190fd25b593cfdbd1 /video/out/vo.c
parent970606e49198594c243edf4a85c426693676f6a3 (diff)
downloadmpv-9db50c6760758089a013983f0fbf93ebde53dbc7.tar.bz2
mpv-9db50c6760758089a013983f0fbf93ebde53dbc7.tar.xz
vo: get rid of vo_get_window_title()
It always was a weird artifact - VOCTRLs are meant _not_ to require special handling in the code that passes them through (like in vo.c). Removing it is also interesting to further reduce the dependency of backends on struct vo. Just get rid of it. Removing it is somewhat inconvenient, because in many situations the UI window is created after the first VOCTRL_UPDATE_WINDOW_TITLE. This means these backends have to store it in a new field in their own context.
Diffstat (limited to 'video/out/vo.c')
-rw-r--r--video/out/vo.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/video/out/vo.c b/video/out/vo.c
index 4364b5d7f2..6318ac7dc5 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -166,9 +166,6 @@ struct vo_internal {
int req_frames; // VO's requested value of num_frames
double display_fps;
-
- // --- The following fields can be accessed from the VO thread only
- char *window_title;
};
static void forget_frames(struct vo *vo);
@@ -550,8 +547,6 @@ static void run_control(void *p)
struct vo *vo = pp[0];
uint32_t request = *(int *)pp[1];
void *data = pp[2];
- if (request == VOCTRL_UPDATE_WINDOW_TITLE) // legacy fallback
- vo->in->window_title = talloc_strdup(vo, data);
int ret = vo->driver->control(vo, request, data);
*(int *)pp[3] = ret;
}
@@ -1063,18 +1058,6 @@ void vo_get_src_dst_rects(struct vo *vo, struct mp_rect *out_src,
out_src, out_dst, out_osd);
}
-// Return the window title the VO should set. Always returns a null terminated
-// string. The string is valid until frontend code is invoked again. Copy it if
-// you need to keep the string for an extended period of time.
-// Must be called from the VO thread only.
-// Don't use for new code.
-const char *vo_get_window_title(struct vo *vo)
-{
- if (!vo->in->window_title)
- vo->in->window_title = talloc_strdup(vo, "");
- return vo->in->window_title;
-}
-
// flip_page[_timed] will be called offset_us microseconds too early.
// (For vo_vdpau, which does its own timing.)
// num_req_frames set the requested number of requested vo_frame.frames.