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 /libmpcodecs | |
| 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 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd.c | 5 | ||||
| -rw-r--r-- | libmpcodecs/vf_vo.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 21c940b9be..564ad2a911 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -321,9 +321,8 @@ int mpcodecs_config_vo2(sh_video_t *sh, int w, int h, // Time to config libvo! mp_msg(MSGT_CPLAYER, MSGL_V, - "VO Config (%dx%d->%dx%d,flags=%d,'%s',0x%X)\n", sh->disp_w, - sh->disp_h, screen_size_x, screen_size_y, vocfg_flags, "MPlayer", - out_fmt); + "VO Config (%dx%d->%dx%d,flags=%d,0x%X)\n", sh->disp_w, + sh->disp_h, screen_size_x, screen_size_y, vocfg_flags, out_fmt); vf->w = sh->disp_w; vf->h = sh->disp_h; diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c index 9e2612654c..499184d37f 100644 --- a/libmpcodecs/vf_vo.c +++ b/libmpcodecs/vf_vo.c @@ -79,7 +79,7 @@ static int config(struct vf_instance *vf, vf->default_caps=query_format(vf,outfmt); vf->draw_slice = (vf->default_caps & VOCAP_NOSLICES) ? NULL : draw_slice; - if (vo_config(video_out, width, height, d_width, d_height, flags, "MPlayer", outfmt)) + if (vo_config(video_out, width, height, d_width, d_height, flags, outfmt)) return 0; #ifdef CONFIG_ASS |