diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:07:09 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:57:31 +0200 |
| commit | 9bcd12fdf5c6f85e9bb391caa2713021624a957e (patch) | |
| tree | 375eac533ead90a45e7121e5ab307861b4ef52c8 /libvo/x11_common.h | |
| parent | d419ecd161634e79dab3ac57d57c4bccba2adcdc (diff) | |
| parent | e0d66b140e1da7a793bff15003cadab79544b1dd (diff) | |
| download | mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.bz2 mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.xz | |
Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
Diffstat (limited to 'libvo/x11_common.h')
| -rw-r--r-- | libvo/x11_common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libvo/x11_common.h b/libvo/x11_common.h index cea2265f6e..7bcbd08d67 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -154,6 +154,7 @@ void vo_vm_close(struct vo *vo); void update_xinerama_info(struct vo *vo); int vo_find_depth_from_visuals(Display *dpy, int screen, Visual **visual_return); +void vo_calc_drwXY(struct vo *vo, uint32_t *drwX, uint32_t *drwY); void xscreensaver_heartbeat(struct vo_x11_state *x11); @@ -185,6 +186,7 @@ void xscreensaver_heartbeat(struct vo_x11_state *x11); #define vo_x11_classhint(display, window, name) vo_x11_classhint(global_vo, window, name) #define vo_x11_setlayer(display, window, layer) vo_x11_setlayer(global_vo, window, layer) #define xv_setup_colorkeyhandling(a, b) xv_setup_colorkeyhandling(global_vo, a, b) +#define vo_calc_drwXY(drwX, drwY) vo_calc_drwXY(global_vo, drwX, drwY) #define mDisplay global_vo->x11->display #define vo_depthonscreen global_vo->x11->depthonscreen |