1 files changed, 69 insertions, 77 deletions

diff --git a/libvo/aspect.c b/libvo/aspect.c
index 9ddc105aee..1b1e5857f3 100644
--- a/libvo/aspect.c
+++ b/libvo/aspect.c
@@ -19,9 +19,11 @@
 /* Stuff for correct aspect scaling. */
 #include "aspect.h"
 #include "geometry.h"
+#include "video_out.h"
 //#ifndef ASPECT_TEST
 #include "mp_msg.h"
 #include "help_mp.h"
+#include "options.h"
 //#endif
 
 //#define ASPECT_DEBUG
@@ -30,157 +32,147 @@
 #include <stdio.h>
 #endif
 
-int vo_panscan_x = 0;
-int vo_panscan_y = 0;
-float vo_panscan_amount = 0;
-float vo_panscanrange = 1.0;
-
 #include "video_out.h"
 
-float force_monitor_aspect=0;
-float monitor_aspect=0;
-float monitor_pixel_aspect=1;
-
-static struct {
-  int orgw; // real width
-  int orgh; // real height
-  int prew; // prescaled width
-  int preh; // prescaled height
-  int scrw; // horizontal resolution
-  int scrh; // vertical resolution
-  float asp;
-} aspdat;
-
-void aspect_save_orig(int orgw, int orgh){
+void aspect_save_orig(struct vo *vo, int orgw, int orgh)
+{
 #ifdef ASPECT_DEBUG
   printf("aspect_save_orig %dx%d \n",orgw,orgh);
 #endif
-  aspdat.orgw = orgw;
-  aspdat.orgh = orgh;
+    vo->aspdat.orgw = orgw;
+    vo->aspdat.orgh = orgh;
 }
 
-void aspect_save_prescale(int prew, int preh){
+void aspect_save_prescale(struct vo *vo, int prew, int preh)
+{
 #ifdef ASPECT_DEBUG
   printf("aspect_save_prescale %dx%d \n",prew,preh);
 #endif
-  aspdat.prew = prew;
-  aspdat.preh = preh;
+    vo->aspdat.prew = prew;
+    vo->aspdat.preh = preh;
 }
 
-void aspect_save_screenres(int scrw, int scrh){
+void aspect_save_screenres(struct vo *vo, int scrw, int scrh)
+{
 #ifdef ASPECT_DEBUG
   printf("aspect_save_screenres %dx%d \n",scrw,scrh);
 #endif
-  aspdat.scrw = scrw;
-  aspdat.scrh = scrh;
-  if (force_monitor_aspect)
-    monitor_aspect = force_monitor_aspect;
-  else
-    monitor_aspect = monitor_pixel_aspect * scrw / scrh;
+    struct MPOpts *opts = vo->opts;
+    vo->aspdat.scrw = scrw;
+    vo->aspdat.scrh = scrh;
+    if (opts->force_monitor_aspect)
+        vo->monitor_aspect = opts->force_monitor_aspect;
+    else
+        vo->monitor_aspect = opts->monitor_pixel_aspect * scrw / scrh;
 }
 
 /* aspect is called with the source resolution and the
  * resolution, that the scaled image should fit into
  */
 
-void aspect_fit(int *srcw, int *srch, int fitw, int fith){
+void aspect_fit(struct vo *vo, int *srcw, int *srch, int fitw, int fith)
+{
+    struct aspect_data *aspdat = &vo->aspdat;
   int tmpw;
 
 #ifdef ASPECT_DEBUG
-  printf("aspect(0) fitin: %dx%d screenaspect: %.2f\n",aspdat.scrw,aspdat.scrh,
+  printf("aspect(0) fitin: %dx%d screenaspect: %.2f\n",aspdat->scrw,aspdat->scrh,
       monitor_aspect);
-  printf("aspect(1) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat.prew,aspdat.preh);
+  printf("aspect(1) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat->prew,aspdat->preh);
 #endif
     *srcw = fitw;
-    *srch = (int)(((float)fitw / (float)aspdat.prew * (float)aspdat.preh)
-               * ((float)aspdat.scrh / ((float)aspdat.scrw / monitor_aspect)));
+    *srch = (int)(((float)fitw / (float)aspdat->prew * (float)aspdat->preh)
+               * ((float)aspdat->scrh / ((float)aspdat->scrw / vo->monitor_aspect)));
   *srch+= *srch%2; // round
 #ifdef ASPECT_DEBUG
-  printf("aspect(2) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat.prew,aspdat.preh);
+  printf("aspect(2) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat->prew,aspdat->preh);
 #endif
-  if(*srch>fith || *srch<aspdat.orgh){
-      tmpw = (int)(((float)fith / (float)aspdat.preh * (float)aspdat.prew)
-                * ((float)aspdat.scrw / ((float)aspdat.scrh / (1.0/monitor_aspect))));
+  if(*srch>fith || *srch<aspdat->orgh){
+      tmpw = (int)(((float)fith / (float)aspdat->preh * (float)aspdat->prew)
+                * ((float)aspdat->scrw / ((float)aspdat->scrh / (1.0/vo->monitor_aspect))));
     tmpw+= tmpw%2; // round
-    if(tmpw<=fitw /*&& tmpw>=aspdat.orgw*/){
+    if(tmpw<=fitw /*&& tmpw>=aspdat->orgw*/){
       *srch = fith;
       *srcw = tmpw;
     }else{
 #ifndef ASPECT_TEST
-      mp_msg(MSGT_VO,MSGL_WARN,MSGTR_LIBVO_ASPECT_NoSuitableNewResFound);
+      mp_tmsg(MSGT_VO,MSGL_WARN,"[ASPECT] Warning: No suitable new res found!\n");
 #else
-      mp_msg(MSGT_VO,MSGL_WARN,MSGTR_LIBVO_ASPECT_NoNewSizeFoundThatFitsIntoRes);
+      mp_tmsg(MSGT_VO,MSGL_WARN,"[ASPECT] Error: No new size found that fits into res!\n");
 #endif
     }
   }
-  aspdat.asp=*srcw / (float)*srch;
+  aspdat->asp=*srcw / (float)*srch;
 #ifdef ASPECT_DEBUG
-  printf("aspect(3) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat.prew,aspdat.preh);
+  printf("aspect(3) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat->prew,aspdat->preh);
 #endif
 }
 
-static void get_max_dims(int *w, int *h, int zoom)
+static void get_max_dims(struct vo *vo, int *w, int *h, int zoom)
 {
-  *w = zoom ? aspdat.scrw : aspdat.prew;
-  *h = zoom ? aspdat.scrh : aspdat.preh;
+    struct aspect_data *aspdat = &vo->aspdat;
+  *w = zoom ? aspdat->scrw : aspdat->prew;
+  *h = zoom ? aspdat->scrh : aspdat->preh;
   if (zoom && WinID >= 0) zoom = A_WINZOOM;
   if (zoom == A_WINZOOM) {
-    *w = vo_dwidth;
-    *h = vo_dheight;
+    *w = vo->dwidth;
+    *h = vo->dheight;
   }
 }
 
-void aspect(int *srcw, int *srch, int zoom){
+void aspect(struct vo *vo, int *srcw, int *srch, int zoom)
+{
   int fitw;
   int fith;
-  get_max_dims(&fitw, &fith, zoom);
+  get_max_dims(vo, &fitw, &fith, zoom);
   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
   }
-  aspect_fit(srcw, srch, fitw, fith);
+  aspect_fit(vo, srcw, srch, fitw, fith);
 }
 
-void panscan_init( void )
+void panscan_init(struct vo *vo)
 {
- vo_panscan_x=0;
- vo_panscan_y=0;
- vo_panscan_amount=0.0f;
+    vo->panscan_x = 0;
+    vo->panscan_y = 0;
+    vo->panscan_amount = 0.0f;
 }
 
-static void panscan_calc_internal(int zoom)
+static void panscan_calc_internal(struct vo *vo, int zoom)
 {
  int fwidth,fheight;
  int vo_panscan_area;
  int max_w, max_h;
- get_max_dims(&max_w, &max_h, zoom);
-
- if (vo_panscanrange > 0) {
-   aspect(&fwidth,&fheight,zoom);
-   vo_panscan_area = max_h - fheight;
-   if (!vo_panscan_area)
-     vo_panscan_area = max_w - fwidth;
-   vo_panscan_area *= vo_panscanrange;
- } else
-   vo_panscan_area = -vo_panscanrange * max_h;
-
- vo_panscan_amount = vo_fs || zoom == A_WINZOOM ? vo_panscan : 0;
- vo_panscan_x = vo_panscan_area * vo_panscan_amount * aspdat.asp;
- vo_panscan_y = vo_panscan_area * vo_panscan_amount;
+ get_max_dims(vo, &max_w, &max_h, zoom);
+    struct MPOpts *opts = vo->opts;
+
+    if (opts->vo_panscanrange > 0) {
+        aspect(vo, &fwidth, &fheight, zoom);
+        vo_panscan_area = max_h - fheight;
+        if (!vo_panscan_area)
+            vo_panscan_area = max_w - fwidth;
+        vo_panscan_area *= opts->vo_panscanrange;
+    } else
+        vo_panscan_area = -opts->vo_panscanrange * max_h;
+
+    vo->panscan_amount = vo_fs || zoom == A_WINZOOM ? vo_panscan : 0;
+    vo->panscan_x = vo_panscan_area * vo->panscan_amount * vo->aspdat.asp;
+    vo->panscan_y = vo_panscan_area * vo->panscan_amount;
 }
 
-void panscan_calc(void)
+void panscan_calc(struct vo *vo)
 {
-  panscan_calc_internal(A_ZOOM);
+    panscan_calc_internal(vo, A_ZOOM);
 }
 
 /**
  * vos that set vo_dwidth and v_dheight correctly should call this to update
  * vo_panscan_x and vo_panscan_y
  */
-void panscan_calc_windowed(void)
+void panscan_calc_windowed(struct vo *vo)
 {
-  panscan_calc_internal(A_WINZOOM);
+    panscan_calc_internal(vo, A_WINZOOM);
 }