diff options
| author | al <al@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-20 22:43:25 +0000 |
|---|---|---|
| committer | al <al@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-20 22:43:25 +0000 |
| commit | f366d01286b8cafcb6df0dd7610fcba2dba4ea23 (patch) | |
| tree | 55e5e560b8af1262e2f7ad2dceb2a8af5fdd8301 /libvo/x11_common.h | |
| parent | 73508716be16cca9118b325f8c5bdf7be210fb36 (diff) | |
| download | mpv-f366d01286b8cafcb6df0dd7610fcba2dba4ea23.tar.bz2 mpv-f366d01286b8cafcb6df0dd7610fcba2dba4ea23.tar.xz | |
Unified colorkey code for vo xv and vo xvmc.
Made the code also more flexible.
Colorkey drawing is now by default done as
proposed by Marko Macek.
Patch also approved by iive.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14743 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/x11_common.h')
| -rw-r--r-- | libvo/x11_common.h | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/libvo/x11_common.h b/libvo/x11_common.h index 2197a5a37f..583a49c881 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -79,8 +79,36 @@ extern GC vo_gc; extern XSizeHints vo_hint; #ifdef HAVE_XV +//XvPortID xv_port; +extern unsigned int xv_port; + extern int vo_xv_set_eq(uint32_t xv_port, char * name, int value); extern int vo_xv_get_eq(uint32_t xv_port, char * name, int *value); + +/*** colorkey handling ***/ +typedef struct xv_ck_info_s +{ + int method; ///< CK_METHOD_* constants + int source; ///< CK_SRC_* constants +} xv_ck_info_t; + +#define CK_METHOD_NONE 0 ///< no colorkey drawing +#define CK_METHOD_BACKGROUND 1 ///< set colorkey as window background +#define CK_METHOD_AUTOPAINT 2 ///< let xv draw the colorkey +#define CK_METHOD_MANUALFILL 3 ///< manually draw the colorkey +#define CK_SRC_USE 0 ///< use specified / default colorkey +#define CK_SRC_SET 1 ///< use and set specified / default colorkey +#define CK_SRC_CUR 2 ///< use current colorkey ( get it from xv ) + +extern xv_ck_info_t xv_ck_info; +extern unsigned long xv_colorkey; + +extern int vo_xv_init_colorkey(); +extern void vo_xv_colorkey(uint32_t x,uint32_t y, uint32_t w, uint32_t h); + +/*** test functions for common suboptions ***/ +int xv_test_ck( void * arg ); +int xv_test_ckm( void * arg ); #endif #ifdef HAVE_NEW_GUI |