Commit f6d06e15 authored by Laurent Aimar's avatar Laurent Aimar

Converted direct3d to vout display.

It also fixes a few remaining race conditions.
parent 4a1df8f1
...@@ -8,10 +8,10 @@ SOURCES_directx = \ ...@@ -8,10 +8,10 @@ SOURCES_directx = \
SOURCES_direct3d = \ SOURCES_direct3d = \
direct3d.c \ direct3d.c \
vout.h \ common.h \
events_vo.h \ events.h \
events_vo.c \ events.c \
common_vo.c \ common.c \
$(NULL) $(NULL)
SOURCES_glwin32 = \ SOURCES_glwin32 = \
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -32,6 +32,8 @@ typedef struct event_thread_t event_thread_t; ...@@ -32,6 +32,8 @@ typedef struct event_thread_t event_thread_t;
typedef struct { typedef struct {
bool use_desktop; /* direct3d */ bool use_desktop; /* direct3d */
bool use_overlay; /* directx */ bool use_overlay; /* directx */
vout_window_cfg_t win;
} event_cfg_t; } event_cfg_t;
typedef struct { typedef struct {
...@@ -42,7 +44,7 @@ typedef struct { ...@@ -42,7 +44,7 @@ typedef struct {
HWND hfswnd; HWND hfswnd;
} event_hwnd_t; } event_hwnd_t;
event_thread_t *EventThreadCreate( vout_thread_t *, const vout_window_cfg_t * ); event_thread_t *EventThreadCreate( vout_display_t *);
void EventThreadDestroy( event_thread_t * ); void EventThreadDestroy( event_thread_t * );
int EventThreadStart( event_thread_t *, event_hwnd_t *, const event_cfg_t * ); int EventThreadStart( event_thread_t *, event_hwnd_t *, const event_cfg_t * );
void EventThreadStop( event_thread_t * ); void EventThreadStop( event_thread_t * );
...@@ -50,8 +52,12 @@ void EventThreadStop( event_thread_t * ); ...@@ -50,8 +52,12 @@ void EventThreadStop( event_thread_t * );
void EventThreadMouseAutoHide( event_thread_t * ); void EventThreadMouseAutoHide( event_thread_t * );
void EventThreadMouseShow( event_thread_t * ); void EventThreadMouseShow( event_thread_t * );
void EventThreadUpdateTitle( event_thread_t *, const char *psz_fallback ); void EventThreadUpdateTitle( event_thread_t *, const char *psz_fallback );
unsigned EventThreadRetreiveChanges( event_thread_t * );
int EventThreadGetWindowStyle( event_thread_t * ); int EventThreadGetWindowStyle( event_thread_t * );
void EventThreadUpdateWindowPosition( event_thread_t *, bool *pb_changed, void EventThreadUpdateWindowPosition( event_thread_t *, bool *pb_changed,
int x, int y, int w, int h ); 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 ); void EventThreadUseOverlay( event_thread_t *, bool b_used );
bool EventThreadGetAndResetHasMoved( event_thread_t * );
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment