diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-05-14 12:10:27 +0000 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-05-14 23:32:07 +0200 |
| commit | 83570fc0fb7aee06411c037842ec941c1f920483 (patch) | |
| tree | b14002a3252fce104a7f1d45ffe6e26ae4dcc69f /core | |
| parent | f562a41ca2abb7efe5fbb40954fb29f5db99f874 (diff) | |
| download | mpv-83570fc0fb7aee06411c037842ec941c1f920483.tar.bz2 mpv-83570fc0fb7aee06411c037842ec941c1f920483.tar.xz | |
add osd-scale command
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Modified to add docs for --osd-scale option, and adjusted to the
previous commit by wm4.
Diffstat (limited to 'core')
| -rw-r--r-- | core/cfg-mplayer.h | 1 | ||||
| -rw-r--r-- | core/command.c | 1 | ||||
| -rw-r--r-- | core/defaultopts.c | 1 | ||||
| -rw-r--r-- | core/options.h | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index b386cb53e8..18a1c30324 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -624,6 +624,7 @@ const m_option_t mplayer_opts[]={ ({"0", 0}, {"1", 1}, {"2", 2}, {"3", 3})), OPT_INTRANGE("osd-duration", osd_duration, 0, 0, 3600000), OPT_FLAG("osd-fractions", osd_fractions, 0), + OPT_FLOATRANGE("osd-scale", osd_scale, 0, 0, 100), OPT_DOUBLE("sstep", step_sec, CONF_MIN, 0), diff --git a/core/command.c b/core/command.c index 17b9f654d3..605520aab8 100644 --- a/core/command.c +++ b/core/command.c @@ -1361,6 +1361,7 @@ static int mp_property_alias(m_option_t *prop, int action, void *arg, static const m_option_t mp_properties[] = { // General M_OPTION_PROPERTY("osd-level"), + M_OPTION_PROPERTY_CUSTOM("osd-scale", property_osd_helper), M_OPTION_PROPERTY("loop"), M_OPTION_PROPERTY_CUSTOM("speed", mp_property_playback_speed), { "filename", mp_property_filename, CONF_TYPE_STRING, diff --git a/core/defaultopts.c b/core/defaultopts.c index 3ffc5e2555..c07580a872 100644 --- a/core/defaultopts.c +++ b/core/defaultopts.c @@ -49,6 +49,7 @@ void set_default_mplayer_options(struct MPOpts *opts) .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, diff --git a/core/options.h b/core/options.h index b5370ebac7..34254d69aa 100644 --- a/core/options.h +++ b/core/options.h @@ -174,6 +174,7 @@ typedef struct MPOpts { float osd_bar_align_y; float osd_bar_w; float osd_bar_h; + float osd_scale; struct osd_style_opts *osd_style; struct osd_style_opts *sub_text_style; float sub_scale; |