Reused vout window in vout_Request().

[vlc] / src / video_output / vout_wrapper.c

diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c
index 1d43e61c3acc662328a7448b93a41e7e4b4fb7d7..6d6be09862d9f7ef50e351d8c729b84468104ff5 100644 (file)
--- a/src/video_output/vout_wrapper.c
+++ b/src/video_output/vout_wrapper.c
@@ -47,8 +47,6 @@
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-static void VoutGetDisplayCfg(vout_thread_t *,
-                              vout_display_cfg_t *, const char *title);
 #ifdef WIN32
 static int  Forward(vlc_object_t *, char const *,
                     vlc_value_t, vlc_value_t, void *);
@@ -57,7 +55,8 @@ static int  Forward(vlc_object_t *, char const *,
 /*****************************************************************************
  *
  *****************************************************************************/
-int vout_OpenWrapper(vout_thread_t *vout, const char *name)
+int vout_OpenWrapper(vout_thread_t *vout,
+                     const char *name, const vout_display_state_t *state)
 {
     vout_thread_sys_t *sys = vout->p;
     msg_Dbg(vout, "Opening vout display wrapper");
@@ -72,21 +71,15 @@ int vout_OpenWrapper(vout_thread_t *vout, const char *name)
     source.i_x_offset       = 0;
     source.i_y_offset       = 0;
 
-    vout_display_state_t state;
-    VoutGetDisplayCfg(vout, &state.cfg, sys->display.title);
-    state.is_on_top = var_CreateGetBool(vout, "video-on-top");
-    state.sar.num = 0;
-    state.sar.den = 0;
-
     const mtime_t double_click_timeout = 300000;
     const mtime_t hide_timeout = var_CreateGetInteger(vout, "mouse-hide-timeout") * 1000;
 
-    sys->display.vd = vout_NewDisplay(vout, &source, &state, name ? name : "$vout",
+    sys->display.vd = vout_NewDisplay(vout, &source, state, name ? name : "$vout",
                                       double_click_timeout, hide_timeout);
     /* If we need to video filter and it fails, then try a splitter
      * XXX it is a hack for now FIXME */
     if (name && !sys->display.vd)
-        sys->display.vd = vout_NewSplitter(vout, &source, &state, "$vout", name,
+        sys->display.vd = vout_NewSplitter(vout, &source, state, "$vout", name,
                                            double_click_timeout, hide_timeout);
     if (!sys->display.vd) {
         free(sys->display.title);
@@ -110,7 +103,7 @@ int vout_OpenWrapper(vout_thread_t *vout, const char *name)
 /*****************************************************************************
  *
  *****************************************************************************/
-void vout_CloseWrapper(vout_thread_t *vout)
+void vout_CloseWrapper(vout_thread_t *vout, vout_display_state_t *state)
 {
     vout_thread_sys_t *sys = vout->p;
 
@@ -120,7 +113,7 @@ void vout_CloseWrapper(vout_thread_t *vout)
 #endif
     sys->decoder_pool = NULL; /* FIXME remove */
 
-    vout_DeleteDisplay(sys->display.vd, NULL);
+    vout_DeleteDisplay(sys->display.vd, state);
     free(sys->display.title);
 }
 
@@ -222,36 +215,6 @@ void vout_DisplayWrapper(vout_thread_t *vout, picture_t *picture)
      sys->display.filtered = NULL;
 }
 
-static void VoutGetDisplayCfg(vout_thread_t *vout, vout_display_cfg_t *cfg, const char *title)
-{
-    /* Load configuration */
-    cfg->is_fullscreen = var_CreateGetBool(vout, "fullscreen");
-    cfg->display.title = title;
-    const int display_width = var_CreateGetInteger(vout, "width");
-    const int display_height = var_CreateGetInteger(vout, "height");
-    cfg->display.width   = display_width > 0  ? display_width  : 0;
-    cfg->display.height  = display_height > 0 ? display_height : 0;
-    cfg->is_display_filled  = var_CreateGetBool(vout, "autoscale");
-    cfg->display.sar.num = 1; /* TODO monitor AR */
-    cfg->display.sar.den = 1;
-    unsigned zoom_den = 1000;
-    unsigned zoom_num = zoom_den * var_CreateGetFloat(vout, "scale");
-    vlc_ureduce(&zoom_num, &zoom_den, zoom_num, zoom_den, 0);
-    cfg->zoom.num = zoom_num;
-    cfg->zoom.den = zoom_den;
-    cfg->align.vertical = VOUT_DISPLAY_ALIGN_CENTER;
-    cfg->align.horizontal = VOUT_DISPLAY_ALIGN_CENTER;
-    const int align_mask = var_CreateGetInteger(vout, "align");
-    if (align_mask & 0x1)
-        cfg->align.horizontal = VOUT_DISPLAY_ALIGN_LEFT;
-    else if (align_mask & 0x2)
-        cfg->align.horizontal = VOUT_DISPLAY_ALIGN_RIGHT;
-    if (align_mask & 0x4)
-        cfg->align.horizontal = VOUT_DISPLAY_ALIGN_TOP;
-    else if (align_mask & 0x8)
-        cfg->align.horizontal = VOUT_DISPLAY_ALIGN_BOTTOM;
-}
-
 #ifdef WIN32
 static int Forward(vlc_object_t *object, char const *var,
                    vlc_value_t oldval, vlc_value_t newval, void *data)