mirror of https://github.com/mpv-player/mpv
Silence "discards qualifiers" warnings when compiling mplayer.c
Add casts to subconfig entries in option lists to avoid the excessive amount of "initialization discards qualifiers from pointer target type" warnings. Also add const to the type of mpctx_get_audio_out to eliminate a warning and make it match the type in the header (svn r25793 had added a const to the header but not mplayer.c). Make libmenu_vfs a table of pointers to const to eliminate another warning plus make the table itself const.
This commit is contained in:
Uoti Urpala
parent
fb33e286b5
commit
529d106627
|
|
@ -3,7 +3,7 @@
|
|||
{"noquiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
|
||||
{"really-quiet", &verbose, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_PRE_PARSE, 0, -10, NULL},
|
||||
{"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOSAVE, 0, 0, NULL},
|
||||
{"msglevel", msgl_config, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
|
||||
{"msglevel", (void *) msgl_config, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
|
||||
{"msgcolor", &mp_msg_color, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
|
||||
{"msgmodule", &mp_msg_module, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
|
||||
#ifdef USE_ICONV
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
#ifdef WIN32
|
||||
{"priority", &proc_priority, CONF_TYPE_STRING, 0, 0, 0, NULL},
|
||||
#endif
|
||||
{"noconfig", noconfig_opts, CONF_TYPE_SUBCONFIG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 0, NULL},
|
||||
{"noconfig", (void *) noconfig_opts, CONF_TYPE_SUBCONFIG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 0, NULL},
|
||||
|
||||
// ------------------------- stream options --------------------
|
||||
|
||||
|
|
@ -139,25 +139,25 @@
|
|||
{ "extbased", &extension_parsing, CONF_TYPE_FLAG, 0, 0, 1, NULL },
|
||||
{ "noextbased", &extension_parsing, CONF_TYPE_FLAG, 0, 1, 0, NULL },
|
||||
|
||||
{"mf", mfopts_conf, CONF_TYPE_SUBCONFIG, 0,0,0, NULL},
|
||||
{"mf", (void *) mfopts_conf, CONF_TYPE_SUBCONFIG, 0,0,0, NULL},
|
||||
#ifdef USE_RADIO
|
||||
{"radio", radioopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
#else
|
||||
{"radio", "MPlayer was compiled without Radio interface support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
|
||||
#endif /* USE_RADIO */
|
||||
#ifdef USE_TV
|
||||
{"tv", tvopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
{"tv", (void *) tvopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
#else
|
||||
{"tv", "MPlayer was compiled without TV interface support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
|
||||
#endif /* USE_TV */
|
||||
#ifdef HAVE_PVR
|
||||
{"pvr", pvropts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
{"pvr", (void *) pvropts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
#else
|
||||
{"pvr", "MPlayer was compiled without V4L2/PVR interface support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
|
||||
#endif /* HAVE_PVR */
|
||||
{"vivo", vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
{"vivo", (void *) vivoopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
#ifdef HAS_DVBIN_SUPPORT
|
||||
{"dvbin", dvbin_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
{"dvbin", (void *) dvbin_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
#endif
|
||||
|
||||
// ------------------------- a-v sync options --------------------
|
||||
|
|
@ -199,7 +199,7 @@
|
|||
OPT_FLAG_CONSTANTS("nosound", audio_id, 0, -1, -2),
|
||||
|
||||
{"af*", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
|
||||
{"af-adv", audio_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
{"af-adv", (void *) audio_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
|
||||
{"vop", "-vop has been removed, use -vf instead.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL},
|
||||
OPT_SETTINGSLIST("vf*", vf_settings, 0, &vf_obj_list),
|
||||
|
|
@ -223,7 +223,7 @@
|
|||
|
||||
// scaling:
|
||||
{"sws", &sws_flags, CONF_TYPE_INT, 0, 0, 2, NULL},
|
||||
{"ssf", scaler_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
{"ssf", (void *) scaler_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
OPT_FLAG_ON("zoom", softzoom, 0),
|
||||
OPT_FLAG_OFF("nozoom", softzoom, 0),
|
||||
OPT_FLOATRANGE("aspect", movie_aspect, 0, 0.2, 3.0),
|
||||
|
|
@ -246,10 +246,10 @@
|
|||
{"field-dominance", &field_dominance, CONF_TYPE_INT, CONF_RANGE, -1, 1, NULL},
|
||||
|
||||
#ifdef USE_LIBAVCODEC
|
||||
{"lavdopts", lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
{"lavdopts", (void *) lavc_decode_opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
#endif
|
||||
#ifdef USE_LIBAVFORMAT
|
||||
{"lavfdopts", lavfdopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
|
||||
{"lavfdopts", (void *) lavfdopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
|
||||
#endif
|
||||
#if defined(HAVE_XVID3) || defined(HAVE_XVID4)
|
||||
{"xvidopts", xvid_dec_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
|
|
|
|||
|
|
@ -184,11 +184,11 @@ const m_option_t mencoder_opts[]={
|
|||
{"xsize", "-xsize has been removed, use -vf crop=w:h:x:y for cropping.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
|
||||
|
||||
// output audio/video codec selection
|
||||
{"oac", oac_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
|
||||
{"ovc", ovc_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
|
||||
{"oac", (void *) oac_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
|
||||
{"ovc", (void *) ovc_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
|
||||
|
||||
// output file format
|
||||
{"of", of_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
|
||||
{"of", (void *) of_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
|
||||
|
||||
// override audio format tag in output file
|
||||
{"fafmttag", &force_audiofmttag, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, NULL},
|
||||
|
|
@ -215,7 +215,7 @@ const m_option_t mencoder_opts[]={
|
|||
{"noodml", &write_odml, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
|
||||
|
||||
// info header strings
|
||||
{"info", info_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
|
||||
{"info", (void *) info_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
|
||||
|
||||
#ifdef HAVE_MP3LAME
|
||||
{"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL},
|
||||
|
|
|
|||
|
|
@ -347,7 +347,7 @@ const m_option_t mplayer_opts[]={
|
|||
{"nomouse-movements", &enable_mouse_movements, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
|
||||
{"doubleclick-time", &doubleclick_time, CONF_TYPE_INT, CONF_RANGE, 0, 1000, NULL},
|
||||
#ifdef USE_TV
|
||||
{"tvscan", tvscan_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
{"tvscan", (void *) tvscan_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
#else
|
||||
{"tvscan", "MPlayer was compiled without TV interface support.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
|
||||
#endif /* USE_TV */
|
||||
|
|
@ -360,7 +360,7 @@ const m_option_t mplayer_opts[]={
|
|||
{"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
|
||||
{"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
|
||||
|
||||
{"vd", vd_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
{"vd", (void *) vd_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
{NULL, NULL, 0, 0, 0, 0, NULL}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -306,7 +306,7 @@ char* current_module=NULL; // for debugging
|
|||
#include "libmenu/menu.h"
|
||||
extern void vf_menu_pause_update(struct vf_instance* vf);
|
||||
extern vf_info_t vf_info_menu;
|
||||
static vf_info_t* libmenu_vfs[] = {
|
||||
static const vf_info_t* const libmenu_vfs[] = {
|
||||
&vf_info_menu,
|
||||
NULL
|
||||
};
|
||||
|
|
@ -341,7 +341,7 @@ const void *mpctx_get_video_out(MPContext *mpctx)
|
|||
return mpctx->video_out;
|
||||
}
|
||||
|
||||
void *mpctx_get_audio_out(MPContext *mpctx)
|
||||
const void *mpctx_get_audio_out(MPContext *mpctx)
|
||||
{
|
||||
return mpctx->audio_out;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue