[vlc-commits] text_style: use inheritance

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sun Aug  9 17:38:22 2015 +0200| [782de7d74f5cdcbab0b6ab5590e400f2f5c586d2] | committer: Francois Cartegnie

text_style: use inheritance

Renderer should have final decision of the styles to apply.
Rendered forced styles are applied over text-segments
ones, then renderer defaults (text-style's ones).

Also adds proportional font size.
Fixes all style inheritance and font sizing hacks in region
sys.

Final fixed font size is only computed at update time, if
not set to fixed size by decoder.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=782de7d74f5cdcbab0b6ab5590e400f2f5c586d2
---

 modules/codec/cc.c           |  122 +++++++++++++++++++++++-------------------
 modules/codec/subsdec.c      |   29 +++++++++-
 modules/codec/substext.h     |   71 ++++++++----------------
 modules/codec/substx3g.c     |   31 +++++------
 modules/codec/subsusf.c      |   76 ++++++++++++++++----------
 modules/codec/zvbi.c         |    1 -
 modules/demux/mp4/essetup.c  |    9 +++-
 modules/video_filter/marq.c  |   17 ++++--
 modules/video_filter/rss.c   |    6 +--
 src/video_output/video_epg.c |    4 +-
 10 files changed, 205 insertions(+), 161 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=782de7d74f5cdcbab0b6ab5590e400f2f5c586d2