diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-21 02:18:28 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 13:46:40 +0300 |
commit | 78172918ff4c7df7c9d1305dbfc48a8df409e470 (patch) | |
tree | 664cd8c4d580ed5e487ce03f0d5a89ad40965699 /libvo/x11_common.h | |
parent | 432e8ff4a568b1040cae43df4aa6a602c86c6162 (diff) | |
download | mpv-78172918ff4c7df7c9d1305dbfc48a8df409e470.tar.bz2 mpv-78172918ff4c7df7c9d1305dbfc48a8df409e470.tar.xz |
Move vo_screenwidth,vo_screenheight to options struct
Diffstat (limited to 'libvo/x11_common.h')
-rw-r--r-- | libvo/x11_common.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libvo/x11_common.h b/libvo/x11_common.h index 3cae10714f..58eef5caa2 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -60,7 +60,7 @@ void vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis, Colormap col_map, const char *classname, const char *title); void vo_x11_clearwindow_part(struct vo *vo, Window vo_window, int img_width, int img_height, int use_fs); -extern void vo_x11_clearwindow( Display *mDisplay, Window vo_window ); +void vo_x11_clearwindow(struct vo *vo, Window vo_window); void vo_x11_ontop(struct vo *vo); void vo_x11_ewmh_fullscreen(Display *mDisplay, int action); @@ -113,7 +113,7 @@ int xv_test_ckm( void * arg ); #ifdef HAVE_XF86VM void vo_vm_switch(struct vo *vo, uint32_t, uint32_t, int*, int*); -void vo_vm_close(Display*); +void vo_vm_close(struct vo *vo); #endif void update_xinerama_info(struct vo *vo); @@ -142,6 +142,8 @@ int vo_find_depth_from_visuals(Display *dpy, int screen, Visual **visual_return) #define vo_xv_init_colorkey() vo_xv_init_colorkey(global_vo) #define vo_xv_draw_colorkey(...) vo_xv_draw_colorkey(global_vo, __VA_ARGS__) #define vo_x11_clearwindow_part(display, ...) vo_x11_clearwindow_part(global_vo, __VA_ARGS__) +#define vo_vm_close(display) vo_vm_close(global_vo) +#define vo_x11_clearwindow(display, window) vo_x11_clearwindow(global_vo, window) #define mDisplay global_vo->x11->display #define vo_depthonscreen global_vo->x11->depthonscreen |