changeset 27966:2a7bdb921eee

Remove pointless is_cfG_finished variable. Patch by Georgi Petrov [gogothebee gmail com]
author reimar
date Sun, 23 Nov 2008 17:25:46 +0000
parents 1388c6a08a50
children ad71ce76c6ce
files libvo/vo_direct3d.c
diffstat 1 files changed, 3 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_direct3d.c	Sun Nov 23 14:57:51 2008 +0000
+++ b/libvo/vo_direct3d.c	Sun Nov 23 17:25:46 2008 +0000
@@ -52,9 +52,6 @@
 static struct global_priv {
     int is_paused;              /**< 1 = Movie is paused,
                                 0 = Movie is not paused */
-    int is_cfg_finished;        /**< Synchronization "semaphore". 1 when
-                                instance of reconfigure_d3d is finished */
-
     RECT fs_movie_rect;         /**< Rect (upscaled) of the movie when displayed
                                 in fullscreen */
     RECT fs_panscan_rect;       /**< PanScan source surface cropping in
@@ -269,9 +266,6 @@
 {
     mp_msg(MSGT_VO,MSGL_V,"<vo_direct3d>uninit_d3d called\r\n");
 
-    /* Block further calls to reconfigure_d3d(). */
-    priv->is_cfg_finished = 0;
-
     /* Destroy D3D Context inside the window. */
     destroy_d3d_context();
 
@@ -441,9 +435,6 @@
         return -1;
     }
 
-    /* Allow the first call to reconfigure_d3d. */
-    priv->is_cfg_finished = 1;
-
     return 0;
 }
 
@@ -527,14 +518,9 @@
         return VO_ERROR;
     }
 
-    if (priv->is_cfg_finished) {
-        priv->is_cfg_finished = 0;
-        if (!reconfigure_d3d()) {
-            priv->is_cfg_finished = 1;
-            return VO_ERROR;
-        }
-        priv->is_cfg_finished = 1;
-    }
+    if (!reconfigure_d3d())
+        return VO_ERROR;
+
     return 0; /* Success */
 }