From 092de8005d80e1286a8181bba0d5a52b0f0d1a0f Mon Sep 17 00:00:00 2001
From: attila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 15 Oct 2003 15:17:09 +0000
Subject: fix aspect hack now geometry sets geometry_wh_changed when either
 width or height is changed. aspect is still preserved in fullscreen

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11126 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/aspect.c   |  4 +++-
 libvo/geometry.c | 23 +++++++++++++++--------
 libvo/geometry.h |  1 +
 3 files changed, 19 insertions(+), 9 deletions(-)

(limited to 'libvo')

diff --git a/libvo/aspect.c b/libvo/aspect.c
index 26b665fb35..c89b92a0ab 100644
--- a/libvo/aspect.c
+++ b/libvo/aspect.c
@@ -1,5 +1,6 @@
 /* Stuff for correct aspect scaling. */
 #include "aspect.h"
+#include "geometry.h"
 #ifndef ASPECT_TEST
 #include "../mp_msg.h"
 #endif
@@ -60,12 +61,13 @@ void aspect_save_screenres(int scrw, int scrh){
 void aspect(int *srcw, int *srch, int zoom){
   int tmpw;
 
-  if(!zoom && movie_aspect == 0) {
+  if( !zoom && geometry_wh_changed ) {
 #ifdef ASPECT_DEBUG
     printf("aspect(0) no aspect forced!\n");
 #endif
     return; // the user doesn't want to fix aspect
   }
+
 #ifdef ASPECT_DEBUG
   printf("aspect(0) fitin: %dx%d zoom: %d screenaspect: %.2f\n",aspdat.scrw,aspdat.scrh,
       zoom,monitor_aspect);
diff --git a/libvo/geometry.c b/libvo/geometry.c
index 8c24d7b6cb..e8aafcbe5d 100644
--- a/libvo/geometry.c
+++ b/libvo/geometry.c
@@ -7,6 +7,8 @@
 
 /* A string of the form [WxH][+X+Y] or xpos[%]:ypos[%] */
 char *vo_geometry = NULL;
+// set when either width or height is changed
+int geometry_wh_changed = 0;
 
 #define RESET_GEOMETRY width = height = xoff = yoff = xper = yper = -1;
 
@@ -69,15 +71,20 @@ int geometry(int *xpos, int *ypos, int *widw, int *widh, int scrw, int scrh)
 		  " widh: %i, scrw: %i, scrh: %i\n",*widw, *widh, scrw, scrh);
 		  
 		/* FIXME: better checking of bounds... */
-		if(width < 0 || width > scrw) width = (scrw < *widw) ? scrw : *widw;
-		if(height < 0 || height > scrh) height = (scrh < *widh) ? scrh : *widh;
-		if(xoff < 0 || xoff + width > scrw) xoff = 0;
-		if(yoff < 0 || yoff + height > scrh) yoff = 0;
+		if( width != -1 && (width < 0 || width > scrw))
+		    width = (scrw < *widw) ? scrw : *widw;
+		if( height != -1 && (height < 0 || height > scrh))
+		    height = (scrh < *widh) ? scrh : *widh;
+		if(xoff != -1 && (xoff < 0 || xoff + width > scrw)) xoff = 0;
+		if(yoff != -1 && (yoff < 0 || yoff + height > scrh)) yoff = 0;
 
-		if(xpos) *xpos = xoff;
-		if(ypos) *ypos = yoff;
-		if(widw) *widw = width;
-		if(widh) *widh = height;
+		if(xoff != -1 && xpos) *xpos = xoff;
+		if(yoff != -1 && ypos) *ypos = yoff;
+		if(width != -1 && widw) *widw = width;
+		if(height != -1 && widh) *widh = height;
+
+		if( width != -1 || height != -1)
+		    geometry_wh_changed = 1;
         }
 	return 1;
 }
diff --git a/libvo/geometry.h b/libvo/geometry.h
index 78a6626668..dab4aa5208 100644
--- a/libvo/geometry.h
+++ b/libvo/geometry.h
@@ -3,5 +3,6 @@
 #define __GEOMETRY_H
 
 extern char *vo_geometry;
+extern int geometry_wh_changed;
 int geometry(int *xpos, int *ypos, int *widw, int *widh, int scrw, int scrh);
 #endif /* !__GEOMETRY_H */
-- 
cgit v1.2.3