Removes trailing spaces. Removes tabs.

[vlc] / modules / video_output / x11 / xcommon.h

diff --git a/modules/video_output/x11/xcommon.h b/modules/video_output/x11/xcommon.h
index 749ac7cfbef4452ef247ab9bce644323e3d13afa..ac825eb09b640ea32355d960b39ad687e4f12f38 100644 (file)
--- a/modules/video_output/x11/xcommon.h
+++ b/modules/video_output/x11/xcommon.h
@@ -51,6 +51,9 @@
         VLC_FOURCC( i & 0xff, (i >> 8) & 0xff, (i >> 16) & 0xff, \
                     (i >> 24) & 0xff )
 
+#ifdef HAVE_OSSO
+#include <libosso.h>
+#endif
 
 /*****************************************************************************
  * x11_window_t: X11 window descriptor
@@ -206,6 +209,17 @@ struct vout_sys_t
 
     //alphablend_t       alphablend_extra_data;
 #endif
+
+#ifdef HAVE_XSP
+    int                 i_hw_scale;
+#endif
+
+#ifdef HAVE_OSSO
+    osso_context_t      *p_octx;
+    int                 i_backlight_on_counter;
+#endif
+
+ 
 };
 
 /*****************************************************************************
@@ -242,11 +256,11 @@ struct picture_sys_t
 
 typedef struct mwmhints_t
 {
-    uint32_t flags;
-    uint32_t functions;
-    uint32_t decorations;
-    int32_t  input_mode;
-    uint32_t status;
+    unsigned long flags;
+    unsigned long functions;
+    unsigned long decorations;
+    signed   long input_mode;
+    unsigned long status;
 } mwmhints_t;
 
 /*****************************************************************************