Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
a6c100a2
Commit
a6c100a2
authored
Jan 02, 2009
by
Geoffroy Couprie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WinCE: fix compilation of vout
parent
303113c7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
11 deletions
+28
-11
configure.ac
configure.ac
+2
-0
modules/video_output/msw/events.c
modules/video_output/msw/events.c
+2
-1
modules/video_output/msw/vout.h
modules/video_output/msw/vout.h
+23
-1
modules/video_output/msw/wingdi.c
modules/video_output/msw/wingdi.c
+1
-9
No files found.
configure.ac
View file @
a6c100a2
...
...
@@ -4567,6 +4567,8 @@ if test "${enable_wingdi}" != "no"; then
if test "${SYS}" = "mingwce"; then
VLC_ADD_PLUGIN([wingdi])
VLC_ADD_PLUGIN([wingapi])
VLC_ADD_LIBS([wingdi],[-laygshell])
VLC_ADD_LIBS([wingapi],[-laygshell])
fi
fi
...
...
modules/video_output/msw/events.c
View file @
a6c100a2
...
...
@@ -1037,6 +1037,7 @@ static int DirectXConvertKey( int i_key )
static
int
Control
(
vout_thread_t
*
p_vout
,
int
i_query
,
va_list
args
)
{
unsigned
int
*
pi_width
,
*
pi_height
;
bool
b_bool
;
RECT
rect_window
;
POINT
point
;
...
...
@@ -1132,7 +1133,7 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args )
#ifdef MODULE_NAME_IS_wingapi
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
;
if
(
b_bool
)
GXResume
();
else
if
(
!
p_vout
->
p_sys
->
b_focus
)
GXSuspend
();
...
...
modules/video_output/msw/vout.h
View file @
a6c100a2
...
...
@@ -64,6 +64,7 @@ typedef struct event_thread_t
# define kfDirect444 0x200
# define kfDirectInverted 0x400
# endif
#endif
/*****************************************************************************
...
...
@@ -194,11 +195,22 @@ struct vout_sys_t
int
i_depth
;
int
render_width
;
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_parent_focus
;
HINSTANCE
gapi_dll
;
/* handle of the opened gapi dll */
HINSTANCE
gapi_dll
;
/* handle of the opened gapi dll */
/* GAPI functions */
int
(
*
GXOpenDisplay
)(
HWND
hWnd
,
DWORD
dwFlags
);
...
...
@@ -219,6 +231,16 @@ struct vout_sys_t
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
*****************************************************************************/
...
...
modules/video_output/msw/wingdi.c
View file @
a6c100a2
...
...
@@ -117,15 +117,7 @@ static void SetPalette( vout_thread_t *, uint16_t *, uint16_t *, uint16_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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment