subs: always use sub decoder framework for libass rendering

Remove subtitle selection code setting osd->ass_track directly and
vf_ass/vf_vo code rendering the track directly with libass. Instead,
do track selection and rendering with dec_sub.c functions.

Before, mpctx->set_of_ass_tracks[] contained bare libass tracks
generated from external subtitle files. For use with dec_sub.c, it now
contains struct sh_sub instances with decoder already initialized.

This commit breaks the sub_step command ('g' and 'y' keys) for
libass-rendered subtitles. It could be fixed, but it's so useless -
especially as with the existing implementation there's no practical
way to get subtitle delay back to normal after using it - that I
didn't bother.

Conflicts:
	command.c
	mp_core.h
	mplayer.c

1 files changed, 9 insertions, 6 deletions

diff --git a/sub/sub.h b/sub/sub.h
index 3ad8dc9217..8a8a2ab941 100644
--- a/sub/sub.h
+++ b/sub/sub.h
@@ -62,15 +62,19 @@ typedef struct mp_osd_obj_s {
 struct osd_state {
     struct ass_library *ass_library;
     struct ass_renderer *ass_renderer;
-    int w, h;
-    char *osd_text;
-    struct ass_track *ass_track;
-    double pts;
+    struct sh_sub *sh_sub;
+    bool changed_outside_sd;
+    double sub_pts;
     double sub_offset;
-    bool vsfilter_aspect;
+    struct mp_eosd_res dim;
+    double normal_scale;
+    double vsfilter_scale;
+    bool unscaled;
 
     struct ass_renderer *osd_render;
     struct ass_library *osd_ass_library;
+    char *osd_text;
+    int w, h;
 
     struct MPOpts *opts;
 };
@@ -113,7 +117,6 @@ extern char *sub_cp;
 extern int sub_pos;
 extern int sub_width_p;
 extern int sub_alignment;
-extern int sub_visibility;
 extern int sub_bg_color; /* subtitles background color */
 extern int sub_bg_alpha;
 extern int spu_alignment;