Simplify vo_vm_switch and vo_vm_close, everyone was using the (almost) same

boiler-plate code with them, just with different bugs.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27924 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 2 insertions, 12 deletions

diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index 41de2c7e95..af5dcfb0a8 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -377,17 +377,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
 #ifdef CONFIG_XF86VM
         if (vm)
         {
-            if ((d_width == 0) && (d_height == 0))
-            {
-                vm_width = image_width;
-                vm_height = image_height;
-            } else
-            {
-                vm_width = d_width;
-                vm_height = d_height;
-            }
-            vo_vm_switch(vm_width, vm_height, &modeline_width,
-                         &modeline_height);
+            vo_vm_switch();
         }
 #endif
         bg = WhitePixel(mDisplay, mScreen);
@@ -704,7 +694,7 @@ static void uninit(void)
     freeMyXImage();
 
 #ifdef CONFIG_XF86VM
-    vo_vm_close(mDisplay);
+    vo_vm_close();
 #endif
 
     zoomFlag = 0;