Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / video_output / display.h

diff --git a/src/video_output/display.h b/src/video_output/display.h
index 16f7039917210f9428c520af5d4e07e52c62cda2..2763f40b6170045fdb21189d1406a536cf474d95 100644 (file)
--- a/src/video_output/display.h
+++ b/src/video_output/display.h
@@ -34,9 +34,9 @@
 /**
  * It retreive a picture from the display
  */
-static inline picture_t *vout_display_Get(vout_display_t *vd)
+static inline picture_pool_t *vout_display_Pool(vout_display_t *vd, unsigned count)
 {
-    return vd->get(vd);
+    return vd->pool(vd, count);
 }
 
 /**
@@ -96,12 +96,12 @@ void vout_DeleteDisplay(vout_display_t *, vout_display_state_t *);
 
 picture_t *vout_FilterDisplay(vout_display_t *, picture_t *);
 
-void vout_ManageDisplay(vout_display_t *);
+void vout_ManageDisplay(vout_display_t *, bool allow_reset_pictures);
 
 void vout_SetDisplayFullscreen(vout_display_t *, bool is_fullscreen);
 void vout_SetDisplayFilled(vout_display_t *, bool is_filled);
 void vout_SetDisplayZoom(vout_display_t *, int num, int den);
-void vout_SetDisplayOnTop(vout_display_t *, bool is_on_top);
+void vout_SetWindowState(vout_display_t *, unsigned state);
 void vout_SetDisplayAspect(vout_display_t *, unsigned sar_num, unsigned sar_den);
 void vout_SetDisplayCrop(vout_display_t *,
                          unsigned crop_num, unsigned crop_den,
@@ -109,6 +109,14 @@ void vout_SetDisplayCrop(vout_display_t *,
 
 #endif
 
+vout_display_t *vout_NewSplitter(vout_thread_t *vout,
+                                 const video_format_t *source,
+                                 const vout_display_state_t *state,
+                                 const char *module,
+                                 const char *splitter_module,
+                                 mtime_t double_click_timeout,
+                                 mtime_t hide_timeout);
+
 /* FIXME should not be there */
 void vout_SendDisplayEventMouse(vout_thread_t *, const vlc_mouse_t *);
 vout_window_t *vout_NewDisplayWindow(vout_thread_t *, vout_display_t *, const vout_window_cfg_t *);