diff options
| author | wm4 <wm4@mplayer2.org> | 2011-12-06 20:23:54 +0100 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2011-12-06 20:32:33 +0100 |
| commit | d4de92e80897abb64dc8ccecb7823cbe291bb52d (patch) | |
| tree | 0686f943152165b2cab91a79287ea788083bc474 /libvo/vo_gl.c | |
| parent | 421c840b3c061de89b426244fe75237a73f765de (diff) | |
| download | mpv-d4de92e80897abb64dc8ccecb7823cbe291bb52d.tar.bz2 mpv-d4de92e80897abb64dc8ccecb7823cbe291bb52d.tar.xz | |
libvo: remove title argument from struct vo_driver.config
This affects only the "new" VO API. The config() title argument was barely
used, and it's hardcoded to "MPlayer" in vf_vo.c. The X11 and the Cocoa
GUI backends, which are the only ones properly supporting window titles,
ignored this argument. Remove the title argument.
Add the vo_get_window_title function. All GUI VOs are supposed to use it
for the window title.
Diffstat (limited to 'libvo/vo_gl.c')
| -rw-r--r-- | libvo/vo_gl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index b38a8d75e4..dbaef279d8 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -647,19 +647,19 @@ static int initGl(struct vo *vo, uint32_t d_width, uint32_t d_height) } static int create_window(struct vo *vo, uint32_t d_width, uint32_t d_height, - uint32_t flags, const char *title) + uint32_t flags) { struct gl_priv *p = vo->priv; if (p->stereo_mode == GL_3D_QUADBUFFER) flags |= VOFLAG_STEREO; - return p->glctx->create_window(p->glctx, d_width, d_height, flags, title); + return p->glctx->create_window(p->glctx, d_width, d_height, flags); } static int config(struct vo *vo, uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, - char *title, uint32_t format) + uint32_t format) { struct gl_priv *p = vo->priv; @@ -676,7 +676,7 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, p->vo_flipped = !!(flags & VOFLAG_FLIPPING); - if (create_window(vo, d_width, d_height, flags, title) < 0) + if (create_window(vo, d_width, d_height, flags) < 0) return -1; if (vo->config_count) @@ -1384,7 +1384,7 @@ static int preinit_internal(struct vo *vo, const char *arg, int allow_sw, } if (p->use_yuv == -1 || !allow_sw) { - if (create_window(vo, 320, 200, VOFLAG_HIDDEN, NULL) < 0) + if (create_window(vo, 320, 200, VOFLAG_HIDDEN) < 0) goto err_out; if (p->glctx->setGlWindow(p->glctx) == SET_WINDOW_FAILED) goto err_out; |