mirror of
https://github.com/mpv-player/mpv
synced 2025-01-07 07:30:09 +00:00
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
This commit is contained in:
parent
3b2a50aca9
commit
073360b3a4
@ -1801,13 +1801,9 @@ static int mp_property_sub_scale(m_option_t * prop, int action, void *arg,
|
|||||||
ass_font_scale = *(float *) arg;
|
ass_font_scale = *(float *) arg;
|
||||||
ass_force_reload = 1;
|
ass_force_reload = 1;
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
#endif
|
#endif
|
||||||
text_font_scale_factor = *(float *) arg;
|
text_font_scale_factor = *(float *) arg;
|
||||||
force_load_font = 1;
|
force_load_font = 1;
|
||||||
#ifdef USE_ASS
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
return M_PROPERTY_OK;
|
return M_PROPERTY_OK;
|
||||||
case M_PROPERTY_STEP_UP:
|
case M_PROPERTY_STEP_UP:
|
||||||
case M_PROPERTY_STEP_DOWN:
|
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);
|
M_PROPERTY_CLAMP(prop, ass_font_scale);
|
||||||
ass_force_reload = 1;
|
ass_force_reload = 1;
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
#endif
|
#endif
|
||||||
text_font_scale_factor += (arg ? *(float *) arg : 0.1)*
|
text_font_scale_factor += (arg ? *(float *) arg : 0.1)*
|
||||||
(action == M_PROPERTY_STEP_UP ? 1.0 : -1.0);
|
(action == M_PROPERTY_STEP_UP ? 1.0 : -1.0);
|
||||||
M_PROPERTY_CLAMP(prop, text_font_scale_factor);
|
M_PROPERTY_CLAMP(prop, text_font_scale_factor);
|
||||||
force_load_font = 1;
|
force_load_font = 1;
|
||||||
#ifdef USE_ASS
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
return M_PROPERTY_OK;
|
return M_PROPERTY_OK;
|
||||||
default:
|
default:
|
||||||
#ifdef USE_ASS
|
#ifdef USE_ASS
|
||||||
|
Loading…
Reference in New Issue
Block a user