Adding upstream version 0.38.0.upstream/0.38.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 22 insertions, 9 deletions

diff --git a/options/options.h b/options/options.h
index aa071b2..69a50b3 100644
--- a/options/options.h
+++ b/options/options.h
@@ -20,7 +20,7 @@ typedef struct mp_vo_opts {
     bool all_workspaces;
     bool window_minimized;
     bool window_maximized;
-    bool focus_on_open;
+    int focus_on;
 
     int screen_id;
     char *screen_name;
@@ -82,10 +82,6 @@ typedef struct mp_vo_opts {
 
 // Subtitle options needed by the subtitle decoders/renderers.
 struct mp_subtitle_opts {
-    bool sub_visibility;
-    bool sec_sub_visibility;
-    float sub_pos;
-    float sub_delay;
     float sub_fps;
     float sub_speed;
     bool sub_forced_events_only;
@@ -111,18 +107,27 @@ struct mp_subtitle_opts {
     bool use_embedded_fonts;
     char **ass_style_override_list;
     char *ass_styles_file;
-    int ass_style_override;
     int ass_hinting;
     int ass_shaper;
     bool ass_justify;
     bool sub_clear_on_seek;
     int teletext_page;
     bool sub_past_video_end;
+    char **sub_avopts;
+};
+
+// Options for both primary and secondary subs.
+struct mp_subtitle_shared_opts {
+    float sub_delay[2];
+    float sub_pos[2];
+    bool sub_visibility[2];
+    int ass_style_override[2];
 };
 
 struct mp_sub_filter_opts {
     bool sub_filter_SDH;
     bool sub_filter_SDH_harder;
+    char *sub_filter_SDH_enclosures;
     bool rf_enable;
     bool rf_plain;
     char **rf_items;
@@ -135,6 +140,7 @@ struct mp_osd_render_opts {
     float osd_bar_align_y;
     float osd_bar_w;
     float osd_bar_h;
+    float osd_bar_border_size;
     float osd_scale;
     bool osd_scale_by_window;
     struct osd_style_opts *osd_style;
@@ -181,6 +187,9 @@ typedef struct MPOpts {
     float rgain_fallback;
     int softvol_mute;
     float softvol_max;
+    float softvol_gain;
+    float softvol_gain_min;
+    float softvol_gain_max;
     int gapless_audio;
 
     mp_vo_opts *vo;
@@ -196,6 +205,7 @@ typedef struct MPOpts {
     bool cursor_autohide_fs;
 
     struct mp_subtitle_opts *subs_rend;
+    struct mp_subtitle_shared_opts *subs_shared;
     struct mp_sub_filter_opts *subs_filt;
     struct mp_osd_render_opts *osd_rend;
 
@@ -238,7 +248,6 @@ typedef struct MPOpts {
     int term_osd;
     bool term_osd_bar;
     char *term_osd_bar_chars;
-    bool term_remaining_playtime;
     char *term_title;
     char *playing_msg;
     char *osd_playing_msg;
@@ -247,6 +256,7 @@ typedef struct MPOpts {
     char *osd_status_msg;
     char *osd_msg[3];
     int player_idle_mode;
+    char **input_commands;
     bool consolecontrols;
     int playlist_pos;
     struct m_rel_time play_start;
@@ -273,7 +283,7 @@ typedef struct MPOpts {
     int stream_id[2][STREAM_TYPE_COUNT];
     char **stream_lang[STREAM_TYPE_COUNT];
     bool stream_auto_sel;
-    bool subs_with_matching_audio;
+    int subs_with_matching_audio;
     bool subs_match_os_language;
     int subs_fallback;
     int subs_fallback_forced;
@@ -357,6 +367,7 @@ typedef struct MPOpts {
 
     struct ra_ctx_opts *ra_ctx_opts;
     struct gl_video_opts *gl_video_opts;
+    struct gl_next_opts *gl_next_opts;
     struct angle_opts *angle_opts;
     struct opengl_opts *opengl_opts;
     struct vulkan_opts *vulkan_opts;
@@ -388,13 +399,15 @@ struct dvd_opts {
 };
 
 struct filter_opts {
-    bool deinterlace;
+    int deinterlace;
+    int field_parity;
 };
 
 extern const struct m_sub_options vo_sub_opts;
 extern const struct m_sub_options cuda_conf;
 extern const struct m_sub_options dvd_conf;
 extern const struct m_sub_options mp_subtitle_sub_opts;
+extern const struct m_sub_options mp_subtitle_shared_sub_opts;
 extern const struct m_sub_options mp_sub_filter_opts;
 extern const struct m_sub_options mp_osd_render_sub_opts;
 extern const struct m_sub_options filter_conf;