diff options
| author | wm4 <wm4@nowhere> | 2015-01-05 19:18:08 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-01-05 19:18:08 +0100 |
| commit | 067bb9605c6333bf9d552d1c12f65ccadbb2fc2f (patch) | |
| tree | f2c1ab202d0f517f195addbdd7e43116bcb8e5b0 /options | |
| parent | 2ab259e6832dff38f13cdaa2a8c83b273efa8ec7 (diff) | |
| download | mpv-067bb9605c6333bf9d552d1c12f65ccadbb2fc2f.tar.bz2 mpv-067bb9605c6333bf9d552d1c12f65ccadbb2fc2f.tar.xz | |
sub: add option to not scale subtitles with window
--sub-scale-by-window=no attempts to keep subs always at the same pixel
size.
The implementation is a bit all over the place, because it compensates
already done scaling by an inverse scale factor, but it will probably do
its job.
Fixes #1424. (The semantics and name of --sub-scale-with-window are
kept, and this adds a new option - the name is confusingly similar, but
it's actually analogue to --osd-scale-by-window.)
Diffstat (limited to 'options')
| -rw-r--r-- | options/options.c | 2 | ||||
| -rw-r--r-- | options/options.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/options/options.c b/options/options.c index 19dca2ad1b..0875e6ded5 100644 --- a/options/options.c +++ b/options/options.c @@ -347,6 +347,7 @@ const m_option_t mp_opts[] = { ({"simple", 0}, {"complex", 1})), OPT_CHOICE("ass-style-override", ass_style_override, 0, ({"no", 0}, {"yes", 1}, {"force", 3}, {"signfs", 4})), + OPT_FLAG("sub-scale-by-window", sub_scale_by_window, 0), OPT_FLAG("sub-scale-with-window", sub_scale_with_window, 0), OPT_FLAG("osd-bar", osd_bar_visible, 0), OPT_FLOATRANGE("osd-bar-align-x", osd_bar_align_x, 0, -1.0, +1.0), @@ -699,6 +700,7 @@ const struct MPOpts mp_default_opts = { .osd_bar_h = 3.125, .osd_scale = 1, .osd_scale_by_window = 1, + .sub_scale_by_window = 1, .use_text_osd = 1, #if HAVE_LUA .lua_load_osc = 1, diff --git a/options/options.h b/options/options.h index 5e24a20d1d..1664c3a443 100644 --- a/options/options.h +++ b/options/options.h @@ -235,6 +235,8 @@ typedef struct MPOpts { float osd_bar_h; float osd_scale; int osd_scale_by_window; + int sub_scale_by_window; + int sub_scale_with_window; struct osd_style_opts *osd_style; struct osd_style_opts *sub_text_style; float sub_scale; @@ -252,7 +254,6 @@ typedef struct MPOpts { int ass_style_override; int ass_hinting; int ass_shaper; - int sub_scale_with_window; int sub_clear_on_seek; int hwdec_api; |