[MPlayer-cvslog] r29567 - trunk/libvo/vo_gl2.c

[reimar]

Author: reimar
Date: Thu Aug 27 20:42:08 2009
New Revision: 29567

Log:
Make gl2 code capable of windowed aspect and panscan (no user option to enable it yet though).

Modified:
   trunk/libvo/vo_gl2.c

Modified: trunk/libvo/vo_gl2.c
==============================================================================
--- trunk/libvo/vo_gl2.c	Thu Aug 27 20:36:51 2009	(r29566)
+++ trunk/libvo/vo_gl2.c	Thu Aug 27 20:42:08 2009	(r29567)
@@ -421,10 +421,10 @@ static void drawTextureDisplay (void)
 
 static void resize(int x,int y){
   mp_msg(MSGT_VO,MSGL_V,"[gl2] Resize: %dx%d\n",x,y);
-  if( vo_fs ) {
+  if(aspect_scaling()) {
     glClear(GL_COLOR_BUFFER_BIT);
-    aspect(&x, &y, A_ZOOM);
-    panscan_calc();
+    aspect(&x, &y, A_WINZOOM);
+    panscan_calc_windowed();
     x += vo_panscan_x;
     y += vo_panscan_y;
     glViewport( (vo_dwidth-x)/2, (vo_dheight-y)/2, x, y);
@@ -738,7 +738,7 @@ flip_page(void)
   glFinish();
   swapGlBuffers();
 
-  if (vo_fs) // Avoid flickering borders in fullscreen mode
+  if (aspect_scaling()) // Avoid flickering borders in fullscreen mode
     glClear (GL_COLOR_BUFFER_BIT);
 }