mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 03:52:22 +02:00
core: merge defaultopts.c into cfg-mplayer.h
There isn't really any reason why this should be in a separate source file.
This commit is contained in:
wm4
parent
c185b0ba4a
commit
757c6d0394
1
Makefile
1
Makefile
@ -172,7 +172,6 @@ SOURCES = talloc.c \
|
||||
core/codecs.c \
|
||||
core/command.c \
|
||||
core/cpudetect.c \
|
||||
core/defaultopts.c \
|
||||
core/m_config.c \
|
||||
core/m_option.c \
|
||||
core/m_property.c \
|
||||
|
||||
@ -727,4 +727,113 @@ const m_option_t mplayer_opts[]={
|
||||
{NULL, NULL, 0, 0, 0, 0, NULL}
|
||||
};
|
||||
|
||||
static const struct MPOpts mp_default_opts = {
|
||||
.reset_options = (char **)(const char *[]){"pause", NULL},
|
||||
.audio_driver_list = NULL,
|
||||
.audio_decoders = "-spdif:*", // never select spdif by default
|
||||
.video_decoders = NULL,
|
||||
.fixed_vo = 1,
|
||||
.softvol = SOFTVOL_AUTO,
|
||||
.softvol_max = 200,
|
||||
.mixer_init_volume = -1,
|
||||
.mixer_init_mute = -1,
|
||||
.volstep = 3,
|
||||
.ao_buffersize = -1,
|
||||
.vo = {
|
||||
.video_driver_list = NULL,
|
||||
.cursor_autohide_delay = 1000,
|
||||
.monitor_pixel_aspect = 1.0,
|
||||
.panscanrange = 1.0,
|
||||
.fs = false,
|
||||
.screen_id = -1,
|
||||
.fsscreen_id = -1,
|
||||
.stop_screensaver = 1,
|
||||
.nomouse_input = 0,
|
||||
.enable_mouse_movements = 1,
|
||||
.fsmode = 0,
|
||||
.panscan = 0.0f,
|
||||
.keepaspect = 1,
|
||||
.border = 1,
|
||||
.colorkey = 0x0000ff00, // default colorkey is green
|
||||
// (0xff000000 means that colorkey has been disabled)
|
||||
.WinID = -1,
|
||||
},
|
||||
.wintitle = "mpv - ${media-title}",
|
||||
.heartbeat_interval = 30.0,
|
||||
.gamma_gamma = 1000,
|
||||
.gamma_brightness = 1000,
|
||||
.gamma_contrast = 1000,
|
||||
.gamma_saturation = 1000,
|
||||
.gamma_hue = 1000,
|
||||
.osd_level = 1,
|
||||
.osd_duration = 1000,
|
||||
.osd_bar_align_y = 0.5,
|
||||
.osd_bar_w = 75.0,
|
||||
.osd_bar_h = 3.125,
|
||||
.osd_scale = 1,
|
||||
.loop_times = -1,
|
||||
.ordered_chapters = 1,
|
||||
.chapter_merge_threshold = 100,
|
||||
.load_config = 1,
|
||||
.position_resume = 1,
|
||||
.stream_cache_min_percent = 20.0,
|
||||
.stream_cache_seek_min_percent = 50.0,
|
||||
.stream_cache_pause = 10.0,
|
||||
.chapterrange = {-1, -1},
|
||||
.edition_id = -1,
|
||||
.default_max_pts_correction = -1,
|
||||
.user_correct_pts = -1,
|
||||
.initial_audio_sync = 1,
|
||||
.term_osd = 2,
|
||||
.consolecontrols = 1,
|
||||
.doubleclick_time = 300,
|
||||
.play_frames = -1,
|
||||
.keep_open = 0,
|
||||
.audio_id = -1,
|
||||
.video_id = -1,
|
||||
.sub_id = -1,
|
||||
.audio_display = 1,
|
||||
.sub_visibility = 1,
|
||||
.sub_pos = 100,
|
||||
.extension_parsing = 1,
|
||||
.audio_output_channels = MP_CHMAP_INIT_STEREO,
|
||||
.audio_output_format = -1, // AF_FORMAT_UNKNOWN
|
||||
.playback_speed = 1.,
|
||||
.movie_aspect = -1.,
|
||||
.field_dominance = -1,
|
||||
.sub_auto = 1,
|
||||
.osd_bar_visible = 1,
|
||||
#ifdef CONFIG_ASS
|
||||
.ass_enabled = 1,
|
||||
#endif
|
||||
.sub_scale = 1,
|
||||
.ass_vsfilter_aspect_compat = 1,
|
||||
.ass_style_override = 1,
|
||||
.use_embedded_fonts = 1,
|
||||
.suboverlap_enabled = 1,
|
||||
|
||||
.hwdec_codecs = "all",
|
||||
|
||||
.ad_lavc_param = {
|
||||
.ac3drc = 1.,
|
||||
.downmix = 1,
|
||||
},
|
||||
.lavfdopts = {
|
||||
.allow_mimetype = 1,
|
||||
},
|
||||
.input = {
|
||||
.key_fifo_size = 7,
|
||||
.ar_delay = 200,
|
||||
.ar_rate = 40,
|
||||
.use_joystick = 1,
|
||||
.use_lirc = 1,
|
||||
.use_lircc = 1,
|
||||
#ifdef CONFIG_COCOA
|
||||
.use_ar = 1,
|
||||
.use_media_keys = 1,
|
||||
#endif
|
||||
.default_bindings = 1,
|
||||
},
|
||||
};
|
||||
|
||||
#endif /* MPLAYER_CFG_MPLAYER_H */
|
||||
|
||||
@ -1,120 +0,0 @@
|
||||
#include <stddef.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "defaultopts.h"
|
||||
#include "core/options.h"
|
||||
#include "audio/mixer.h"
|
||||
#include "audio/chmap.h"
|
||||
|
||||
void set_default_mplayer_options(struct MPOpts *opts)
|
||||
{
|
||||
static const char *reset_options[] = {"pause", NULL};
|
||||
*opts = (const struct MPOpts){
|
||||
.reset_options = (char **)reset_options,
|
||||
.audio_driver_list = NULL,
|
||||
.audio_decoders = "-spdif:*", // never select spdif by default
|
||||
.video_decoders = NULL,
|
||||
.fixed_vo = 1,
|
||||
.softvol = SOFTVOL_AUTO,
|
||||
.softvol_max = 200,
|
||||
.mixer_init_volume = -1,
|
||||
.mixer_init_mute = -1,
|
||||
.volstep = 3,
|
||||
.ao_buffersize = -1,
|
||||
.vo = {
|
||||
.video_driver_list = NULL,
|
||||
.cursor_autohide_delay = 1000,
|
||||
.monitor_pixel_aspect = 1.0,
|
||||
.panscanrange = 1.0,
|
||||
.fs = false,
|
||||
.screen_id = -1,
|
||||
.fsscreen_id = -1,
|
||||
.stop_screensaver = 1,
|
||||
.nomouse_input = 0,
|
||||
.enable_mouse_movements = 1,
|
||||
.fsmode = 0,
|
||||
.panscan = 0.0f,
|
||||
.keepaspect = 1,
|
||||
.border = 1,
|
||||
.colorkey = 0x0000ff00, // default colorkey is green
|
||||
// (0xff000000 means that colorkey has been disabled)
|
||||
.WinID = -1,
|
||||
},
|
||||
.wintitle = "mpv - ${media-title}",
|
||||
.heartbeat_interval = 30.0,
|
||||
.gamma_gamma = 1000,
|
||||
.gamma_brightness = 1000,
|
||||
.gamma_contrast = 1000,
|
||||
.gamma_saturation = 1000,
|
||||
.gamma_hue = 1000,
|
||||
.osd_level = 1,
|
||||
.osd_duration = 1000,
|
||||
.osd_bar_align_y = 0.5,
|
||||
.osd_bar_w = 75.0,
|
||||
.osd_bar_h = 3.125,
|
||||
.osd_scale = 1,
|
||||
.loop_times = -1,
|
||||
.ordered_chapters = 1,
|
||||
.chapter_merge_threshold = 100,
|
||||
.load_config = 1,
|
||||
.position_resume = 1,
|
||||
.stream_cache_min_percent = 20.0,
|
||||
.stream_cache_seek_min_percent = 50.0,
|
||||
.stream_cache_pause = 10.0,
|
||||
.chapterrange = {-1, -1},
|
||||
.edition_id = -1,
|
||||
.default_max_pts_correction = -1,
|
||||
.user_correct_pts = -1,
|
||||
.initial_audio_sync = 1,
|
||||
.term_osd = 2,
|
||||
.consolecontrols = 1,
|
||||
.doubleclick_time = 300,
|
||||
.play_frames = -1,
|
||||
.keep_open = 0,
|
||||
.audio_id = -1,
|
||||
.video_id = -1,
|
||||
.sub_id = -1,
|
||||
.audio_display = 1,
|
||||
.sub_visibility = 1,
|
||||
.sub_pos = 100,
|
||||
.extension_parsing = 1,
|
||||
.audio_output_channels = MP_CHMAP_INIT_STEREO,
|
||||
.audio_output_format = -1, // AF_FORMAT_UNKNOWN
|
||||
.playback_speed = 1.,
|
||||
.movie_aspect = -1.,
|
||||
.field_dominance = -1,
|
||||
.sub_auto = 1,
|
||||
.osd_bar_visible = 1,
|
||||
#ifdef CONFIG_ASS
|
||||
.ass_enabled = 1,
|
||||
#endif
|
||||
.sub_scale = 1,
|
||||
.ass_vsfilter_aspect_compat = 1,
|
||||
.ass_style_override = 1,
|
||||
.use_embedded_fonts = 1,
|
||||
.suboverlap_enabled = 1,
|
||||
|
||||
.hwdec_codecs = "all",
|
||||
|
||||
.ad_lavc_param = {
|
||||
.ac3drc = 1.,
|
||||
.downmix = 1,
|
||||
},
|
||||
.lavfdopts = {
|
||||
.allow_mimetype = 1,
|
||||
},
|
||||
.input = {
|
||||
.key_fifo_size = 7,
|
||||
.ar_delay = 200,
|
||||
.ar_rate = 40,
|
||||
.use_joystick = 1,
|
||||
.use_lirc = 1,
|
||||
.use_lircc = 1,
|
||||
#ifdef CONFIG_COCOA
|
||||
.use_ar = 1,
|
||||
.use_media_keys = 1,
|
||||
#endif
|
||||
.default_bindings = 1,
|
||||
}
|
||||
};
|
||||
}
|
||||
@ -1,2 +0,0 @@
|
||||
struct MPOpts;
|
||||
void set_default_mplayer_options(struct MPOpts *opts);
|
||||
@ -151,7 +151,6 @@
|
||||
|
||||
#include "core/mp_core.h"
|
||||
#include "core/options.h"
|
||||
#include "core/defaultopts.h"
|
||||
|
||||
static const char help_text[] = _(
|
||||
"Usage: mpv [options] [url|path/]filename\n"
|
||||
@ -4629,6 +4628,7 @@ static int mpv_main(int argc, char *argv[])
|
||||
|
||||
struct MPContext *mpctx = talloc(NULL, MPContext);
|
||||
*mpctx = (struct MPContext){
|
||||
.opts = mp_default_opts,
|
||||
.last_dvb_step = 1,
|
||||
.terminal_osd_text = talloc_strdup(mpctx, ""),
|
||||
.playlist = talloc_struct(mpctx, struct playlist, {0}),
|
||||
@ -4639,7 +4639,6 @@ static int mpv_main(int argc, char *argv[])
|
||||
screenshot_init(mpctx);
|
||||
|
||||
struct MPOpts *opts = &mpctx->opts;
|
||||
set_default_mplayer_options(opts);
|
||||
// Create the config context and register the options
|
||||
mpctx->mconfig = m_config_new(opts, cfg_include);
|
||||
m_config_register_options(mpctx->mconfig, mplayer_opts);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user