Use var_Inherit* instead of var_CreateGet*.

[vlc] / include / vlc_vout_wrapper.h

diff --git a/include/vlc_vout_wrapper.h b/include/vlc_vout_wrapper.h
index 89f78b9fd52e6587683df58c0ac5f496146f1f5b..3dcd434229d2b3d1cc630171a60c4c7d957bbe28 100644 (file)
--- a/include/vlc_vout_wrapper.h
+++ b/include/vlc_vout_wrapper.h
@@ -25,15 +25,16 @@
 #define VLC_VOUT_WRAPPER_H 1
 
 #include <vlc_vout_display.h>
+#include <vlc_vout_opengl.h>
 
-/* XXX DO NOT use it ouside the vout module wrapper XXX */
+/* XXX DO NOT use it outside the vout module wrapper XXX */
 
 /**
- * It retreive a picture from the display
+ * It retreives a picture pool 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);
 }
 
 /**
@@ -58,8 +59,7 @@ static inline void vout_display_Display(vout_display_t *vd, picture_t *picture)
  */
 typedef struct {
     vout_display_cfg_t cfg;
-
-    bool is_on_top;
+    unsigned wm_state;
     struct {
         int num;
         int den;
@@ -79,14 +79,15 @@ VLC_EXPORT(bool, vout_IsDisplayFiltered, (vout_display_t *));
 VLC_EXPORT(picture_t *, vout_FilterDisplay, (vout_display_t *, picture_t *));
 VLC_EXPORT(bool, vout_AreDisplayPicturesInvalid, (vout_display_t *));
 
-VLC_EXPORT(void, vout_ManageDisplay, (vout_display_t *));
+VLC_EXPORT(void, vout_ManageDisplay, (vout_display_t *, bool allow_reset_pictures));
 
 VLC_EXPORT(void, vout_SetDisplayFullscreen, (vout_display_t *, bool is_fullscreen));
 VLC_EXPORT(void, vout_SetDisplayFilled, (vout_display_t *, bool is_filled));
 VLC_EXPORT(void, vout_SetDisplayZoom, (vout_display_t *, int num, int den));
-VLC_EXPORT(void, vout_SetDisplayOnTop, (vout_display_t *, bool is_on_top));
+VLC_EXPORT(void, vout_SetWindowState, (vout_display_t *, unsigned state));
 VLC_EXPORT(void, vout_SetDisplayAspect, (vout_display_t *, unsigned sar_num, unsigned sar_den));
 VLC_EXPORT(void, vout_SetDisplayCrop, (vout_display_t *, unsigned crop_num, unsigned crop_den, unsigned x, unsigned y, unsigned width, unsigned height));
+VLC_EXPORT(vout_opengl_t *, vout_GetDisplayOpengl, (vout_display_t *));
 
 #endif /* VLC_VOUT_WRAPPER_H */