mirror of
https://github.com/mpv-player/mpv
synced 2025-01-24 08:33:34 +00:00
rename some menu open functions, to avoid confusion with libc native open()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23384 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
b4cf5f855c
commit
32012ea3bc
@ -149,7 +149,7 @@ static int parse_args(menu_t* menu,char* args) {
|
||||
}
|
||||
}
|
||||
|
||||
static int open(menu_t* menu, char* args) {
|
||||
static int open_cmdlist(menu_t* menu, char* args) {
|
||||
menu->draw = menu_list_draw;
|
||||
menu->read_cmd = read_cmd;
|
||||
menu->read_key = read_key;
|
||||
@ -177,5 +177,5 @@ const menu_info_t menu_info_cmdlist = {
|
||||
&cfg_dflt,
|
||||
cfg_fields
|
||||
},
|
||||
open
|
||||
open_cmdlist
|
||||
};
|
||||
|
@ -118,7 +118,7 @@ static void draw(menu_t* menu,mp_image_t* mpi) {
|
||||
|
||||
#define BUF_SIZE 1024
|
||||
|
||||
static int open(menu_t* menu, char* args) {
|
||||
static int open_txt(menu_t* menu, char* args) {
|
||||
FILE* fd;
|
||||
char buf[BUF_SIZE];
|
||||
char *l;
|
||||
@ -192,5 +192,5 @@ const menu_info_t menu_info_txt = {
|
||||
&cfg_dflt,
|
||||
cfg_fields
|
||||
},
|
||||
open,
|
||||
open_txt,
|
||||
};
|
||||
|
@ -280,7 +280,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){
|
||||
return (vf_next_query_format(vf,fmt));
|
||||
}
|
||||
|
||||
static int open(vf_instance_t *vf, char* args){
|
||||
static int open_vf(vf_instance_t *vf, char* args){
|
||||
if(!st_priv) {
|
||||
st_priv = calloc(1,sizeof(struct vf_priv_s));
|
||||
st_priv->root = st_priv->current = menu_open(args);
|
||||
@ -310,7 +310,7 @@ vf_info_t vf_info_menu = {
|
||||
"menu",
|
||||
"Albeu",
|
||||
"",
|
||||
open,
|
||||
open_vf,
|
||||
NULL
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user