RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-17 13:17:13 +00:00
Code Issues Releases Wiki Activity

Fix compilation under MinGW with X11 enabled

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21647 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-12-17 12:33:09 +00:00
parent dd1a5a82c1
commit 29a164309f
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libvo/gl_common.c
View File

@ -1338,7 +1338,7 @@ int setGlWindow(int *vinfo, HGLRC *context, HWND win)
}
// set new values
vo_window = win;
vo_w32_window = win;
vo_hdc = windc;
{
RECT rect;

3
libvo/vo_gl.c
View File

@ -32,6 +32,9 @@ LIBVO_EXTERN(gl)
#ifdef GL_WIN32
static int gl_vinfo = 0;
static HGLRC gl_context = 0;
#define update_xinerama_info w32_update_xinerama_info
#define vo_init vo_w32_init
#define vo_window vo_w32_window
#else
static XVisualInfo *gl_vinfo = NULL;
static GLXContext gl_context = 0;

3
libvo/vo_gl2.c
View File

@ -52,6 +52,9 @@ static unsigned char *ImageData=NULL;
#ifdef GL_WIN32
static int gl_vinfo = 0;
static HGLRC gl_context = 0;
#define update_xinerama_info w32_update_xinerama_info
#define vo_init vo_w32_init
#define vo_window vo_w32_window
#else
static XVisualInfo *gl_vinfo = NULL;
static GLXContext gl_context = 0;

7
libvo/w32_common.c
View File

@ -29,6 +29,7 @@ uint32_t o_dwidth;
uint32_t o_dheight;
static HINSTANCE hInstance;
#define vo_window vo_w32_window
HWND vo_window = 0;
static int event_flags;
static int mon_cnt;
@ -147,7 +148,7 @@ static BOOL CALLBACK mon_enum(HMONITOR hmon, HDC hdc, LPRECT r, LPARAM p) {
return TRUE;
}
void update_xinerama_info(void) {
void w32_update_xinerama_info(void) {
xinerama_x = xinerama_y = 0;
if (xinerama_screen < -1) {
int tmp;
@ -186,7 +187,7 @@ static void updateScreenProperties() {
vo_screenwidth = dm.dmPelsWidth;
vo_screenheight = dm.dmPelsHeight;
vo_depthonscreen = dm.dmBitsPerPel;
update_xinerama_info();
w32_update_xinerama_info();
}
static void changeMode(void) {
@ -310,7 +311,7 @@ int vo_w32_config(uint32_t width, uint32_t height, uint32_t flags) {
return createRenderingContext();
}
int vo_init(void) {
int vo_w32_init(void) {
HICON mplayerIcon = 0;
char exedir[MAX_PATH];
HINSTANCE user32;

6
libvo/w32_common.h
View File

@ -3,17 +3,17 @@ extern int vo_screenwidth;
extern int vo_screenheight;
extern uint32_t o_dwidth;
extern uint32_t o_dheight;
extern HWND vo_window;
extern HWND vo_w32_window;
extern HDC vo_hdc;
extern int vo_fs;
extern int vo_vm;
extern int vo_ontop;
extern int vo_init(void);
extern int vo_w32_init(void);
extern void vo_w32_uninit(void);
extern void vo_w32_ontop(void);
extern void vo_w32_fullscreen(void);
extern int vo_w32_check_events(void);
extern int vo_w32_config(uint32_t, uint32_t, uint32_t);
extern void destroyRenderingContext(void);
extern void update_xinerama_info(void);
extern void w32_update_xinerama_info(void);