Mercurial > mplayer.hg
view libmenu/menu_list.h @ 26146:20a126aaa756
ve_vfw.c: #include aviheader.h instead of wine avifmt.h
Compilation was broken after libmpdemux/muxer.h started including
libmpdemux/aviheader.h. ve_vfw.c included both muxer.h and
loader/wine/avifmt.h, and the latter has definitions that conflict with
aviheader.h ones. Fix by removing the avifmt.h include.
I did not carefully check that changing the includes doesn't break
any ve_vfw.c code. However it at least fixes compilation, and if the
avifmt.h versions differ in some significant way then the code is
fundamentally broken anyway: ve_vfw cannot use different versions of
the avi struct definitions when it also uses shared muxer.h types
(those must use the standard definitions to keep the type compatible
with what's used in other files).
author | uau |
---|---|
date | Thu, 06 Mar 2008 01:57:26 +0000 |
parents | 4ebf3c3f2bf6 |
children | f8b6c7045cf8 |
line wrap: on
line source
#ifndef MPLAYER_MENU_LIST_H #define MPLAYER_MENU_LIST_H #include "menu.h" typedef struct list_entry_s list_entry_t; #ifdef IMPL struct list_entry_s { #else struct list_entry { #endif list_entry_t* prev; list_entry_t* next; char* txt; char hide; }; #ifndef IMPL typedef struct menu_list_priv_s { #else typedef struct menu_priv_s { #endif list_entry_t* menu; list_entry_t* current; int count; char* title; int x,y; int w,h; int vspace, minb; int disp_lines; char* ptr; int title_bg,title_bg_alpha; int item_bg,item_bg_alpha; int ptr_bg,ptr_bg_alpha; } menu_list_priv_t; typedef void (*free_entry_t)(list_entry_t* entry); void menu_list_read_cmd(menu_t* menu,int cmd); void menu_list_draw(menu_t* menu,mp_image_t* mpi); void menu_list_add_entry(menu_t* menu,list_entry_t* entry); void menu_list_init(menu_t* menu); void menu_list_uninit(menu_t* menu,free_entry_t free_func); int menu_list_jump_to_key(menu_t* menu,int c); extern const menu_list_priv_t menu_list_priv_dflt; #define MENU_LIST_PRIV_DFLT { \ NULL, \ NULL, \ 0, \ \ "MPlayer", \ -1,-1, \ 0,0, \ 5, 3, \ 0, \ NULL, \ 0xFF, 0xFF, \ 0xFF, 0xFF, \ 0xA4, 0x50 \ } #define MENU_LIST_PRIV_FIELDS \ { "minbor", M_ST_OFF(menu_list_priv_t,minb), CONF_TYPE_INT, M_OPT_MIN, 0, 0, NULL }, \ { "vspace", M_ST_OFF(menu_list_priv_t,vspace), CONF_TYPE_INT, M_OPT_MIN, 0, 0, NULL }, \ { "x", M_ST_OFF(menu_list_priv_t,x), CONF_TYPE_INT, M_OPT_MIN, 0, 0, NULL }, \ { "y", M_ST_OFF(menu_list_priv_t,y), CONF_TYPE_INT, M_OPT_MIN, 0, 0, NULL }, \ { "w", M_ST_OFF(menu_list_priv_t,w), CONF_TYPE_INT, M_OPT_MIN, 0, 0, NULL }, \ { "h", M_ST_OFF(menu_list_priv_t,h), CONF_TYPE_INT, M_OPT_MIN, 0, 0, NULL }, \ { "ptr", M_ST_OFF(menu_list_priv_t,ptr), CONF_TYPE_STRING, 0, 0, 0, NULL }, \ { "title-bg", M_ST_OFF(menu_list_priv_t,title_bg), CONF_TYPE_INT, M_OPT_RANGE, -1, 255, NULL }, \ { "title-bg-alpha", M_ST_OFF(menu_list_priv_t,title_bg_alpha), \ CONF_TYPE_INT, M_OPT_RANGE, 0, 255, NULL }, \ { "item-bg", M_ST_OFF(menu_list_priv_t,item_bg), CONF_TYPE_INT, M_OPT_RANGE, -1, 255, NULL }, \ { "item-bg-alpha", M_ST_OFF(menu_list_priv_t,item_bg_alpha), \ CONF_TYPE_INT, M_OPT_RANGE, 0, 255, NULL }, \ { "ptr-bg", M_ST_OFF(menu_list_priv_t,ptr_bg), CONF_TYPE_INT, M_OPT_RANGE, -1, 255, NULL }, \ { "ptr-bg-alpha", M_ST_OFF(menu_list_priv_t,ptr_bg_alpha), \ CONF_TYPE_INT, M_OPT_RANGE, 0, 255, NULL } \ #endif /* MPLAYER_MENU_LIST_H */