diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-09 00:47:26 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-09 00:47:26 +0000 |
commit | 7c51652a1ba60b6a102eae0c76562234e30d83be (patch) | |
tree | dd6402878602d5b9703fc573564d689e300ef2f6 /libvo/video_out.h | |
parent | 73fb8576e423b1c555cf1fcf8898168cff6f9294 (diff) | |
download | mpv-7c51652a1ba60b6a102eae0c76562234e30d83be.tar.bz2 mpv-7c51652a1ba60b6a102eae0c76562234e30d83be.tar.xz |
query_ stuff replaced by new control() - patch by David Holm
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4593 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/video_out.h')
-rw-r--r-- | libvo/video_out.h | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/libvo/video_out.h b/libvo/video_out.h index 88a99b2c7b..c7f00f8b25 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -7,6 +7,7 @@ */ #include <inttypes.h> +#include <stdarg.h> #include "font_load.h" #include "img_format.h" @@ -16,6 +17,19 @@ #define VO_EVENT_RESIZE 2 #define VO_EVENT_KEYPRESS 4 +/* takes a pointer to a vo_vaa_s struct */ +#define VOCTRL_QUERY_VAA 1 +/* takes a pointer to uint32_t fourcc */ +#define VOCTRL_QUERY_FORMAT 2 +/* signal a device reset (seek/paus) */ +#define VOCTRL_RESET 3 + +#define VO_TRUE 1 +#define VO_FALSE 0 +#define VO_ERROR -1 +#define VO_NOTAVAIL -2 +#define VO_NOTIMPL -3 + typedef struct vo_info_s { /* driver name ("Matrox Millennium G200/G400" */ @@ -93,13 +107,10 @@ typedef struct vo_functions_s uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format,const vo_tune_info_t *); - /* - * Query that given pixel format is supported or not. - * params: - * format: fourcc of pixel format - * returns : 1 if supported, 0 if unsupported - */ - uint32_t (*query_format)(uint32_t format); + /* + * Control interface + */ + uint32_t (*control)(uint32_t request, void *data, ...); /* * Return driver information. @@ -145,14 +156,6 @@ typedef struct vo_functions_s */ void (*uninit)(void); - /* - * Query Video Accelerated Architecture information. - * params: - * vaa: address of struct to be filled. - * (Note: driver should memset it to ZERO if it doesn't support vaa.) - */ - void (*query_vaa)(vo_vaa_t *vaa); - } vo_functions_t; char *vo_format_name(int format); |