sub: mess with styling defaults, change --ass-use-margins behavior

Now --ass-use-margins doesn't apply to normal subtitles anymore. This is
probably the inverse from the mpv behavior users expected so far, and
thus a breaking change, so rename the option, that the user at least has
a chance to lookup the option and decide whether the new behavior is
wanted or not.

The basic idea here is:
- plain text subtitles should have a certain useful defalt behavior,
  like actually using margins
- ASS subtitles should never be broken by default
- ASS subtitles should look and behave like plaintext subtitles if
  the --ass-style-override=force option is used

This also subtly changes --sub-scale-with-window and adds the --ass-
scale-with-window option. Since this one isn't so important, don't
bother with compatibility.

1 files changed, 2 insertions, 0 deletions

diff --git a/options/options.h b/options/options.h
index c558176940..52bf0fa221 100644
--- a/options/options.h
+++ b/options/options.h
@@ -241,6 +241,7 @@ typedef struct MPOpts {
     int osd_scale_by_window;
     int sub_scale_by_window;
     int sub_scale_with_window;
+    int ass_scale_with_window;
     struct osd_style_opts *osd_style;
     struct osd_style_opts *sub_text_style;
     float sub_scale;
@@ -249,6 +250,7 @@ typedef struct MPOpts {
     int ass_enabled;
     float ass_line_spacing;
     int ass_use_margins;
+    int sub_use_margins;
     int ass_vsfilter_aspect_compat;
     int ass_vsfilter_color_compat;
     int ass_vsfilter_blur_compat;