diff options
author | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-27 15:31:24 +0000 |
---|---|---|
committer | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-27 15:31:24 +0000 |
commit | 073360b3a4129b3164ac3791d43e180a9971cff6 (patch) | |
tree | f31e33cf987e11cc96b798ffe12ca2f43801bf48 /command.c | |
parent | 3b2a50aca9ac0760b4ae558f630e3b86836738e7 (diff) | |
download | mpv-073360b3a4129b3164ac3791d43e180a9971cff6.tar.bz2 mpv-073360b3a4129b3164ac3791d43e180a9971cff6.tar.xz |
sub_scale command can now handle both ass and non-ass subs at a time
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25881 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'command.c')
-rw-r--r-- | command.c | 8 |
1 files changed, 0 insertions, 8 deletions
@@ -1801,13 +1801,9 @@ static int mp_property_sub_scale(m_option_t * prop, int action, void *arg, ass_font_scale = *(float *) arg; ass_force_reload = 1; } - else { #endif text_font_scale_factor = *(float *) arg; force_load_font = 1; -#ifdef USE_ASS - } -#endif return M_PROPERTY_OK; case M_PROPERTY_STEP_UP: case M_PROPERTY_STEP_DOWN: @@ -1818,15 +1814,11 @@ static int mp_property_sub_scale(m_option_t * prop, int action, void *arg, M_PROPERTY_CLAMP(prop, ass_font_scale); ass_force_reload = 1; } - else { #endif text_font_scale_factor += (arg ? *(float *) arg : 0.1)* (action == M_PROPERTY_STEP_UP ? 1.0 : -1.0); M_PROPERTY_CLAMP(prop, text_font_scale_factor); force_load_font = 1; -#ifdef USE_ASS - } -#endif return M_PROPERTY_OK; default: #ifdef USE_ASS |