diff options
115 files changed, 5302 insertions, 3000 deletions
@@ -18,6 +18,7 @@ LDFLAGS_MENCODER = $(EXTRALIBS_MENCODER) \ SRCS_COMMON = asxparser.c \ codec-cfg.c \ cpudetect.c \ + defaultopts.c \ edl.c \ find_sub.c \ get_path.c \ @@ -64,6 +65,7 @@ SRCS_COMMON = asxparser.c \ libvo/sub.c \ osdep/$(GETCH) \ osdep/$(TIMER) \ + talloc.c SRCS_COMMON-$(BITMAP_FONT) += libvo/font_load.c SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c @@ -123,6 +125,7 @@ SRCS_MPLAYER = mplayer.c \ $(addprefix libao2/,$(AO_SRCS)) \ libvo/aspect.c \ libvo/geometry.c \ + libvo/old_vo_wrapper.c \ libvo/spuenc.c \ libvo/video_out.c \ libvo/vo_mpegpes.c \ diff --git a/cfg-common-opts.h b/cfg-common-opts.h index 1ebcd99eb5..5e3e4d0fa6 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.h @@ -1,8 +1,3 @@ -#ifndef MPLAYER_CFG_COMMON_OPTS_H -#define MPLAYER_CFG_COMMON_OPTS_H - -#include "config.h" - // ------------------------- common options -------------------- {"quiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"noquiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, @@ -120,10 +115,10 @@ {"loadidx", &index_file_load, CONF_TYPE_STRING, 0, 0, 0, NULL}, // select audio/video/subtitle stream - {"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 8190, NULL}, - {"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 8190, NULL}, - {"sid", &dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 8190, NULL}, - {"novideo", &video_id, CONF_TYPE_FLAG, 0, -1, -2, NULL}, + INTRANGE("aid", audio_id, 0, 8190, 0), + INTRANGE("vid", video_id, 0, 8190, 0), + INTRANGE("sid", sub_id, 0, 8190, 0), + FLAG_CONSTANTS("novideo", video_id, -1, -2, 0), { "hr-mp3-seek", &hr_mp3_seek, CONF_TYPE_FLAG, 0, 0, 1, NULL }, { "nohr-mp3-seek", &hr_mp3_seek, CONF_TYPE_FLAG, 0, 1, 0, NULL}, @@ -180,7 +175,7 @@ {"srate", &force_srate, CONF_TYPE_INT, CONF_RANGE, 1000, 8*48000, NULL}, {"channels", &audio_output_channels, CONF_TYPE_INT, CONF_RANGE, 1, 6, NULL}, {"format", &audio_output_format, CONF_TYPE_AFMT, 0, 0, 0, NULL}, - {"speed", &playback_speed, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 100.0, NULL}, + FLOATRANGE("speed", playback_speed, 0.01, 100.0, 0), // set a-v distance {"delay", &audio_delay, CONF_TYPE_FLOAT, CONF_RANGE, -100.0, 100.0, NULL}, @@ -201,8 +196,8 @@ #endif // disable audio - {"sound", &audio_id, CONF_TYPE_FLAG, 0, -2, -1, NULL}, - {"nosound", &audio_id, CONF_TYPE_FLAG, 0, -1, -2, NULL}, + FLAG_CONSTANTS("sound", audio_id, -2, -1, 0), + FLAG_CONSTANTS("nosound", audio_id, -1, -2, 0), {"af*", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, {"af-adv", audio_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, @@ -341,5 +336,3 @@ {"fontconfig", "MPlayer was compiled without fontconfig support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {"nofontconfig", "MPlayer was compiled without fontconfig support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif /* HAVE_FONTCONFIG */ - -#endif /* MPLAYER_CFG_COMMON_OPTS_H */ diff --git a/cfg-common.h b/cfg-common.h index ddac0acdac..7fb13bf0b9 100644 --- a/ |