Commit a6c100a2 authored by Geoffroy Couprie's avatar Geoffroy Couprie

WinCE: fix compilation of vout

parent 303113c7
...@@ -4567,6 +4567,8 @@ if test "${enable_wingdi}" != "no"; then ...@@ -4567,6 +4567,8 @@ if test "${enable_wingdi}" != "no"; then
if test "${SYS}" = "mingwce"; then if test "${SYS}" = "mingwce"; then
VLC_ADD_PLUGIN([wingdi]) VLC_ADD_PLUGIN([wingdi])
VLC_ADD_PLUGIN([wingapi]) VLC_ADD_PLUGIN([wingapi])
VLC_ADD_LIBS([wingdi],[-laygshell])
VLC_ADD_LIBS([wingapi],[-laygshell])
fi fi
fi fi
......
...@@ -1037,6 +1037,7 @@ static int DirectXConvertKey( int i_key ) ...@@ -1037,6 +1037,7 @@ static int DirectXConvertKey( int i_key )
static int Control( vout_thread_t *p_vout, int i_query, va_list args ) static int Control( vout_thread_t *p_vout, int i_query, va_list args )
{ {
unsigned int *pi_width, *pi_height; unsigned int *pi_width, *pi_height;
bool b_bool;
RECT rect_window; RECT rect_window;
POINT point; POINT point;
...@@ -1132,7 +1133,7 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args ) ...@@ -1132,7 +1133,7 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args )
#ifdef MODULE_NAME_IS_wingapi #ifdef MODULE_NAME_IS_wingapi
case VOUT_SET_FOCUS: case VOUT_SET_FOCUS:
b_bool = (bool) va_arg( args, int ); b_bool = (bool) va_arg( args, int );
p_vout->p_sys->b_parent_focus = b_bool; p_vout->p_sys->b_parent_focus = b_bool;
if( b_bool ) GXResume(); if( b_bool ) GXResume();
else if( !p_vout->p_sys->b_focus ) GXSuspend(); else if( !p_vout->p_sys->b_focus ) GXSuspend();
......
...@@ -64,6 +64,7 @@ typedef struct event_thread_t ...@@ -64,6 +64,7 @@ typedef struct event_thread_t
# define kfDirect444 0x200 # define kfDirect444 0x200
# define kfDirectInverted 0x400 # define kfDirectInverted 0x400
# endif # endif
#endif #endif
/***************************************************************************** /*****************************************************************************
...@@ -194,11 +195,22 @@ struct vout_sys_t ...@@ -194,11 +195,22 @@ struct vout_sys_t
int i_depth; int i_depth;
int render_width; int render_width;
int render_height; int render_height;
/* Our offscreen bitmap and its framebuffer */
HDC off_dc;
HBITMAP off_bitmap;
uint8_t * p_pic_buffer;
int i_pic_pitch;
int i_pic_pixel_pitch;
BITMAPINFO bitmapinfo;
RGBQUAD red;
RGBQUAD green;
RGBQUAD blue;
bool b_focus; bool b_focus;
bool b_parent_focus; bool b_parent_focus;
HINSTANCE gapi_dll; /* handle of the opened gapi dll */ HINSTANCE gapi_dll; /* handle of the opened gapi dll */
/* GAPI functions */ /* GAPI functions */
int (*GXOpenDisplay)( HWND hWnd, DWORD dwFlags ); int (*GXOpenDisplay)( HWND hWnd, DWORD dwFlags );
...@@ -219,6 +231,16 @@ struct vout_sys_t ...@@ -219,6 +231,16 @@ struct vout_sys_t
vlc_mutex_t lock; vlc_mutex_t lock;
}; };
#ifdef MODULE_NAME_IS_wingapi
# define GXOpenDisplay p_vout->p_sys->GXOpenDisplay
# define GXCloseDisplay p_vout->p_sys->GXCloseDisplay
# define GXBeginDraw p_vout->p_sys->GXBeginDraw
# define GXEndDraw p_vout->p_sys->GXEndDraw
# define GXGetDisplayProperties p_vout->p_sys->GXGetDisplayProperties
# define GXSuspend p_vout->p_sys->GXSuspend
# define GXResume p_vout->p_sys->GXResume
#endif
/***************************************************************************** /*****************************************************************************
* Prototypes from directx.c * Prototypes from directx.c
*****************************************************************************/ *****************************************************************************/
......
...@@ -117,15 +117,7 @@ static void SetPalette( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * ); ...@@ -117,15 +117,7 @@ static void SetPalette( vout_thread_t *, uint16_t *, uint16_t *, uint16_t * );
static void InitBuffers ( vout_thread_t * ); static void InitBuffers ( vout_thread_t * );
#ifdef MODULE_NAME_IS_wingapi
# define GXOpenDisplay p_vout->p_sys->GXOpenDisplay
# define GXCloseDisplay p_vout->p_sys->GXCloseDisplay
# define GXBeginDraw p_vout->p_sys->GXBeginDraw
# define GXEndDraw p_vout->p_sys->GXEndDraw
# define GXGetDisplayProperties p_vout->p_sys->GXGetDisplayProperties
# define GXSuspend p_vout->p_sys->GXSuspend
# define GXResume p_vout->p_sys->GXResume
#endif
#define DX_POSITION_CHANGE 0x1000 #define DX_POSITION_CHANGE 0x1000
......
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