Merge branch 'master' into lpcm_encoder

[vlc] / modules / video_output / msw / events.h

diff --git a/modules/video_output/msw/events.h b/modules/video_output/msw/events.h
index 275e513a7fc789462f34b1cd6148be438f5e6c2f..2b21965f94d05a73eba74834e6ff540e97897ea5 100644 (file)
--- a/modules/video_output/msw/events.h
+++ b/modules/video_output/msw/events.h
@@ -22,17 +22,41 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include <vlc_vout_window.h>
+
 /**
  * HWNDs manager.
  */
 typedef struct event_thread_t event_thread_t;
 
-event_thread_t *EventThreadCreate( vout_thread_t * );
+typedef struct {
+    bool use_desktop; /* direct3d */
+    bool use_overlay; /* directx */
+
+    vout_window_cfg_t win;
+} event_cfg_t;
+
+typedef struct {
+    vout_window_t *parent_window;
+    HWND hparent;
+    HWND hwnd;
+    HWND hvideownd;
+    HWND hfswnd;
+} event_hwnd_t;
+
+event_thread_t *EventThreadCreate( vout_display_t *);
 void            EventThreadDestroy( event_thread_t * );
-int             EventThreadStart( event_thread_t * );
+int             EventThreadStart( event_thread_t *, event_hwnd_t *, const event_cfg_t * );
 void            EventThreadStop( event_thread_t * );
 
-void            EventThreadMouseAutoHide( event_thread_t * );
+void            EventThreadMouseHide( event_thread_t * );
 void            EventThreadUpdateTitle( event_thread_t *, const char *psz_fallback );
-unsigned        EventThreadRetreiveChanges( event_thread_t * );
 int             EventThreadGetWindowStyle( event_thread_t * );
+void            EventThreadUpdateWindowPosition( event_thread_t *, bool *pb_moved, bool *pb_resized,
+                                                 int x, int y, int w, int h );
+void            EventThreadUpdateSourceAndPlace( event_thread_t *p_event,
+                                                 const video_format_t *p_source,
+                                                 const vout_display_place_t *p_place );
+void            EventThreadUseOverlay( event_thread_t *, bool b_used );
+bool            EventThreadGetAndResetHasMoved( event_thread_t * );
+