Mercurial > mplayer.hg

comparison input/input.c @ 30960:7eda1e1ca6f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mark input-related m_option_t arrays as const.
author diego
date Sun, 04 Apr 2010 16:15:38 +0000
parents 76a13038105e
children 2186c040f9e0
comparison
equal deleted inserted replaced
30959:115ad4cff82f 30960:7eda1e1ca6f1
597 597
598 static int mp_input_print_key_list(m_option_t* cfg); 598 static int mp_input_print_key_list(m_option_t* cfg);
599 static int mp_input_print_cmd_list(m_option_t* cfg); 599 static int mp_input_print_cmd_list(m_option_t* cfg);
600 600
601 // Our command line options 601 // Our command line options
602 static m_option_t input_conf[] = { 602 static const m_option_t input_conf[] = {
603 { "conf", &config_file, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL }, 603 { "conf", &config_file, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL },
604 { "ar-dev", &ar_dev, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL }, 604 { "ar-dev", &ar_dev, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL },
605 { "ar-delay", &ar_delay, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, NULL }, 605 { "ar-delay", &ar_delay, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, NULL },
606 { "ar-rate", &ar_rate, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, NULL }, 606 { "ar-rate", &ar_rate, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, NULL },
607 { "keylist", mp_input_print_key_list, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, NULL }, 607 { "keylist", mp_input_print_key_list, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, NULL },
611 { "default-bindings", &default_bindings, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL }, 611 { "default-bindings", &default_bindings, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL },
612 { "nodefault-bindings", &default_bindings, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL }, 612 { "nodefault-bindings", &default_bindings, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL },
613 { NULL, NULL, 0, 0, 0, 0, NULL} 613 { NULL, NULL, 0, 0, 0, 0, NULL}
614 }; 614 };
615 615
616 static m_option_t mp_input_opts[] = { 616 static const m_option_t mp_input_opts[] = {
617 { "input", &input_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, 617 { "input", &input_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
618 { "nojoystick", &use_joystick, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL }, 618 { "nojoystick", &use_joystick, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL },
619 { "joystick", &use_joystick, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL }, 619 { "joystick", &use_joystick, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL },
620 { "nolirc", &use_lirc, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL }, 620 { "nolirc", &use_lirc, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL },
621 { "lirc", &use_lirc, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL }, 621 { "lirc", &use_lirc, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL },