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_xvidix.c | |
parent | 2dd4906d55f40e25dbef3a1c1660aa84b445d7a1 (diff) |
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_xvidix.c')
-rw-r--r-- | libvo/vo_xvidix.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c index 9bb65415ae..e8360e7266 100644 --- a/libvo/vo_xvidix.c +++ b/libvo/vo_xvidix.c @@ -240,23 +240,11 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, title = "MPlayer VIDIX X11 Overlay"; - panscan_init(); - image_height = height; image_width = width; image_format = format; vo_mouse_autohide = 1; - aspect_save_orig(width, height); - aspect_save_prescale(d_width, d_height); - aspect_save_screenres(vo_screenwidth, vo_screenheight); - - vo_dx = 0; - vo_dy = 0; - 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); window_width = d_width; window_height = d_height; @@ -288,11 +276,6 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, } mp_msg(MSGT_VO, MSGL_V, "Using colorkey: %x\n", colorkey); - aspect(&d_width, &d_height, A_NOZOOM); - - vo_dwidth = d_width; - vo_dheight = d_height; - #ifdef HAVE_NEW_GUI if (use_gui) guiGetEvent(guiSetShVideo, 0); // the GUI will set up / resize the window @@ -556,6 +539,10 @@ static int control(uint32_t request, void *data, ...) return vidix_control(request, data, value); } + case VOCTRL_UPDATE_SCREENINFO: + aspect_save_screenres(vo_screenwidth, vo_screenheight); + return VO_TRUE; + } return vidix_control(request, data); // return VO_NOTIMPL; |