diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-17 20:58:55 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-02-17 20:58:55 +0000 |
commit | 0fe4207dfba3a8b28db86522d2b5b78df7379a5e (patch) | |
tree | 3642096439ed21dc9ac5a02e71f721cad3832457 /libvo/vo_xv.c | |
parent | 2dd4906d55f40e25dbef3a1c1660aa84b445d7a1 (diff) | |
download | mpv-0fe4207dfba3a8b28db86522d2b5b78df7379a5e.tar.bz2 mpv-0fe4207dfba3a8b28db86522d2b5b78df7379a5e.tar.xz |
Move common vo initialization code to video_out.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22250 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_xv.c')
-rw-r--r-- | libvo/vo_xv.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 2aff1742b1..ecd5e24817 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -168,11 +168,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, static uint32_t vm_height; #endif - panscan_init(); - - aspect_save_orig(width, height); - aspect_save_prescale(d_width, d_height); - image_height = height; image_width = width; image_format = format; @@ -190,17 +185,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, int_pause = 0; visible_buf = -1; - update_xinerama_info(); - aspect(&d_width, &d_height, A_NOZOOM); - vo_dx = (vo_screenwidth - d_width) / 2; - vo_dy = (vo_screenheight - d_height) / 2; - geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth, - vo_screenheight); - vo_dx += xinerama_x; - vo_dy += xinerama_y; - vo_dwidth = d_width; - vo_dheight = d_height; - #ifdef HAVE_XF86VM if (flags & VOFLAG_MODESWITCHING) vm = 1; @@ -1004,6 +988,9 @@ static int control(uint32_t request, void *data, ...) case VOCTRL_ONTOP: vo_x11_ontop(); return VO_TRUE; + case VOCTRL_UPDATE_SCREENINFO: + update_xinerama_info(); + return VO_TRUE; } return VO_NOTIMPL; } |