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_gl2.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_gl2.c')
-rw-r--r-- | libvo/vo_gl2.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index d50ae88b15..7719e4e118 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -738,8 +738,6 @@ static int config_glx(uint32_t width, uint32_t height, uint32_t d_width, uint32_ #ifdef HAVE_NEW_GUI static int config_glx_gui(uint32_t d_width, uint32_t d_height) { - vo_dwidth = d_width; - vo_dheight = d_height; guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window return 0; } @@ -810,19 +808,6 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin int_pause = 0; - panscan_init(); - aspect_save_orig(width,height); - aspect_save_prescale(d_width,d_height); - update_xinerama_info(); - - aspect(&d_width,&d_height,A_NOZOOM); - vo_dx = (int)(vo_screenwidth - d_width) / 2; - vo_dy = (int)(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; - #ifdef HAVE_NEW_GUI if (use_gui) { if (config_glx_gui(d_width, d_height) == -1) @@ -1142,6 +1127,9 @@ static int control(uint32_t request, void *data, ...) return vo_x11_get_equalizer(data, value); } #endif + case VOCTRL_UPDATE_SCREENINFO: + update_xinerama_info(); + return VO_TRUE; } return VO_NOTIMPL; } |