diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-21 04:19:43 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 13:47:43 +0300 |
| commit | 49461e04d0ecbf08c636f80b6aa1617db061e92f (patch) | |
| tree | 9ffd9785f390fd2c750acdee1fb4c9c7c399a920 /libvo/x11_common.h | |
| parent | 5f39342e01cbbe6527814724a90124a4ff537721 (diff) | |
| download | mpv-49461e04d0ecbf08c636f80b6aa1617db061e92f.tar.bz2 mpv-49461e04d0ecbf08c636f80b6aa1617db061e92f.tar.xz | |
Move vo_gc,f_gc,vo_hints to x11 struct
Diffstat (limited to 'libvo/x11_common.h')
| -rw-r--r-- | libvo/x11_common.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libvo/x11_common.h b/libvo/x11_common.h index 03d3d5ee73..b40755962a 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -11,6 +11,8 @@ struct vo_x11_state { Window window; int depthonscreen; + GC vo_gc; + struct xv_ck_info_s { int method; ///< CK_METHOD_* constants int source; ///< CK_SRC_* constants @@ -18,6 +20,9 @@ struct vo_x11_state { unsigned long xv_colorkey; unsigned int xv_port; + GC f_gc; + XSizeHints vo_hint; + unsigned int olddecor; unsigned int oldfuncs; XComposeStatus compose_status; @@ -92,9 +97,6 @@ void vo_x11_ewmh_fullscreen(struct vo_x11_state *x11, int action); #endif -extern GC vo_gc; -extern XSizeHints vo_hint; - int vo_xv_set_eq(struct vo *vo, uint32_t xv_port, char * name, int value); int vo_xv_get_eq(struct vo *vo, uint32_t xv_port, char * name, int *value); @@ -165,6 +167,7 @@ int vo_find_depth_from_visuals(Display *dpy, int screen, Visual **visual_return) #define xv_ck_info global_vo->x11->xv_ck_info #define xv_colorkey global_vo->x11->xv_colorkey #define xv_port global_vo->x11->xv_port +#define vo_gc global_vo->x11->vo_gc #endif #endif /* MPLAYER_X11_COMMON_H */ |