sub: redo how -no-ass is handled

The -no-ass switch used to disable any use of libass for text subtitles.
This is not really the case anymore, because libass is now always
involved when rendering text. The only remaining use of -no-ass is
disabling styling or showing subtitles on the terminal. On the other
hand, the old subtitle rendering path is a big reason why the subtitle
code is still a big mess with an awful number of obscure special cases.

In order to simplify it, remove the old subtitle rendering code, and
always go through sd_ass.c. Basically, we use ASS_Track as central data
structure for storing text subtitles instead of struct sub_data. This
also makes libass mandatory for all text subs, even if they are printed
to the terminal in -no-video mode. (We could add something like sd_text
to avoid this, but it's not worth the trouble.)

struct sub_data and subreader.c are still around, even its ASS/SSA
reader. But struct sub_data is freed right after converting it to
ASS_Track. The internal ASS reader actually can handle some obscure
cases libass can't, like files encoded in UTF-16.

1 files changed, 0 insertions, 6 deletions

diff --git a/core/mp_core.h b/core/mp_core.h
index 9e61c8ffa3..665588c5c0 100644
--- a/core/mp_core.h
+++ b/core/mp_core.h
@@ -22,8 +22,6 @@
 #include <stdbool.h>
 
 #include "core/options.h"
-#include "sub/subreader.h"
-#include "sub/find_subfiles.h"
 #include "audio/mixer.h"
 #include "demux/demux.h"
 
@@ -112,9 +110,6 @@ struct track {
     // External text subtitle using libass subtitle renderer.
     // The sh_sub is a dummy and doesn't belong to a demuxer.
     struct sh_sub *sh_sub;
-
-    // External text subtitle using non-libass subtitle renderer.
-    struct sub_data *subdata;
 };
 
 enum {
@@ -129,7 +124,6 @@ typedef struct MPContext {
     struct osd_state *osd;
     struct mp_osd_msg *osd_msg_stack;
     char *terminal_osd_text;
-    subtitle subs; // subtitle list used when reading subtitles from demuxer
 
     int add_osd_seek_info; // bitfield of enum mp_osd_seek_info
     double osd_visible; // for the osd bar only